RE: Assertion failure because of missing inferior

[Marc Khouzam <marc dot khouzam at ericsson dot com>]

From: Tom Tromey [tromey@redhat.com]

>>>>> "Marc" == Marc Khouzam <marc.khouzam@ericsson.com> writes:

Marc> What do you think of the below for 7_2?

Marc> 2010-12-10  Marc Khouzam  <marc.khouzam@ericsson.com>
Marc>    * mi/mi-main.c (mi_cmd_remove_inferior): Don't delete current inferior.
Marc>    (get_other_inferior): New.

> I think this is ok for the 7.2 branch, assuming Joel didn't do the
> release already :)

Now that all issues seem to be fixed when removing an inferior using CLI,
I committed the below to HEAD and 7_2.

Thanks for delaying 7.2.1 to wait for these fixes.  It will be really useful for Eclipse.

I'm gonna submit another patch for
http://sourceware.org/ml/gdb/2010-12/msg00039.html
(missing check to prevent removing a running inferior)
but that is not important for 7_2 (unless you guys want it there),
so, from my side, there are no more issues for 7.2.1.

Thanks again.

Marc

2010-12-17  Marc Khouzam  <marc.khouzam@ericsson.com>
 
       * mi/mi-main.c (mi_cmd_remove_inferior): Don't delete current inferior.
       (get_other_inferior): New.

### Eclipse Workspace Patch 1.0
#P src
Index: gdb/mi/mi-main.c
===================================================================
RCS file: /cvs/src/src/gdb/mi/mi-main.c,v
retrieving revision 1.178.2.4
diff -u -r1.178.2.4 mi-main.c
--- gdb/mi/mi-main.c    9 Dec 2010 19:22:59 -0000       1.178.2.4
+++ gdb/mi/mi-main.c    18 Dec 2010 01:54:10 -0000
@@ -1623,6 +1623,18 @@
   ui_out_field_fmt (uiout, "inferior", "i%d", inf->num);
 }
 
+/* Callback used to find the first inferior other than the
+   current one. */
+   
+static int
+get_other_inferior (struct inferior *inf, void *arg)
+{
+  if (inf == current_inferior ())
+    return 0;
+
+  return 1;
+}
+
 void
 mi_cmd_remove_inferior (char *command, char **argv, int argc)
 {
@@ -1639,6 +1651,22 @@
   if (!inf)
     error ("the specified thread group does not exist");
 
+  if (inf == current_inferior ())
+    {
+      struct thread_info *tp = 0;
+      struct inferior *new_inferior 
+       = iterate_over_inferiors (get_other_inferior, NULL);
+
+      if (new_inferior == NULL)
+       error (_("Cannot remove last inferior"));
+
+      set_current_inferior (new_inferior);
+      if (new_inferior->pid != 0)
+       tp = any_thread_of_process (new_inferior->pid);
+      switch_to_thread (tp ? tp->ptid : null_ptid);
+      set_current_program_space (new_inferior->pspace);
+    }
+
   delete_inferior_1 (inf, 1 /* silent */);
 }