From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 4736 invoked by alias); 23 Aug 2013 05:31:28 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 4724 invoked by uid 89); 23 Aug 2013 05:31:27 -0000 X-Spam-SWARE-Status: No, score=-5.0 required=5.0 tests=BAYES_00,KHOP_RCVD_UNTRUST,KHOP_THREADED,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL autolearn=ham version=3.3.2 Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Fri, 23 Aug 2013 05:30:57 +0000 Received: from svr-orw-fem-01.mgc.mentorg.com ([147.34.98.93]) by relay1.mentorg.com with esmtp id 1VCjxX-0001zx-4S from Muhammad_Waqas@mentor.com ; Thu, 22 Aug 2013 22:30:55 -0700 Received: from SVR-IES-FEM-01.mgc.mentorg.com ([137.202.0.104]) by svr-orw-fem-01.mgc.mentorg.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Thu, 22 Aug 2013 22:30:54 -0700 Received: from [137.202.157.111] (137.202.0.76) by SVR-IES-FEM-01.mgc.mentorg.com (137.202.0.104) with Microsoft SMTP Server (TLS) id 14.2.247.3; Fri, 23 Aug 2013 06:30:52 +0100 Message-ID: <5216F37D.9090009@codesourcery.com> Date: Fri, 23 Aug 2013 05:31:00 -0000 From: Muhammad Waqas User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130804 Thunderbird/17.0.8 MIME-Version: 1.0 To: Pedro Alves CC: Tom Tromey , Yao Qi , Subject: Re: [PATCH with testcase] Bug 11568 - delete thread-specific breakpoint on the thread exit References: <51F619CE.5040407@codesourcery.com> <51F633E5.7000302@codesourcery.com> <51F65519.2080806@codesourcery.com> <51F67992.30704@codesourcery.com> <51F7967E.3060900@codesourcery.com> <51FA4D21.4000309@redhat.com> <51FA5806.7050505@codesourcery.com> <51FB7F9E.30701@redhat.com> <51FF941E.7060705@codesourcery.com> <878v0gb5qe.fsf@fleche.redhat.com> <520093B7.8060800@codesourcery.com> <5215DCEB.1010804@codesourcery.com> <521646F5.1010509@redhat.com> In-Reply-To: <521646F5.1010509@redhat.com> Content-Type: multipart/mixed; boundary="------------030808020202090201040101" X-Virus-Found: No X-SW-Source: 2013-08/txt/msg00662.txt.bz2 --------------030808020202090201040101 Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit Content-length: 6233 On 08/22/2013 10:14 PM, Pedro Alves wrote: > I'm having trouble applying this patch as well. > Could you resend it please? > >> Sorry for this. Please find the patch in attachment as well. >> Thanks. gdb/ChangeLog 2013-08-05 Muhammad Waqas PR gdb/11568 * breakpoint.c (remove_threaded_breakpoints): New function. * breakpoint.c (_initialize_breakpoint): function remove_threaded_breakpoints registers with thread_exit. Index: breakpoint.c =================================================================== RCS file: /cvs/src/src/gdb/breakpoint.c,v retrieving revision 1.773 diff -u -p -r1.773 breakpoint.c --- breakpoint.c 24 Jul 2013 19:50:32 -0000 1.773 +++ breakpoint.c 23 Aug 2013 05:15:34 -0000 @@ -2928,6 +2928,24 @@ remove_breakpoints (void) return val; } +/* Used when a thread exits, it will remove breakpoints which + are related to that thread. */ + +static void +remove_threaded_breakpoints (struct thread_info *tp, int silent) +{ + struct breakpoint *b, *b_tmp; + + ALL_BREAKPOINTS_SAFE (b, b_tmp) + { + if (b->thread == tp->num) + { + b->disposition = disp_del_at_next_stop; + b->number = 0; + } + } +} + /* Remove breakpoints of process PID. */ int @@ -16568,4 +16586,5 @@ agent-printf \"printf format string\", a automatic_hardware_breakpoints = 1; observer_attach_about_to_proceed (breakpoint_about_to_proceed); + observer_attach_thread_exit (remove_threaded_breakpoints); } 2013-07-24 Muhammad Waqas Jan Kratochvil PR gdb/11568 * gdb.thread/thread-specific-bp.c: New file. * gdb.thread/thread-specific-bp.exp: New file. Index: thread-specific-bp.c =================================================================== RCS file: thread-specific-bp.c diff -N thread-specific-bp.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ thread-specific-bp.c 23 Aug 2013 04:54:21 -0000 @@ -0,0 +1,33 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2013 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 + +static void * +start (void *arg) +{ + return NULL; +} + +int +main (void) +{ + pthread_t thread; + pthread_create (&thread, NULL, start, NULL); + pthread_join (thread, NULL); + return 0; /*set break here*/ +} Index: thread-specific-bp.exp =================================================================== RCS file: thread-specific-bp.exp diff -N thread-specific-bp.exp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ thread-specific-bp.exp 23 Aug 2013 04:54:46 -0000 @@ -0,0 +1,98 @@ +# Copyright (C) 2013 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 . +# +# Verify that a thread-specific breakpoint is deleted when the +# corresponding thread is gone. + +standard_testfile + +if {[gdb_compile_pthreads \ + "${srcdir}/${subdir}/${srcfile}" \ + "${binfile}" executable {debug} ] != "" } { + return -1 +} + +clean_restart ${binfile} + +proc check_threaded_breakpoint {mode} { with_test_prefix "$mode" { + + global gdb_prompt + gdb_breakpoint "start" + gdb_continue_to_breakpoint "start" + set thre 0 + + gdb_test_multiple "info threads" "get thread 1 id" { + -re "(\[0-9\]+)(\[^\n\r\]*Thread\[^\n\r\]*start.*)($gdb_prompt $)" { + pass "thread created" + # get the id of thread + set thre $expect_out(1,string) + } + } + gdb_breakpoint "main thread $thre" + gdb_test "info break" ".*breakpoint.*thread $thre" "Breakpoint set" + gdb_breakpoint [gdb_get_line_number "set break here"] + + # Force GDB to update its knowledge on existing threads when this + # breakpoint is hit. Otherwise, GDB doesn't realize thread $thre + # has exited and doesn't remove the thread specific breakpoint. + gdb_test "commands\ninfo threads\nend" "End with.*" "add breakpoint commands" + gdb_test "thread $thre" "Switching to thread $thre.*" "Thread $thre selected" + set full_name "continue to breakpoint: set break here" + + send_gdb "continue\n" + gdb_expect 10 { + -re "(?:Breakpoint|Temporary breakpoint) .* (at|in) .*\r\n$gdb_prompt $" { + pass $full_name + } + -re ".*$gdb_prompt $" { + fail $full_name + } + timeout { + send_gdb "thread 1\n" + exp_continue + } + } + + set test "thread-specific breakpoint is deleted" + gdb_test_multiple "info breakpoint" $test { + -re "thread $thre.*$gdb_prompt $" { + fail $test + } + -re "$gdb_prompt $" { + pass $test + } + }} +} + +if ![runto_main] { + untested "could not run to main" + return -1 +} + +# Testing in all stop mode. +check_threaded_breakpoint "All stop" + +clean_restart ${binfile} + +gdb_test "set target-async on" ".*" "Set async mode" +gdb_test "set non-stop on" ".*" "Set non stop mode" + +if ![runto_main] { + untested "could not run to main" + return -1 +} + +# Testing in non-stop with async mode. +check_threaded_breakpoint "non-stop with async" --------------030808020202090201040101 Content-Type: text/x-patch; name="breakpoint.c.thread.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="breakpoint.c.thread.patch" Content-length: 1039 Index: breakpoint.c =================================================================== RCS file: /cvs/src/src/gdb/breakpoint.c,v retrieving revision 1.773 diff -u -p -r1.773 breakpoint.c --- breakpoint.c 24 Jul 2013 19:50:32 -0000 1.773 +++ breakpoint.c 23 Aug 2013 05:15:34 -0000 @@ -2928,6 +2928,24 @@ remove_breakpoints (void) return val; } +/* Used when a thread exits, it will remove breakpoints which + are related to that thread. */ + +static void +remove_threaded_breakpoints (struct thread_info *tp, int silent) +{ + struct breakpoint *b, *b_tmp; + + ALL_BREAKPOINTS_SAFE (b, b_tmp) + { + if (b->thread == tp->num) + { + b->disposition = disp_del_at_next_stop; + b->number = 0; + } + } +} + /* Remove breakpoints of process PID. */ int @@ -16568,4 +16586,5 @@ agent-printf \"printf format string\", a automatic_hardware_breakpoints = 1; observer_attach_about_to_proceed (breakpoint_about_to_proceed); + observer_attach_thread_exit (remove_threaded_breakpoints); } --------------030808020202090201040101 Content-Type: text/x-patch; name="thread-spacific-bp.c.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="thread-spacific-bp.c.patch" Content-length: 1282 Index: thread-specific-bp.c =================================================================== RCS file: thread-specific-bp.c diff -N thread-specific-bp.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ thread-specific-bp.c 23 Aug 2013 04:54:21 -0000 @@ -0,0 +1,33 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2013 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 + +static void * +start (void *arg) +{ + return NULL; +} + +int +main (void) +{ + pthread_t thread; + pthread_create (&thread, NULL, start, NULL); + pthread_join (thread, NULL); + return 0; /*set break here*/ +} --------------030808020202090201040101 Content-Type: text/x-patch; name="thread-spacific-bp.exp.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="thread-spacific-bp.exp.patch" Content-length: 3268 Index: thread-specific-bp.exp =================================================================== RCS file: thread-specific-bp.exp diff -N thread-specific-bp.exp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ thread-specific-bp.exp 23 Aug 2013 04:54:46 -0000 @@ -0,0 +1,98 @@ +# Copyright (C) 2013 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 . +# +# Verify that a thread-specific breakpoint is deleted when the +# corresponding thread is gone. + +standard_testfile + +if {[gdb_compile_pthreads \ + "${srcdir}/${subdir}/${srcfile}" \ + "${binfile}" executable {debug} ] != "" } { + return -1 +} + +clean_restart ${binfile} + +proc check_threaded_breakpoint {mode} { with_test_prefix "$mode" { + + global gdb_prompt + gdb_breakpoint "start" + gdb_continue_to_breakpoint "start" + set thre 0 + + gdb_test_multiple "info threads" "get thread 1 id" { + -re "(\[0-9\]+)(\[^\n\r\]*Thread\[^\n\r\]*start.*)($gdb_prompt $)" { + pass "thread created" + # get the id of thread + set thre $expect_out(1,string) + } + } + gdb_breakpoint "main thread $thre" + gdb_test "info break" ".*breakpoint.*thread $thre" "Breakpoint set" + gdb_breakpoint [gdb_get_line_number "set break here"] + + # Force GDB to update its knowledge on existing threads when this + # breakpoint is hit. Otherwise, GDB doesn't realize thread $thre + # has exited and doesn't remove the thread specific breakpoint. + gdb_test "commands\ninfo threads\nend" "End with.*" "add breakpoint commands" + gdb_test "thread $thre" "Switching to thread $thre.*" "Thread $thre selected" + set full_name "continue to breakpoint: set break here" + + send_gdb "continue\n" + gdb_expect 10 { + -re "(?:Breakpoint|Temporary breakpoint) .* (at|in) .*\r\n$gdb_prompt $" { + pass $full_name + } + -re ".*$gdb_prompt $" { + fail $full_name + } + timeout { + send_gdb "thread 1\n" + exp_continue + } + } + + set test "thread-specific breakpoint is deleted" + gdb_test_multiple "info breakpoint" $test { + -re "thread $thre.*$gdb_prompt $" { + fail $test + } + -re "$gdb_prompt $" { + pass $test + } + }} +} + +if ![runto_main] { + untested "could not run to main" + return -1 +} + +# Testing in all stop mode. +check_threaded_breakpoint "All stop" + +clean_restart ${binfile} + +gdb_test "set target-async on" ".*" "Set async mode" +gdb_test "set non-stop on" ".*" "Set non stop mode" + +if ![runto_main] { + untested "could not run to main" + return -1 +} + +# Testing in non-stop with async mode. +check_threaded_breakpoint "non-stop with async" --------------030808020202090201040101--