5 files changed, 173 insertions, 4 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9d5efa4..368d45e 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-26  Doug Evans  <dje@google.com>
+
+	* thread.c (do_restore_current_thread_cleanup): Redo test for
+	whether to restore old->inferior_ptid.
+
 2009-03-26  Tom Tromey  <tromey@redhat.com>
 
 	* breakpoint.c (resolve_sal_pc): Preserve original line number
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index d9b5555..c59e194 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-26  Doug Evans  <dje@google.com>
+
+	* gdb.mi/mi-nonstop-exit.exp: New file.
+	* gdb.mi/non-stop-exit.c: New file.
+
 2009-03-26  Tom Tromey  <tromey@redhat.com>
 
 	Update for change to prologue skipping:
diff --git a/gdb/testsuite/gdb.mi/mi-nonstop-exit.exp b/gdb/testsuite/gdb.mi/mi-nonstop-exit.exp
new file mode 100644
index 0000000..8167a07
--- /dev/null
+++ b/gdb/testsuite/gdb.mi/mi-nonstop-exit.exp
@@ -0,0 +1,106 @@
+# Copyright 2009
+# Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# This only works with native configurations
+if {![isnative]} {
+  return
+}
+
+load_lib mi-support.exp
+set MIFLAGS "-i=mi"
+
+gdb_exit
+if {[mi_gdb_start]} {
+    continue
+}
+
+#
+# Start here
+#
+set testfile "non-stop-exit"
+set srcfile "$testfile.c"
+set binfile "$objdir/$subdir/mi-$testfile"
+
+set options [list debug incdir=$objdir]
+if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $options] != "" } {
+    return -1
+}
+
+mi_gdb_reinitialize_dir $srcdir/$subdir
+mi_gdb_load $binfile
+
+set supported 0
+send_gdb "-gdb-show non-stop\n"
+gdb_expect {
+    -re ".*\\^done,value=\"off\",supported=\"(\[^\"\]+)\"\r\n$mi_gdb_prompt$" {
+        if { $expect_out(1,string) == "1" } {
+            set supported 1
+        }
+    }
+    -re ".$mi_gdb_prompt$" {
+    }
+}
+
+mi_gdb_test "-gdb-set non-stop 1" ".*"
+mi_gdb_test "-gdb-set target-async 1" ".*"
+detect_async
+
+mi_gdb_test "200-break-insert -t main" ".*"
+
+set created "=thread-created,id=\"$decimal\"\r\n"
+set running "\\*running,thread-id=\"$decimal\"\r\n"
+
+set notifs "($created)*($running)*($library_loaded_re)*"
+
+# Note: presently, we skip this test on non-native targets,
+# so 'run' is OK.  As soon as we start to run this on remote
+# target, the logic from mi_run_cmd will have to be refactored.
+send_gdb "-exec-run\n"
+gdb_expect {
+    -re "\\^running\r\n$notifs$mi_gdb_prompt" {
+    }
+    -re "\\^error,msg=\"The target does not support running in non-stop mode.\"" {
+        verbose -log "Non-stop mode not supported, skipping all tests"
+        return
+    }
+    -re "\r\n$mi_gdb_prompt" {
+        perror "Cannot start target (unknown output after running)"
+        return -1
+    }
+    timeout {
+        perror "Cannot start target (timeout)"
+        return -1
+    }
+}
+mi_expect_stop "breakpoint-hit" main ".*" ".*" "\[0-9\]+" { "" "disp=\"del\"" } "run to main"
+
+mi_send_resuming_command "exec-continue" "continue"
+
+mi_expect_stop "exited-normally" "" "" "" "" "" "finished exec continue"
+
+# Run the program again.
+
+mi_gdb_test "200-break-insert -t main" ".*"
+
+mi_send_resuming_command "exec-run" "run (2)"
+
+mi_expect_stop "breakpoint-hit" main ".*" ".*" "\[0-9\]+" { "" "disp=\"del\"" } "run to main (2)"
+
+mi_send_resuming_command "exec-continue" "continue (2)"
+
+mi_expect_stop "exited-normally" "" "" "" "" "" "finished exec continue (2)"
+
+mi_gdb_exit
diff --git a/gdb/testsuite/gdb.mi/non-stop-exit.c b/gdb/testsuite/gdb.mi/non-stop-exit.c
new file mode 100644
index 0000000..165ae84
--- /dev/null
+++ b/gdb/testsuite/gdb.mi/non-stop-exit.c
@@ -0,0 +1,54 @@
+/* Test program exit in non-stop mode.
+   Copyright 2009 Free Software Foundation, Inc.
+
+   This file is part of GDB.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <pthread.h>
+#include <stdio.h>
+
+#define NTHREADS 4
+void* thread_function (void*);
+
+void *
+thread_function (void *arg)
+{
+  int x = * (int *) arg;
+
+  printf ("Thread <%d> executing\n", x);
+
+  return NULL;
+}
+
+int
+main ()
+{
+  pthread_t thread_id[NTHREADS];
+  int args[NTHREADS];
+  int i;
+
+  for (i = 0; i < NTHREADS; ++i)
+    {
+      args[i] = i;
+      pthread_create (&thread_id[i], NULL, thread_function, &args[i]);
+    }
+
+  for (i = 0; i < NTHREADS; ++i)
+    {
+      pthread_join (thread_id[i], NULL); 
+    }
+
+  return 0;
+}
diff --git a/gdb/thread.c b/gdb/thread.c
index 613137a..a1617f2 100644
--- a/gdb/thread.c
+++ b/gdb/thread.c
@@ -924,11 +924,10 @@ do_restore_current_thread_cleanup (void *arg)
      then don't revert back to it, but instead simply drop back to no
      thread selected.  */
   if (tp
-      && is_exited (tp->ptid)
-      && find_inferior_pid (ptid_get_pid (tp->ptid)) == NULL)
-    restore_current_thread (null_ptid);
-  else
+      && find_inferior_pid (ptid_get_pid (tp->ptid)) != NULL)
     restore_current_thread (old->inferior_ptid);
+  else
+    restore_current_thread (null_ptid);
 
   /* The running state of the originally selected thread may have
      changed, so we have to recheck it here.  */