From 1596d567196b4368a527153a0e92cbeb15fe071f Mon Sep 17 00:00:00 2001 From: John Cortell Date: Wed, 30 Sep 2009 13:06:41 +0000 Subject: [PATCH] [290896] Trace checks should be lightweight --- .../mi/org/eclipse/cdt/debug/mi/core/MISession.java | 2 +- .../mi/org/eclipse/cdt/debug/mi/core/RxThread.java | 2 +- .../src/org/eclipse/cdt/debug/mi/core/MIPlugin.java | 12 +++++++++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/MISession.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/MISession.java index f76a1aaf49a..2db2cc60c4d 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/MISession.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/MISession.java @@ -583,7 +583,7 @@ public class MISession extends Observable { */ public synchronized void postCommand0(Command cmd, long timeout) throws MIException { // TRACING: print the command; - if (MIPlugin.getDefault().isDebugging()) { + if (MIPlugin.DEBUG) { MIPlugin.getDefault().debugLog(cmd.toString()); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/RxThread.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/RxThread.java index 9aafae122f5..297eef2360f 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/RxThread.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/RxThread.java @@ -88,7 +88,7 @@ public class RxThread extends Thread { String line; while ((line = reader.readLine()) != null) { // TRACING: print the output. - if (MIPlugin.getDefault().isDebugging()) { + if (MIPlugin.DEBUG) { MIPlugin.getDefault().debugLog(line); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPlugin.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPlugin.java index cbe577c54f4..3944c362dd4 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPlugin.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPlugin.java @@ -36,6 +36,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Plugin; import org.eclipse.core.runtime.Preferences; import org.eclipse.core.runtime.Status; @@ -69,6 +70,11 @@ public class MIPlugin extends Plugin { private static final int INTERNAL_ERROR = 42; + /** + * Has tracing for this plug-in been turned on? + */ + public static final boolean DEBUG = "true".equals( //$NON-NLS-1$ + Platform.getDebugOption("org.eclipse.cdt.debug.mi.core/debug")); //$NON-NLS-1$ /** * The singleton command factory manager. */ @@ -220,7 +226,7 @@ public class MIPlugin extends Plugin { int launchTimeout = MIPlugin.getDefault().getPluginPreferences().getInt(IMIConstants.PREF_REQUEST_LAUNCH_TIMEOUT); MIProcess pgdb = new MIProcessAdapter(args, launchTimeout, monitor); - if (MIPlugin.getDefault().isDebugging()) { + if (MIPlugin.DEBUG) { StringBuffer sb = new StringBuffer(); for (int i = 0; i < args.length; ++i) { sb.append(args[i]); @@ -287,7 +293,7 @@ public class MIPlugin extends Plugin { int launchTimeout = MIPlugin.getDefault().getPluginPreferences().getInt(IMIConstants.PREF_REQUEST_LAUNCH_TIMEOUT); MIProcess pgdb = new MIProcessAdapter(args, launchTimeout, monitor); - if (MIPlugin.getDefault().isDebugging()) { + if (MIPlugin.DEBUG) { StringBuffer sb = new StringBuffer(); for (int i = 0; i < args.length; ++i) { sb.append(args[i]); @@ -452,7 +458,7 @@ public class MIPlugin extends Plugin { try { pgdb = factory.createMIProcess(args, launchTimeout, monitor); - if (MIPlugin.getDefault().isDebugging()) { + if (MIPlugin.DEBUG) { StringBuffer sb = new StringBuffer(); for (int i = 0; i < args.length; ++i) { sb.append(args[i]);