diff options
| -rw-r--r-- | gdb/gdbserver/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/gdbserver/linux-low.c | 68 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.threads/kill.c | 64 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.threads/kill.exp | 77 |
5 files changed, 194 insertions, 26 deletions
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index cd5aa0f..e6b0a84 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,9 @@ +2014-07-11 Pedro Alves <palves@redhat.com> + + * linux-low.c (kill_wait_lwp): New function, based on + kill_one_lwp_callback, but use my_waitpid directly. + (kill_one_lwp_callback, linux_kill): Use it. + 2014-06-23 Pedro Alves <palves@redhat.com> * linux-x86-low.c (x86_linux_prepare_to_resume): Clear DR_CONTROL diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c index 61552f4..215a80c 100644 --- a/gdb/gdbserver/linux-low.c +++ b/gdb/gdbserver/linux-low.c @@ -909,6 +909,46 @@ linux_kill_one_lwp (struct lwp_info *lwp) errno ? strerror (errno) : "OK"); } +/* Kill LWP and wait for it to die. */ + +static void +kill_wait_lwp (struct lwp_info *lwp) +{ + struct thread_info *thr = get_lwp_thread (lwp); + int pid = ptid_get_pid (ptid_of (thr)); + int lwpid = ptid_get_lwp (ptid_of (thr)); + int wstat; + int res; + + if (debug_threads) + debug_printf ("kwl: killing lwp %d, for pid: %d\n", lwpid, pid); + + do + { + linux_kill_one_lwp (lwp); + + /* Make sure it died. Notes: + + - The loop is most likely unnecessary. + + - We don't use linux_wait_for_event as that could delete lwps + while we're iterating over them. We're not interested in + any pending status at this point, only in making sure all + wait status on the kernel side are collected until the + process is reaped. + + - We don't use __WALL here as the __WALL emulation relies on + SIGCHLD, and killing a stopped process doesn't generate + one, nor an exit status. + */ + res = my_waitpid (lwpid, &wstat, 0); + if (res == -1 && errno == ECHILD) + res = my_waitpid (lwpid, &wstat, __WCLONE); + } while (res > 0 && WIFSTOPPED (wstat)); + + gdb_assert (res > 0); +} + /* Callback for `find_inferior'. Kills an lwp of a given process, except the leader. */ @@ -917,7 +957,6 @@ kill_one_lwp_callback (struct inferior_list_entry *entry, void *args) { struct thread_info *thread = (struct thread_info *) entry; struct lwp_info *lwp = get_thread_lwp (thread); - int wstat; int pid = * (int *) args; if (ptid_get_pid (entry->id) != pid) @@ -936,14 +975,7 @@ kill_one_lwp_callback (struct inferior_list_entry *entry, void *args) return 0; } - do - { - linux_kill_one_lwp (lwp); - - /* Make sure it died. The loop is most likely unnecessary. */ - pid = linux_wait_for_event (thread->entry.id, &wstat, __WALL); - } while (pid > 0 && WIFSTOPPED (wstat)); - + kill_wait_lwp (lwp); return 0; } @@ -952,8 +984,6 @@ linux_kill (int pid) { struct process_info *process; struct lwp_info *lwp; - int wstat; - int lwpid; process = find_process_pid (pid); if (process == NULL) @@ -976,21 +1006,7 @@ linux_kill (int pid) pid); } else - { - struct thread_info *thr = get_lwp_thread (lwp); - - if (debug_threads) - debug_printf ("lk_1: killing lwp %ld, for pid: %d\n", - lwpid_of (thr), pid); - - do - { - linux_kill_one_lwp (lwp); - - /* Make sure it died. The loop is most likely unnecessary. */ - lwpid = linux_wait_for_event (thr->entry.id, &wstat, __WALL); - } while (lwpid > 0 && WIFSTOPPED (wstat)); - } + kill_wait_lwp (lwp); the_target->mourn (process); diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 2278496..3ae3754 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-07-11 Pedro Alves <palves@redhat.com> + + * gdb.threads/kill.c: New file. + * gdb.threads/kill.exp: New file. + 2014-07-10 Yao Qi <yao@codesourcery.com> * gdb.trace/tfile.c (write_basic_trace_file) diff --git a/gdb/testsuite/gdb.threads/kill.c b/gdb/testsuite/gdb.threads/kill.c new file mode 100644 index 0000000..aefbb06 --- /dev/null +++ b/gdb/testsuite/gdb.threads/kill.c @@ -0,0 +1,64 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2014 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/>. */ + +#ifdef USE_THREADS + +#include <unistd.h> +#include <pthread.h> + +#define NUM 5 + +pthread_barrier_t barrier; + +void * +thread_function (void *arg) +{ + volatile unsigned int counter = 1; + + pthread_barrier_wait (&barrier); + + while (counter > 0) + { + counter++; + usleep (1); + } + + pthread_exit (NULL); +} + +#endif /* USE_THREADS */ + +void +setup (void) +{ +#ifdef USE_THREADS + pthread_t threads[NUM]; + int i; + + pthread_barrier_init (&barrier, NULL, NUM + 1); + for (i = 0; i < NUM; i++) + pthread_create (&threads[i], NULL, thread_function, NULL); + pthread_barrier_wait (&barrier); +#endif /* USE_THREADS */ +} + +int +main (void) +{ + setup (); + return 0; /* set break here */ +} diff --git a/gdb/testsuite/gdb.threads/kill.exp b/gdb/testsuite/gdb.threads/kill.exp new file mode 100644 index 0000000..a3f921f --- /dev/null +++ b/gdb/testsuite/gdb.threads/kill.exp @@ -0,0 +1,77 @@ +# This testcase is part of GDB, the GNU debugger. + +# Copyright 2014 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/>. */ + +standard_testfile + +# Run the test proper. THREADED indicates whether to build a threaded +# program and spawn several threads before trying to kill the program. + +proc test {threaded} { + global testfile srcfile + + with_test_prefix [expr ($threaded)?"threaded":"non-threaded"] { + + set options {debug} + if {$threaded} { + lappend options "pthreads" + lappend options "additional_flags=-DUSE_THREADS" + set prog ${testfile}_threads + } else { + set prog ${testfile}_nothreads + } + + if {[prepare_for_testing "failed to prepare" $prog $srcfile $options] == -1} { + return -1 + } + + if { ![runto main] } then { + fail "run to main" + return + } + + set linenum [gdb_get_line_number "set break here"] + gdb_breakpoint "$srcfile:$linenum" + gdb_continue_to_breakpoint "break here" ".*break here.*" + + if {$threaded} { + gdb_test "info threads" "6.*5.*4.*3.*2.*1.*" "all threads started" + } + + # This kills and ensures no output other than the prompt comes out, + # like: + # + # (gdb) kill + # Kill the program being debugged? (y or n) y + # (gdb) + # + # If we instead saw more output, like e.g., with an extended-remote + # connection: + # + # (gdb) kill + # Kill the program being debugged? (y or n) y + # Remote connection closed + # (gdb) + # + # the above would mean that the remote end crashed. + + gdb_test "kill" "^y" "kill program" "Kill the program being debugged\\? \\(y or n\\) $" "y" + } +} + +foreach threaded {true false} { + test $threaded +} |