From cd2effb255e6018687256a2d10072a1e4da0c6c5 Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Thu, 30 Sep 2010 10:24:40 +0000 Subject: [PATCH] gdb/ PR corefiles/12071. * inferior.c (have_live_inferiors): New variables old_chain, inf and tp. Iterate INFERIOR_LIST and call target_has_execution. gdb/testsuite/ PR corefiles/12071. * gdb.base/corefile.exp (quit with a process, no question: load core) (quit with a core file): New tests. --- gdb/ChangeLog | 6 ++++++ gdb/inferior.c | 29 +++++++++++++++++++++-------- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/gdb.base/corefile.exp | 25 +++++++++++++++++++++++++ 4 files changed, 58 insertions(+), 8 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index fc02717a88e..f7cd9cf2d31 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2010-09-30 Jan Kratochvil + + PR corefiles/12071. + * inferior.c (have_live_inferiors): New variables old_chain, inf and + tp. Iterate INFERIOR_LIST and call target_has_execution. + 2010-09-29 Jan Kratochvil Fix GDB crash on inferior calls with self-referencing classes. diff --git a/gdb/inferior.c b/gdb/inferior.c index 28c586792b8..0f94f189f30 100644 --- a/gdb/inferior.c +++ b/gdb/inferior.c @@ -461,16 +461,29 @@ have_inferiors (void) int have_live_inferiors (void) { - struct target_ops *t; + struct cleanup *old_chain; + struct inferior *inf; - /* The check on stratum suffices, as GDB doesn't currently support - multiple target interfaces. */ - if (have_inferiors ()) - for (t = current_target.beneath; t != NULL; t = t->beneath) - if (t->to_stratum == process_stratum) - return 1; + old_chain = make_cleanup_restore_current_thread (); - return 0; + for (inf = inferior_list; inf; inf = inf->next) + if (inf->pid != 0) + { + struct thread_info *tp; + + tp = any_thread_of_process (inf->pid); + if (tp) + { + switch_to_thread (tp->ptid); + + if (target_has_execution) + break; + } + } + + do_cleanups (old_chain); + + return inf != NULL; } /* Prune away automatically added program spaces that aren't required diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index a8a27fb5c44..ba20ffeb18b 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2010-09-30 Jan Kratochvil + + PR corefiles/12071. + * gdb.base/corefile.exp (quit with a process, no question: load core) + (quit with a core file): New tests. + 2010-09-29 Jan Kratochvil Fix GDB crash on inferior calls with self-referencing classes. diff --git a/gdb/testsuite/gdb.base/corefile.exp b/gdb/testsuite/gdb.base/corefile.exp index 09204e85a39..eb1c957939d 100644 --- a/gdb/testsuite/gdb.base/corefile.exp +++ b/gdb/testsuite/gdb.base/corefile.exp @@ -201,8 +201,33 @@ gdb_test_multiple "info files" $test { } } +set test "quit with a process" +gdb_test_multiple "quit" $test { + -re "A debugging session is active.\r\n.*\r\nQuit anyway\\? \\(y or n\\) $" { + pass $test + gdb_test "n" {Not confirmed\.} "quit with processes: n" + } +} + gdb_exit +# Verify there is no question if only a core file is loaded. + +gdb_start +gdb_test "core-file $corefile" "Core was generated by .*" "no question: load core" + +set test "quit with a core file" +gdb_test_multiple "quit" $test { + -re "A debugging session is active.\r\n.*\r\nQuit anyway\\? \\(y or n\\) $" { + fail $test + gdb_test "n" {Not confirmed\.} "quit with processes: n" + } + eof { + pass $test + } +} + +gdb_exit # Test an attach command will clear any loaded core file. -- 2.30.2