From 552a8662b5a65ba89594c7e5ce6c824e86849466 Mon Sep 17 00:00:00 2001 From: "wonhyoung2.park" Date: Mon, 19 Dec 2011 21:32:01 +0900 Subject: [PATCH] [TITLE] package path setting modify [Type] [Module] Profiler [Priority] [CQ#] [Redmine#] [Problem] [Cause] [Solution] [TestCase] --- .../tizen/oprofile/core/CommandManager.java | 28 +++++++++++----------- .../oprofile/core/OprofileCommonConstants.java | 2 +- .../launch/TizenOprofileLaunchDelegate.java | 4 ++-- .../linuxtools/valgrind/launch/CommandManager.java | 24 ------------------- .../launch/TizenValgrindLaunchDelegate.java | 4 ++-- .../valgrind/launch/ValgrindLaunchPlugin.java | 2 +- 6 files changed, 20 insertions(+), 44 deletions(-) diff --git a/org.eclipse.linuxtools.oprofile.core/src/com/samsung/tizen/oprofile/core/CommandManager.java b/org.eclipse.linuxtools.oprofile.core/src/com/samsung/tizen/oprofile/core/CommandManager.java index 55e094e..00951c3 100644 --- a/org.eclipse.linuxtools.oprofile.core/src/com/samsung/tizen/oprofile/core/CommandManager.java +++ b/org.eclipse.linuxtools.oprofile.core/src/com/samsung/tizen/oprofile/core/CommandManager.java @@ -56,22 +56,22 @@ class OneStringReceiver extends MultiLineReceiver { public class CommandManager { - private static String getRealTargetPath(String path) { -// if (ConnectionPlugin.getDefault().getCurrentDevice().isEmulator()) { -// return path; +// private static String getRealTargetPath(String path) { +//// if (ConnectionPlugin.getDefault().getCurrentDevice().isEmulator()) { +//// return path; +//// } +// if (path.contains("/usr/bin")) { +// path = path +// .replace("/usr/bin", "/home/developer/sdk_tools/oprofile/usr/bin"); // } - if (path.contains("/usr/bin")) { - path = path - .replace("/usr/bin", "/home/developer/sdk_tools/oprofile/usr/bin"); - } - return path; - } +// return path; +// } public static SdbShellProcess runApplication(String command){ IDevice device = ConnectionPlugin.getDefault().getCurrentDevice(); SdbShellProcess sdbShellProc = null; - command = getRealTargetPath(command); + //command = getRealTargetPath(command); try { sdbShellProc = device.executeShellCommand(command); @@ -86,7 +86,7 @@ public class CommandManager { SdbShellProcess sdbShellProc = null; BufferedReader br = null; - command = getRealTargetPath(command); + //command = getRealTargetPath(command); try { sdbShellProc = device.executeShellCommand(command); @@ -113,7 +113,7 @@ public class CommandManager { IDevice device = ConnectionPlugin.getDefault().getCurrentDevice(); OneStringReceiver oneStringReceiver = new OneStringReceiver(); - command = getRealTargetPath(command); + //command = getRealTargetPath(command); try { device.executeShellCommand(command, oneStringReceiver); @@ -133,7 +133,7 @@ public class CommandManager { IDevice device = ConnectionPlugin.getDefault().getCurrentDevice(); CommonReceiver commonReceiver = new CommonReceiver(); - command = getRealTargetPath(command); + //command = getRealTargetPath(command); try { device.executeShellCommand(command, commonReceiver); @@ -151,7 +151,7 @@ public class CommandManager { public static void runCommand(String command) { - command = getRealTargetPath(command); + //command = getRealTargetPath(command); try { ConnectionPlugin.getDefault().getCurrentDevice() diff --git a/org.eclipse.linuxtools.oprofile.core/src/com/samsung/tizen/oprofile/core/OprofileCommonConstants.java b/org.eclipse.linuxtools.oprofile.core/src/com/samsung/tizen/oprofile/core/OprofileCommonConstants.java index f2239f9..64162e9 100644 --- a/org.eclipse.linuxtools.oprofile.core/src/com/samsung/tizen/oprofile/core/OprofileCommonConstants.java +++ b/org.eclipse.linuxtools.oprofile.core/src/com/samsung/tizen/oprofile/core/OprofileCommonConstants.java @@ -22,7 +22,7 @@ package com.samsung.tizen.oprofile.core; public abstract class OprofileCommonConstants { - private static final String COMMAND_PATH = "/usr/bin/"; + private static final String COMMAND_PATH = "/home/developer/sdk_tools/oprofile/usr/bin/"; public static final String COMMAND_OPCONTROL = COMMAND_PATH+"opcontrol"; diff --git a/org.eclipse.linuxtools.oprofile.launch.exe/src/com/samsung/tizen/oprofile/launch/TizenOprofileLaunchDelegate.java b/org.eclipse.linuxtools.oprofile.launch.exe/src/com/samsung/tizen/oprofile/launch/TizenOprofileLaunchDelegate.java index 97a22d4..995979b 100644 --- a/org.eclipse.linuxtools.oprofile.launch.exe/src/com/samsung/tizen/oprofile/launch/TizenOprofileLaunchDelegate.java +++ b/org.eclipse.linuxtools.oprofile.launch.exe/src/com/samsung/tizen/oprofile/launch/TizenOprofileLaunchDelegate.java @@ -311,7 +311,7 @@ public class TizenOprofileLaunchDelegate extends TizenLaunchDelegate { public static void checkProfilingTool(IProgressMonitor monitor) throws Exception { // find oprofile - String oprofileCmd = "/usr/bin/opcontrol"; + String oprofileCmd = "/home/developer/sdk_tools/oprofile/usr/bin/opcontrol"; String cmd = "ls " + oprofileCmd + CMD_RESULT_CHECK; // String resultRsp = session.run(cmd, null); String[] resultRsp = CommandManager.runCommandReturningResultArray(cmd); @@ -319,7 +319,7 @@ public class TizenOprofileLaunchDelegate extends TizenLaunchDelegate { // if (CommandManager.isEmulator()) { throw new Exception(TizenLaunchMessages.CANNOT_LAUNCH, new Exception( - "No oprofile in this target (/usr/bin/opcontrol).")); + "No oprofile in this target (/home/developer/sdk_tools/oprofile/usr/bin/opcontrol).")); // } else { // transferProfilingToolPackage(monitor); // installProfilingToolPackage(monitor); diff --git a/org.eclipse.linuxtools.valgrind.launch.exe/src/org/eclipse/linuxtools/valgrind/launch/CommandManager.java b/org.eclipse.linuxtools.valgrind.launch.exe/src/org/eclipse/linuxtools/valgrind/launch/CommandManager.java index 86b0004..3e3159f 100644 --- a/org.eclipse.linuxtools.valgrind.launch.exe/src/org/eclipse/linuxtools/valgrind/launch/CommandManager.java +++ b/org.eclipse.linuxtools.valgrind.launch.exe/src/org/eclipse/linuxtools/valgrind/launch/CommandManager.java @@ -29,27 +29,11 @@ class CommonReceiver extends MultiLineReceiver { } public class CommandManager { - private static String getRealTargetPath(String path) { -// if (ConnectionPlugin.getDefault().getCurrentDevice().isEmulator()) { -// return path; -// } - if (path.contains("/usr/bin")) { - path = path - .replace("/usr/bin", "/home/developer/sdk_tools/valgrind/usr/bin"); - } - if (path.contains("/opt/Valgrind_XML")) { - path = path.replace("/opt/Valgrind_XML", - "/home/developer/sdk_tools/valgrind/opt/Valgrind_XML"); - } - return path; - } public static SdbShellProcess runApplication(String command){ IDevice device = ConnectionPlugin.getDefault().getCurrentDevice(); SdbShellProcess sdbShellProc = null; - command = getRealTargetPath(command); - try { sdbShellProc = device.executeShellCommand(command); } catch (IOException e) { @@ -63,8 +47,6 @@ public class CommandManager { SdbShellProcess sdbShellProc = null; BufferedReader br = null; - command = getRealTargetPath(command); - try { sdbShellProc = device.executeShellCommand(command); br = new BufferedReader(new InputStreamReader( @@ -89,8 +71,6 @@ public class CommandManager { IDevice device = ConnectionPlugin.getDefault().getCurrentDevice(); CommonReceiver commonReceiver = new CommonReceiver(); - command = getRealTargetPath(command); - try { device.executeShellCommand(command, commonReceiver); } catch (TimeoutException e) { @@ -107,8 +87,6 @@ public class CommandManager { public static void runCommand(String command) { - command = getRealTargetPath(command); - try { ConnectionPlugin.getDefault().getCurrentDevice() .executeShellCommand(command); @@ -122,8 +100,6 @@ public class CommandManager { public static boolean pull(String src, String dest) { SyncService syncService = null; - src = getRealTargetPath(src); - try { syncService = ConnectionPlugin.getDefault().getCurrentDevice() .getSyncService(); diff --git a/org.eclipse.linuxtools.valgrind.launch.exe/src/org/eclipse/linuxtools/valgrind/launch/TizenValgrindLaunchDelegate.java b/org.eclipse.linuxtools.valgrind.launch.exe/src/org/eclipse/linuxtools/valgrind/launch/TizenValgrindLaunchDelegate.java index 1ed5d1e..15c554b 100644 --- a/org.eclipse.linuxtools.valgrind.launch.exe/src/org/eclipse/linuxtools/valgrind/launch/TizenValgrindLaunchDelegate.java +++ b/org.eclipse.linuxtools.valgrind.launch.exe/src/org/eclipse/linuxtools/valgrind/launch/TizenValgrindLaunchDelegate.java @@ -110,7 +110,7 @@ public class TizenValgrindLaunchDelegate extends TizenLaunchDelegate { setEnvironments(config); // find Valgrind - String valgrindCmd = "/usr/bin/valgrind"; + String valgrindCmd = "/home/developer/sdk_tools/valgrind/usr/bin/valgrind"; String cmd = "ls " + valgrindCmd + CMD_RESULT_CHECK; // String resultRsp = session.run(cmd, null); String[] resultRsp = CommandManager.runCommandReturningResult(cmd); @@ -119,7 +119,7 @@ public class TizenValgrindLaunchDelegate extends TizenLaunchDelegate { newCoreException( TizenLaunchMessages.CANNOT_LAUNCH, new Exception( - "No valgrind in this target (/usr/bin/valgrind). ")); + "No valgrind in this target (/home/developer/sdk_tools/valgrind/usr/bin/valgrind). ")); // } else { // transferProfilingToolPackage(monitor); // installProfilingToolPackage(monitor); diff --git a/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/valgrind/launch/ValgrindLaunchPlugin.java b/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/valgrind/launch/ValgrindLaunchPlugin.java index 1d73bc4..3925977 100644 --- a/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/valgrind/launch/ValgrindLaunchPlugin.java +++ b/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/valgrind/launch/ValgrindLaunchPlugin.java @@ -34,7 +34,7 @@ public class ValgrindLaunchPlugin extends AbstractUIPlugin { 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$ - public static final String RESULT_DIR = "/opt/Valgrind_XML/"; + public static final String RESULT_DIR = "/home/developer/sdk_tools/valgrind/opt/Valgrind_XML/"; // Extension point constants public static final String TOOL_EXT_ID = "valgrindTools"; //$NON-NLS-1$ -- 2.7.4