From e58b0e63bb0a42e99f6fb1e6d697a1b29caa02c2 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Sun, 24 May 2009 18:00:08 +0000 Subject: gdb/ * gdbthread.h (struct thread_info): New `pending_follow' field. * thread.c (new_thread): New function. (add_thread_silent): Use it. * breakpoint.c (internal_breakpoint_number): New global, moved from inside... (create_internal_breakpoint): ... this. (clone_momentary_breakpoint): New. * breakpoint.h (clone_momentary_breakpoint): Declare. * infrun.c (nullify_last_target_wait_ptid): Move declaration higher. (pending_follow): Delete. (follow_fork): Handle pending follow fork event here. Moved the preserving of thread stepping state here. (resume): Don't handle pending follow fork events here. Only install the inferior's terminal modes if we're about to resume it. (proceed): Handle possible pending follow fork events here. (init_wait_for_inferior): No need to clear pending_follow anymore, it's gone. (handle_inferior_event): Adjust to per-thread `pending_follow'. Call `follow_fork' to handle following the fork. If the follow-fork is cancelled, stop stepping. * linux-nat.c (linux_child_follow_fork): Adjust to per-thread `pending_follow' events. Remove code that handled preserving the thread stepping state. * inf-ptrace.c (inf_ptrace_follow_fork): Ditto. * inf-ttrace.c (inf_ttrace_follow_fork): Ditto. gdb/testsuite/ * gdb.threads/fork-thread-pending.c: New. * gdb.threads/fork-thread-pending.exp: New. --- gdb/testsuite/gdb.threads/fork-thread-pending.c | 109 ++++++++++++++++++ gdb/testsuite/gdb.threads/fork-thread-pending.exp | 128 ++++++++++++++++++++++ 2 files changed, 237 insertions(+) create mode 100644 gdb/testsuite/gdb.threads/fork-thread-pending.c create mode 100644 gdb/testsuite/gdb.threads/fork-thread-pending.exp (limited to 'gdb/testsuite/gdb.threads') diff --git a/gdb/testsuite/gdb.threads/fork-thread-pending.c b/gdb/testsuite/gdb.threads/fork-thread-pending.c new file mode 100644 index 0000000..34ea52d --- /dev/null +++ b/gdb/testsuite/gdb.threads/fork-thread-pending.c @@ -0,0 +1,109 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2008, 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 . */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define NUMTHREADS 10 + +volatile int done = 0; + +static void * +start (void *arg) +{ + while (!done) + usleep (100); + assert (0); + return arg; +} + +void * +thread_function (void *arg) +{ + int x = * (int *) arg; + + printf ("Thread <%d> executing\n", x); + + while (!done) + usleep (100); + + return NULL; +} + +void * +thread_forker (void *arg) +{ + int x = * (int *) arg; + pid_t pid; + int rv; + int i; + pthread_t thread; + + printf ("Thread forker <%d> executing\n", x); + + switch ((pid = fork ())) + { + case -1: + assert (0); + default: + wait (&rv); + done = 1; + break; + case 0: + i = pthread_create (&thread, NULL, start, NULL); + assert (i == 0); + i = pthread_join (thread, NULL); + assert (i == 0); + + assert (0); + } + + return NULL; +} + +int +main (void) +{ + pthread_t threads[NUMTHREADS]; + int args[NUMTHREADS]; + int i, j; + + /* Create a few threads that do mostly nothing, and then one that + forks. */ + for (j = 0; j < NUMTHREADS - 1; ++j) + { + args[j] = j; + pthread_create (&threads[j], NULL, thread_function, &args[j]); + } + + args[j] = j; + pthread_create (&threads[j], NULL, thread_forker, &args[j]); + + for (j = 0; j < NUMTHREADS; ++j) + { + pthread_join (threads[j], NULL); + } + + return 0; +} diff --git a/gdb/testsuite/gdb.threads/fork-thread-pending.exp b/gdb/testsuite/gdb.threads/fork-thread-pending.exp new file mode 100644 index 0000000..6bc866b --- /dev/null +++ b/gdb/testsuite/gdb.threads/fork-thread-pending.exp @@ -0,0 +1,128 @@ +# Copyright (C) 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 . + +# There's no support for `set follow-fork-mode' in the remote +# protocol. +if { [is_remote target] } { + return 0 +} + +# Only GNU/Linux is known to support `set follow-fork-mode child'. +# +if { ! [istarget "*-*-linux*"] } { + return 0 +} + +set testfile fork-thread-pending +set srcfile ${testfile}.c +set binfile ${objdir}/${subdir}/${testfile} + +if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { + return -1 +} + +gdb_exit +gdb_start +gdb_reinitialize_dir $srcdir/$subdir + +gdb_load ${binfile} +if ![runto_main] then { + fail "Can't run to main" + return 0 +} + +gdb_test "set follow-fork-mode child" "" "1, set follow-fork-mode child" +gdb_test "catch fork" "Catchpoint \[0-9\]* \\(fork\\)" "1, insert fork catchpoint" +gdb_breakpoint "start" "" "1, set breakpoint at start" + +gdb_test "continue" "Catchpoint.*" "1, get to the fork event" + +gdb_test "info threads" " Thread .* Thread .* Thread .* Thread .*" "1, multiple threads found" + +gdb_test "thread 2" "" "1, switched away from event thread" + +gdb_test "continue" "Not resuming.*" "1, refused to resume" + +set test "1, followed to the child, found one thread" +gdb_test_multiple "info threads" "metest" { + -re " Thread .* Thread .*$gdb_prompt $" { + fail "$test" + } + -re " Thread .*$gdb_prompt $" { + pass "$test" + } + -re "$gdb_prompt $" { + fail "$test (unknown output)" + } + timeout { + fail "$test (timeout)" + } +} + +gdb_test "continue" "Breakpoint 3, start.*" "1, get to the spawned thread in fork child" + +set test "1, followed to the child, found two threads" +gdb_test_multiple "info threads" "$test" { + -re " Thread .* Thread .* Thread .*$gdb_prompt $" { + fail "$test" + } + -re " Thread .* Thread .*$gdb_prompt $" { + pass "$test" + } + -re "$gdb_prompt $" { + fail "$test (unknown output)" + } + timeout { + fail "$test (timeout)" + } +} + +# Start over, but this time, don't switch away from the fork event thread. + +gdb_exit +gdb_start +gdb_reinitialize_dir $srcdir/$subdir + +gdb_load ${binfile} +if ![runto_main] then { + fail "Can't run to main" + return 0 +} + +gdb_test "set follow-fork-mode child" "" "2, set follow-fork-mode child" +gdb_test "catch fork" "Catchpoint \[0-9\]* \\(fork\\)" "2, insert fork catchpoint" +gdb_breakpoint "start" + +gdb_test "continue" "Catchpoint.*" "2, get to the fork event" + +gdb_test "info threads" " Thread .* Thread .* Thread .* Thread .*" "2, multiple threads found" + +gdb_test "continue" "Breakpoint 3, start.*" "2, get to the spawned thread in fork child" + +set test "2, followed to the child, found two threads" +gdb_test_multiple "info threads" "$test" { + -re " Thread .* Thread .* Thread .*$gdb_prompt $" { + fail "$test" + } + -re " Thread .* Thread .*$gdb_prompt $" { + pass "$test" + } + -re "$gdb_prompt $" { + fail "$test (unknown output)" + } + timeout { + fail "$test (timeout)" + } +} -- cgit v1.1