aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamilo Bernal2013-05-23 10:29:50 (EDT)
committerJeff Johnston2013-05-23 12:29:51 (EDT)
commitdfeca491c8b1d3f8466fdadf3b92e0807944c284 (patch)
treeb1282b4bbb25e8440abb6c120bdb3fc7690799a0
parent39834ded26c5455d5e9b074366a3d89ed261be7d (diff)
downloadorg.eclipse.linuxtools-dfeca491c8b1d3f8466fdadf3b92e0807944c284.zip
org.eclipse.linuxtools-dfeca491c8b1d3f8466fdadf3b92e0807944c284.tar.gz
org.eclipse.linuxtools-dfeca491c8b1d3f8466fdadf3b92e0807944c284.tar.bz2
Perf: Include event modifiers when matching perf stat event strings.refs/changes/80/13080/3
Change-Id: Ieecc2f77985c122537efc164d5a1467ab9b19420 Reviewed-on: https://git.eclipse.org/r/13080 Tested-by: Hudson CI Reviewed-by: Jeff Johnston <jjohnstn@redhat.com> IP-Clean: Jeff Johnston <jjohnstn@redhat.com> Tested-by: Jeff Johnston <jjohnstn@redhat.com>
-rw-r--r--perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/StatComparisonData.java8
-rw-r--r--perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/model/PMStatEntry.java2
2 files changed, 5 insertions, 5 deletions
diff --git a/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/StatComparisonData.java b/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/StatComparisonData.java
index a480a2b..d9f10b4 100644
--- a/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/StatComparisonData.java
+++ b/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/StatComparisonData.java
@@ -137,10 +137,10 @@ public class StatComparisonData implements IPerfData {
// extract information from groups
samples = match.group(1);
event = match.group(2);
- usage = match.group(4);
- units = match.group(5);
- delta = match.group(7);
- scale = match.group(11);
+ usage = match.group(6);
+ units = match.group(7);
+ delta = match.group(9);
+ scale = match.group(13);
// create stat entry
statEntry = new PMStatEntry(toFloat(samples), event,
diff --git a/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/model/PMStatEntry.java b/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/model/PMStatEntry.java
index 1a50b23..66b3934 100644
--- a/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/model/PMStatEntry.java
+++ b/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/model/PMStatEntry.java
@@ -41,7 +41,7 @@ public class PMStatEntry {
public static final String DECIMAL = "\\d+[\\.\\,\\d]*"; //$NON-NLS-1$
public static final String PERCENTAGE = "(\\d+(\\.\\d+)?)\\%"; //$NON-NLS-1$
public static final String SAMPLES = "(" + DECIMAL + ")"; //$NON-NLS-1$ //$NON-NLS-2$
- public static final String EVENT = "(\\w+[\\-\\w]+)"; //$NON-NLS-1$
+ public static final String EVENT = "(\\w+(\\-\\w+)*(:\\w+)?)";//$NON-NLS-1$
public static final String METRICS = "(" + DECIMAL + ")"; //$NON-NLS-1$//$NON-NLS-2$
public static final String UNITS = "([a-zA-Z\\/\\s\\%]*)"; //$NON-NLS-1$
public static final String DELTA = "(\\(\\s\\+\\-\\s*" + PERCENTAGE + "\\s\\))"; //$NON-NLS-1$ //$NON-NLS-2$