[nemiver] Ignore GDB init file on restart (Closes: #635928)

[Dodji Seketeli <dodji src gnome org>]

commit ad82f3a7b9a98eb7a45241caf04136843b3f8baf
Author: Dodji Seketeli <dodji gnome org>
Date:   Sat Nov 27 23:18:11 2010 +0100

    Ignore GDB init file on restart (Closes: #635928)
    
    	* src/persp/dbgperspective/nmv-dbg-perspective.cc
    	(DBGPerspective::restart_local_inferior): New function.
    	(DBGPerspective::restart_inferior): Use it.

 src/persp/dbgperspective/nmv-dbg-perspective.cc |   49 ++++++++++++++++++++--
 1 files changed, 44 insertions(+), 5 deletions(-)
---
diff --git a/src/persp/dbgperspective/nmv-dbg-perspective.cc b/src/persp/dbgperspective/nmv-dbg-perspective.cc
index 11d44c5..3bcf9a3 100644
--- a/src/persp/dbgperspective/nmv-dbg-perspective.cc
+++ b/src/persp/dbgperspective/nmv-dbg-perspective.cc
@@ -579,6 +579,8 @@ public:
 
     void restart_inferior ();
 
+    void restart_local_inferior ();
+
     void execute_program (const UString &a_prog,
                           const vector<UString> &a_args,
                           const map<UString, UString> &a_env,
@@ -6105,17 +6107,54 @@ DBGPerspective::restart_inferior ()
 {
     if (!is_connected_to_remote_target ()) {
         // Restarting a local program
+        restart_local_inferior ();
+    } else {
+        // We cannot restart an inferior running on a remote target at
+        // the moment.
+        ui_utils::display_error (_("Sorry, it's impossible to restart "
+                                   "a remote inferior"));
+    }
+}
+
+/// Restart the execution of an inferior, only if we got attached to
+/// it locally (i.e, not remotely).  This preserves breakpoints that
+/// are set.  If we are currently attached to the inferior, then the
+/// function just re-runs it. The advantage of doing this is that the
+/// debugging engine will not re-read its init file (and possibly
+/// execute stuff from it like setting breakpoints). Re reading the
+/// init file and executing what is possibly there can lead to make
+/// restarting become slower and slower.  But we are not currently
+/// attached to the inferior, well, then the function has no choice
+/// but re-loading the binary of the inferior and start it. This makes
+/// the debugging engine re-read its init file, though.
+void
+DBGPerspective::restart_local_inferior ()
+{
+    THROW_IF_FAIL (!is_connected_to_remote_target ());
+    
+    if (debugger ()->is_attached_to_target ()
+        // Make sure we are restarting the program we were running
+        // right before. We need to make sure because the user can
+        // have changed the path to the inferior and ask for a
+        // restart; in which case, we can't just simply call debugger
+        // ()->run ().
+        && debugger ()->get_target_path () == m_priv->prog_path) {
+        // if the engine is running, stop it.
+        if (debugger ()->get_state () == IDebugger::RUNNING) {
+            debugger ()->stop_target ();
+            LOG_DD ("stopped dbg_engine");
+        }
+        going_to_run_target_signal ().emit ();
+        debugger ()->run ();
+        m_priv->debugger_has_just_run = true;
+        attached_to_target_signal ().emit (true);
+    } else {            
         vector<IDebugger::Breakpoint> bps;
         execute_program (m_priv->prog_path, m_priv->prog_args,
                          m_priv->env_variables, m_priv->prog_cwd,
                          bps,
                          true /* be aware we are restarting the same inferior*/,
                          false /* don't close opened files */);
-    } else {
-        // We cannot restart an inferior running on a remote target at
-        // the moment.
-        ui_utils::display_error (_("Sorry, it's impossible to restart "
-                                   "a remote inferior"));
     }
 }