From 6e9040a7705921772b29640468a6a54b18a08b9d Mon Sep 17 00:00:00 2001 From: Naser Ezzati Date: Thu, 2 Oct 2014 16:52:07 -0400 Subject: [PATCH] XML state system: Add timestamp field to the current eventfields It is sometimes required to get also the timestamp of the events. Change-Id: I013d91cbba4732245b1981b4e88f9c7648d05ec8 Signed-off-by: Naser Ezzati Signed-off-by: Alexandre Montplaisir Reviewed-on: https://git.eclipse.org/r/34471 Reviewed-by: Genevieve Bastien Tested-by: Hudson CI --- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.linuxtools.tmf.analysis.xml.core/pom.xml | 2 +- .../tmf/analysis/xml/core/model/TmfXmlStateValue.java | 4 ++++ .../tmf/analysis/xml/core/stateprovider/TmfXmlStrings.java | 6 ++++++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/org.eclipse.linuxtools.tmf.analysis.xml.core/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.tmf.analysis.xml.core/META-INF/MANIFEST.MF index 6e92bdb74a..30a372056d 100644 --- a/org.eclipse.linuxtools.tmf.analysis.xml.core/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.tmf.analysis.xml.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 1.2.0.qualifier Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.linuxtools.tmf.analysis.xml.core;singleton:=true Bundle-Activator: org.eclipse.linuxtools.internal.tmf.analysis.xml.core.Activator diff --git a/org.eclipse.linuxtools.tmf.analysis.xml.core/pom.xml b/org.eclipse.linuxtools.tmf.analysis.xml.core/pom.xml index 04a3caedf2..3695da4e76 100644 --- a/org.eclipse.linuxtools.tmf.analysis.xml.core/pom.xml +++ b/org.eclipse.linuxtools.tmf.analysis.xml.core/pom.xml @@ -18,7 +18,7 @@ org.eclipse.linuxtools.tmf.analysis.xml.core - 1.1.0-SNAPSHOT + 1.2.0-SNAPSHOT eclipse-plugin Linux Tools TMF Xml Analysis Core Plug-in diff --git a/org.eclipse.linuxtools.tmf.analysis.xml.core/src/org/eclipse/linuxtools/tmf/analysis/xml/core/model/TmfXmlStateValue.java b/org.eclipse.linuxtools.tmf.analysis.xml.core/src/org/eclipse/linuxtools/tmf/analysis/xml/core/model/TmfXmlStateValue.java index 0166d20866..2b30ca9f06 100644 --- a/org.eclipse.linuxtools.tmf.analysis.xml.core/src/org/eclipse/linuxtools/tmf/analysis/xml/core/model/TmfXmlStateValue.java +++ b/org.eclipse.linuxtools.tmf.analysis.xml.core/src/org/eclipse/linuxtools/tmf/analysis/xml/core/model/TmfXmlStateValue.java @@ -257,6 +257,10 @@ public abstract class TmfXmlStateValue implements ITmfXmlStateValue { if (fieldName.equals(TmfXmlStrings.CPU)) { return TmfStateValue.newValueInt(Integer.valueOf(event.getSource())); } + /* Exception also for "TIMESTAMP", returns the timestamp of this event */ + if (fieldName.equals(TmfXmlStrings.TIMESTAMP)) { + return TmfStateValue.newValueLong(event.getTimestamp().getValue()); + } if (content.getField(fieldName) == null) { return value; } diff --git a/org.eclipse.linuxtools.tmf.analysis.xml.core/src/org/eclipse/linuxtools/tmf/analysis/xml/core/stateprovider/TmfXmlStrings.java b/org.eclipse.linuxtools.tmf.analysis.xml.core/src/org/eclipse/linuxtools/tmf/analysis/xml/core/stateprovider/TmfXmlStrings.java index 7e1fa5d505..a3f61ef8a7 100644 --- a/org.eclipse.linuxtools.tmf.analysis.xml.core/src/org/eclipse/linuxtools/tmf/analysis/xml/core/stateprovider/TmfXmlStrings.java +++ b/org.eclipse.linuxtools.tmf.analysis.xml.core/src/org/eclipse/linuxtools/tmf/analysis/xml/core/stateprovider/TmfXmlStrings.java @@ -18,6 +18,7 @@ import org.eclipse.jdt.annotation.NonNullByDefault; * This file defines all name in the XML Structure for the State Provider * * @author Florian Wininger + * @noimplement This interface only contains static defines */ @SuppressWarnings({ "javadoc", "nls" }) @NonNullByDefault @@ -82,6 +83,11 @@ public interface TmfXmlStrings { static final String STACK_PEEK = "peek"; static final String CPU = "cpu"; + /** + * @since 1.2 + */ + static final String TIMESTAMP = "timestamp"; + /* Operator type */ static final String NOT = "not"; static final String AND = "and"; -- 2.34.1