From patchwork Wed Feb 5 13:19:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Simon Marchi (Code Review)" X-Patchwork-Id: 37696 Received: (qmail 2580 invoked by alias); 5 Feb 2020 13:19:44 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 2391 invoked by uid 89); 5 Feb 2020 13:19:43 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT autolearn=ham version=3.3.1 spammy=alarm X-HELO: mx1.osci.io Received: from polly.osci.io (HELO mx1.osci.io) (8.43.85.229) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 05 Feb 2020 13:19:40 +0000 Received: by mx1.osci.io (Postfix, from userid 994) id 9737E2049E; Wed, 5 Feb 2020 08:19:37 -0500 (EST) Received: from gnutoolchain-gerrit.osci.io (gnutoolchain-gerrit.osci.io [IPv6:2620:52:3:1:5054:ff:fe06:16ca]) by mx1.osci.io (Postfix) with ESMTP id 684A22046F; Wed, 5 Feb 2020 08:19:28 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by gnutoolchain-gerrit.osci.io (Postfix) with ESMTP id 3D7D3281DE; Wed, 5 Feb 2020 08:19:28 -0500 (EST) X-Gerrit-PatchSet: 3 Date: Wed, 5 Feb 2020 08:19:27 -0500 From: "Tankut Baris Aktemur (Code Review)" To: gdb-patches@sourceware.org Cc: Luis Machado , Pedro Alves Auto-Submitted: auto-generated X-Gerrit-MessageType: newpatchset Subject: [review v3] testsuite: add test for handling multiple inferiors exiting X-Gerrit-Change-Id: Ib6fe193d23ba08d7fbb369f41debf2cee5816f6b X-Gerrit-Change-Number: 134 X-Gerrit-ChangeURL: X-Gerrit-Commit: 41cef0cba2c5cd2db4fef51e764dee04d248afcb In-Reply-To: References: Reply-To: tankut.baris.aktemur@intel.com, palves@redhat.com, luis.machado@linaro.org, gdb-patches@sourceware.org MIME-Version: 1.0 Content-Disposition: inline User-Agent: Gerrit/3.0.3-79-g83ff7f88f1 Message-Id: <20200205131928.3D7D3281DE@gnutoolchain-gerrit.osci.io> Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/134 ...................................................................... testsuite: add test for handling multiple inferiors exiting In all-stop mode, upon receiving a stop event, GDB attempts to stop other threads. It is possible that a thread GDB wants to stop has already terminated before GDB sees that exit event. So, the response to GDB's stop request may be a status kind *other* than TARGET_WAITKIND_STOPPED (e.g. TARGET_WAITKIND_EXITED). Such a case should be handled by GDB gracefully and the user should be given back the debugger prompt. The new tests added with this patch cover the TARGET_WAITKIND_EXITED and TARGET_WAITKIND_SIGNALLED cases. The existing tests gdb.threads/leader-exit.exp gdb.threads/non-ldr-exc-2.exp exercise the TARGET_WAITKIND_NO_RESUMED response, whereas the existing test gdb.threads/tid-reuse.exp exercises the TARGET_WAITKIND_THREAD_EXITED case. gdb/testsuite/ChangeLog: 2019-11-04 Tankut Baris Aktemur * gdb.multi/multi-exit.c: New file. * gdb.multi/multi-exit.exp: New file. * gdb.multi/multi-kill.c: New file. * gdb.multi/multi-kill.exp: New file. Change-Id: Ib6fe193d23ba08d7fbb369f41debf2cee5816f6b --- A gdb/testsuite/gdb.multi/multi-exit.c A gdb/testsuite/gdb.multi/multi-exit.exp A gdb/testsuite/gdb.multi/multi-kill.c A gdb/testsuite/gdb.multi/multi-kill.exp 4 files changed, 213 insertions(+), 0 deletions(-) diff --git a/gdb/testsuite/gdb.multi/multi-exit.c b/gdb/testsuite/gdb.multi/multi-exit.c new file mode 100644 index 0000000..f4825c8 --- /dev/null +++ b/gdb/testsuite/gdb.multi/multi-exit.c @@ -0,0 +1,22 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2020 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 . */ + +int +main () +{ + return 0; +} diff --git a/gdb/testsuite/gdb.multi/multi-exit.exp b/gdb/testsuite/gdb.multi/multi-exit.exp new file mode 100644 index 0000000..44378d6 --- /dev/null +++ b/gdb/testsuite/gdb.multi/multi-exit.exp @@ -0,0 +1,75 @@ +# This testcase is part of GDB, the GNU debugger. + +# Copyright 2020 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 . + +# Test receiving TARGET_WAITKIND_EXITED events from multiple +# inferiors. In all stop-mode, upon receiving the exit event from one +# of the inferiors, GDB will try to stop the other inferior, too. So, +# a stop request will be sent. Receiving a TARGET_WAITKIND_EXITED +# status kind as a response to that stop request instead of a +# TARGET_WAITKIND_STOPPED should be handled by GDB without problems. + +standard_testfile + +if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} { + return -1 +} + +gdb_test "add-inferior -exec $binfile" "Added inferior 2.*" \ + "add the second inferior" + +proc test {} { + # Start the processes separately. + gdb_test_no_output "set schedule-multiple off" + + gdb_test "inferior 1" ".*Switching to inferior 1.*" + if {![runto_main]} { + fail "starting inferior 1" + return -1 + } + + gdb_test "inferior 2" ".*Switching to inferior 2.*" + if {![runto_main]} { + fail "starting inferior 2" + return -1 + } + + # Now continue both processes. + gdb_test_no_output "set schedule-multiple on" + + # We want GDB to complete the command and return the prompt + # instead of going into an infinite loop. + # Both inferiors exit. + global inferior_exited_re gdb_prompt + set count 0 + gdb_test_multiple "continue" "continue" { + -re "$inferior_exited_re normally\]\[\r\n\]+" { + incr count + if {$count == 2} { + pass $gdb_test_name + } else { + exp_continue + } + } + -re "$gdb_prompt " { + exp_continue + } + } +} + +with_test_prefix "iteration 1" test +# Repeat to also test re-runnability. +with_test_prefix "iteration 2" test diff --git a/gdb/testsuite/gdb.multi/multi-kill.c b/gdb/testsuite/gdb.multi/multi-kill.c new file mode 100644 index 0000000..3622c49 --- /dev/null +++ b/gdb/testsuite/gdb.multi/multi-kill.c @@ -0,0 +1,34 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2020 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 . */ + +/* This program is intended to be started outside of gdb, and then + attached to by gdb. */ + +#include + +int +main () +{ + /* Don't run forever in case GDB crashes and DejaGNU fails to kill + this program. */ + alarm (10); + + while (1) + ; + + return 0; +} diff --git a/gdb/testsuite/gdb.multi/multi-kill.exp b/gdb/testsuite/gdb.multi/multi-kill.exp new file mode 100644 index 0000000..5fd9a32 --- /dev/null +++ b/gdb/testsuite/gdb.multi/multi-kill.exp @@ -0,0 +1,82 @@ +# This testcase is part of GDB, the GNU debugger. + +# Copyright 2020 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 . + +# Test receiving TARGET_WAITKIND_SIGNALLED events from multiple +# inferiors. In all stop-mode, upon receiving the exit event from one +# of the inferiors, GDB will try to stop the other inferior, too. So, +# a stop request will be sent. Receiving a TARGET_WAITKIND_SIGNALLED +# status kind as a response to that stop request instead of a +# TARGET_WAITKIND_STOPPED should be handled by GDB without problems. + +standard_testfile + +if {![can_spawn_for_attach]} { + return 0 +} + +if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} { + return -1 +} + +gdb_test "add-inferior -exec $binfile" "Added inferior 2.*" \ + "add the second inferior" + +# We want both processes in a running state. +gdb_test_no_output "set schedule-multiple on" + +proc test {} { + # Start the programs, attach to them, then kill both from outside. + global binfile + global gdb_prompt + + set spawn_id_list [spawn_wait_for_attach [list $binfile $binfile]] + set test_spawn_id1 [lindex $spawn_id_list 0] + set test_spawn_id2 [lindex $spawn_id_list 1] + set testpid1 [spawn_id_get_pid $test_spawn_id1] + set testpid2 [spawn_id_get_pid $test_spawn_id2] + + gdb_test "inferior 1" ".*Switching to inferior 1.*" + + gdb_test "attach $testpid1" \ + "Attaching to program: .*, process $testpid1.*(in|at).*" \ + "attach to program 1" + + gdb_test "inferior 2" ".*Switching to inferior 2.*" + + gdb_test "attach $testpid2" \ + "Attaching to program: .*, process $testpid2.*(in|at).*" \ + "attach to program 2" + + gdb_test_multiple "continue" "continue processes" { + -re "Continuing.\[\r\n\]+" { + # Kill both processes at once. + remote_exec build "kill -9 ${testpid1} ${testpid2}" + exp_continue + } + -re "Program terminated with signal.*$gdb_prompt" { + pass $gdb_test_name + } + } + + # Make sure that the processes are gone. + kill_wait_spawned_process $test_spawn_id1 + kill_wait_spawned_process $test_spawn_id2 +} + +with_test_prefix "iteration 1" test +# Repeat to also test re-runnability. +with_test_prefix "iteration 2" test