From f13f92841aac8065926d3c2408abfe45252cda28 Mon Sep 17 00:00:00 2001 From: "seokgil.kang" Date: Tue, 28 Oct 2014 13:23:49 +0900 Subject: [PATCH] VALGRIND : modify termination command using profile_command included in the sdbd Change-Id: Id03fe6086e9fcedf900ea641cc6927b764962883 Signed-off-by: seokgil.kang --- .../linuxtools/valgrind/core/ValgrindCommand.java | 2 +- .../valgrind/launch/TizenValgrindLaunchDelegate.java | 19 ++++++++++--------- .../valgrind/launch/ValgrindRuntimeProcess.java | 6 +++--- package/changelog | 3 +++ package/pkginfo.manifest | 2 +- 5 files changed, 18 insertions(+), 14 deletions(-) diff --git a/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/valgrind/core/ValgrindCommand.java b/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/valgrind/core/ValgrindCommand.java index 9366f22..39d886f 100644 --- a/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/valgrind/core/ValgrindCommand.java +++ b/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/valgrind/core/ValgrindCommand.java @@ -40,7 +40,7 @@ public class ValgrindCommand { public static final String OPT_MAXFRAME = "--max-stackframe"; //$NON-NLS-1$ public static final String OPT_SUPPFILE = "--suppressions"; //$NON-NLS-1$ - public static final String OPROFILE_SCRIPT = "oprofile"; + public static final String PROFILE_SCRIPT = "profile"; protected File datadir; protected Process process; 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 a3dfbb6..91dc647 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 @@ -639,15 +639,16 @@ public class TizenValgrindLaunchDelegate extends TizenLaunchDelegate { remoteExePath = remoteExePath.substring(0, remoteExePath.length() - BADA_EXT.length()); } - String cmd = ValgrindCommand.OPROFILE_SCRIPT + " lsapp " + remoteExePath; - String[] resultRsp = CommandManager.runHostCommandReturningResult(cmd); - if (!CommandManager.isRunSuccessfuly(resultRsp)) - { - newCoreException( - Messages.getString("TizenValgrindLaunchDelegate.valgrind_error_message"), - new Exception( - Messages.getString("TizenValgrindLaunchDelegate.executable_file_does_not_exist"))); - } + // 'lsapp' command does not exist in the profiler_command +// String cmd = ValgrindCommand.PROFILE_SCRIPT + " lsapp " + remoteExePath; +// String[] resultRsp = CommandManager.runHostCommandReturningResult(cmd); +// if (!CommandManager.isRunSuccessfuly(resultRsp)) +// { +// newCoreException( +// Messages.getString("TizenValgrindLaunchDelegate.valgrind_error_message"), +// new Exception( +// Messages.getString("TizenValgrindLaunchDelegate.executable_file_does_not_exist"))); +// } } if (monitor.isCanceled()) diff --git a/org.eclipse.linuxtools.valgrind.launch.exe/src/org/eclipse/linuxtools/valgrind/launch/ValgrindRuntimeProcess.java b/org.eclipse.linuxtools.valgrind.launch.exe/src/org/eclipse/linuxtools/valgrind/launch/ValgrindRuntimeProcess.java index 5330032..d36ea15 100644 --- a/org.eclipse.linuxtools.valgrind.launch.exe/src/org/eclipse/linuxtools/valgrind/launch/ValgrindRuntimeProcess.java +++ b/org.eclipse.linuxtools.valgrind.launch.exe/src/org/eclipse/linuxtools/valgrind/launch/ValgrindRuntimeProcess.java @@ -226,9 +226,9 @@ public class ValgrindRuntimeProcess extends PlatformObject implements IProcess { * @see ITerminate#terminate() */ public void terminate() throws DebugException { - runCommand("ps ax | grep valgrind | grep -v grep | awk '{print \"kill -3 \" $1}' | sh"); -// String valgrindCmd = ValgrindCommand.OPROFILE_SCRIPT + " valgrind_terminate"; -// CommandManager.runShellRoot(valgrindCmd); +// runCommand("ps ax | grep valgrind | grep -v grep | awk '{print \"kill -3 \" $1}' | sh"); + String valgrindCmd = ValgrindCommand.PROFILE_SCRIPT + " killvalgrind"; + CommandManager.runShellRoot(valgrindCmd); } /** diff --git a/package/changelog b/package/changelog index 8288e22..8921ee9 100644 --- a/package/changelog +++ b/package/changelog @@ -1,3 +1,6 @@ +* 2.2.29 +- modify valgrind termination command using profile_command included in the sdbd +== Seokgil Kang 2014-10-28 * 2.2.28 - remove the logic to determine if a symbolic link for 'ld' file exists == Seokgil Kang 2014-10-13 diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest index f5024e5..5cfaba2 100644 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@ -1,5 +1,5 @@ Source:profiler-eplugin -Version:2.2.28 +Version:2.2.29 Maintainer:seokgil.kang , Juyoung Kim Package:profiler-eplugin -- 2.7.4