aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodrigo Fraxino Araujo2014-05-21 04:30:09 (EDT)
committerJeff Johnston2014-06-05 15:13:58 (EDT)
commit63d0cc710580305df07bc355b8ffdbace1086304 (patch)
tree9ca8f580524ec925bb4669590c7b3cb1b6a3da2a
parent58e88f1fb1f5416b7a989a9e1094e557c9d33f6e (diff)
downloadorg.eclipse.linuxtools-63d0cc710580305df07bc355b8ffdbace1086304.zip
org.eclipse.linuxtools-63d0cc710580305df07bc355b8ffdbace1086304.tar.gz
org.eclipse.linuxtools-63d0cc710580305df07bc355b8ffdbace1086304.tar.bz2
perf: remove deprecated -f optionrefs/changes/42/27542/3
Fix for bugzilla #434533 Change-Id: Ibf0ebf2615c2b1cb1f7b704c994f01941f05ac1f Reviewed-on: https://git.eclipse.org/r/27542 Tested-by: Hudson CI Reviewed-by: Jeff Johnston <jjohnstn@redhat.com> Tested-by: Jeff Johnston <jjohnstn@redhat.com>
-rw-r--r--perf/org.eclipse.linuxtools.perf.tests/src/org/eclipse/linuxtools/internal/perf/tests/ModelTest.java2
-rw-r--r--perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/PerfCore.java4
2 files changed, 1 insertions, 5 deletions
diff --git a/perf/org.eclipse.linuxtools.perf.tests/src/org/eclipse/linuxtools/internal/perf/tests/ModelTest.java b/perf/org.eclipse.linuxtools.perf.tests/src/org/eclipse/linuxtools/internal/perf/tests/ModelTest.java
index 8e4c691..269731e 100644
--- a/perf/org.eclipse.linuxtools.perf.tests/src/org/eclipse/linuxtools/internal/perf/tests/ModelTest.java
+++ b/perf/org.eclipse.linuxtools.perf.tests/src/org/eclipse/linuxtools/internal/perf/tests/ModelTest.java
@@ -349,7 +349,7 @@ public class ModelTest extends AbstractTest {
String[] recordString = PerfCore.getRecordString(tempConfig, new Version(0, 0, 0));
assertNotNull(recordString);
- String[] expectedString = { PerfPlugin.PERF_COMMAND, "record", "-f",
+ String[] expectedString = { PerfPlugin.PERF_COMMAND, "record",
"-r", "2", "-v", "-M", "-e", "cpu-cycles", "-e", "cache-misses",
"-e", "cpu-clock" };
assertArrayEquals(expectedString, recordString);
diff --git a/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/PerfCore.java b/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/PerfCore.java
index 35fa602..1f0d2b7 100644
--- a/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/PerfCore.java
+++ b/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/PerfCore.java
@@ -250,10 +250,6 @@ public class PerfCore {
ArrayList<String> newCommand = new ArrayList<>();
newCommand.addAll(Arrays.asList(base));
try {
- if (new Version(3, 11, 0).compareTo(perfVersion) > 0) {
- // Removed as of 4a4d371a4dfbd3b84a7eab8d535d4c7c3647b09e from perf upstream (kernel)
- newCommand.add("-f"); //$NON-NLS-1$
- }
if (config.getAttribute(PerfPlugin.ATTR_Record_Realtime, PerfPlugin.ATTR_Record_Realtime_default)) {
newCommand.add("-r"); //$NON-NLS-1$
int priority = config.getAttribute(PerfPlugin.ATTR_Record_Realtime_Priority, PerfPlugin.ATTR_Record_Realtime_Priority_default);