diff --git a/debug/org.eclipse.cdt.debug.mi.core/ChangeLog b/debug/org.eclipse.cdt.debug.mi.core/ChangeLog index 8abc524167a..11165dd7b34 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/ChangeLog +++ b/debug/org.eclipse.cdt.debug.mi.core/ChangeLog @@ -1,3 +1,8 @@ +2003-11-19 Mikhail Khodjaiants + + Fix for PR 45533: MIException while creating MISession can leave an orphan gdb process. + * src/org/eclipse/cdt/debug/mi/core/MIPlugin.java: removed the 'getAdjustedTimeout' method. + 2003-11-19 Mikhail Khodjaiants Fix for PR 45533: MIException while creating MISession can leave an orphan gdb process. 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 3d7f8cced4a..3ff5eda8587 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 @@ -289,27 +289,6 @@ public class MIPlugin extends Plugin { } } - /** - * Retrieve the session timeout. - * - * Allow at least one second per megabyte as a minimum on the timeout - * (note one second is an arbitrary choice based on swapping performance). - * This is required for loading the symbols from very large programs. - */ - private int getAdjustedTimeout(File program) { - Preferences prefs = plugin.getPluginPreferences(); - int timeout = prefs.getInt(IMIConstants.PREF_REQUEST_TIMEOUT); //milliseconds - if(program != null && program.exists()) { - long programSize = program.length(); - int minimumTimeout = (int)(programSize / 1000L); - if(timeout < minimumTimeout) { - //debugLog("Adjusting timeout from " + timeout + "ms to " + minimumTimeout + "ms"); - timeout = minimumTimeout; - } - } - return timeout; - } - /** * Do some basic synchronisation, gdb make take some time to load * for whatever reasons. @@ -348,9 +327,6 @@ public class MIPlugin extends Plugin { MIPlugin plugin = getDefault(); Preferences prefs = plugin.getPluginPreferences(); int launchTimeout = prefs.getInt(IMIConstants.PREF_REQUEST_LAUNCH_TIMEOUT); - if (launchTimeout <= 0) { - launchTimeout = getAdjustedTimeout(program); - } while (syncStartup.isAlive()) { try { pgdb.wait(launchTimeout);