From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 31870 invoked by alias); 24 Nov 2009 15:05:42 -0000 Received: (qmail 31860 invoked by uid 22791); 24 Nov 2009 15:05:41 -0000 X-SWARE-Spam-Status: No, hits=-2.5 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: sourceware.org Received: from NaN.false.org (HELO nan.false.org) (208.75.86.248) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 24 Nov 2009 15:05:36 +0000 Received: from nan.false.org (localhost [127.0.0.1]) by nan.false.org (Postfix) with ESMTP id DD3BC10CE9; Tue, 24 Nov 2009 15:05:34 +0000 (GMT) Received: from caradoc.them.org (209.195.188.212.nauticom.net [209.195.188.212]) by nan.false.org (Postfix) with ESMTP id 94266109F9; Tue, 24 Nov 2009 15:05:34 +0000 (GMT) Received: from drow by caradoc.them.org with local (Exim 4.69) (envelope-from ) id 1NCwxR-0002Nb-Mg; Tue, 24 Nov 2009 10:05:33 -0500 Date: Tue, 24 Nov 2009 15:05:00 -0000 From: Daniel Jacobowitz To: Joel Brobecker Cc: Andrew Stubbs , gdb-patches@sourceware.org, "Maciej W. Rozycki" , Vladimir Prus , Eli Zaretskii Subject: Re: RFC: Fix "break *EXP thread NUM" Message-ID: <20091124150533.GA8964@caradoc.them.org> Mail-Followup-To: Joel Brobecker , Andrew Stubbs , gdb-patches@sourceware.org, "Maciej W. Rozycki" , Vladimir Prus , Eli Zaretskii References: <20091123212736.GA3828@caradoc.them.org> <4B0BB652.3080303@codesourcery.com> <20091124142406.GA14875@caradoc.them.org> <20091124145422.GA26004@adacore.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20091124145422.GA26004@adacore.com> User-Agent: Mutt/1.5.20 (2009-06-14) X-IsSubscribed: yes 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 X-SW-Source: 2009-11/txt/msg00525.txt.bz2 On Tue, Nov 24, 2009 at 06:54:22AM -0800, Joel Brobecker wrote: > I'm a little tied up at the moment, but I can take care of this. Thanks! Meanwhile, here's a patch that handles "t" and "task". I talked to Andrew about this, and I still think we can get away without "+N" and "-N"; they're only accepted by an accident of strtol. -- Daniel Jacobowitz CodeSourcery 2009-11-23 Daniel Jacobowitz * breakpoint.c (find_condition_and_thread): Correct task error message. * c-exp.y (yylex): Stop before "thread N", "task N", or abbreviations of those. * gdb.texinfo (Thread-Specific Breakpoints): Thread specifiers are allowed after the breakpoint condition. * gdb.base/condbreak.exp: Test combinations of "break *EXP", "if", and "thread". Correct matching in the previous test. Index: breakpoint.c =================================================================== RCS file: /cvs/src/src/gdb/breakpoint.c,v retrieving revision 1.435 diff -u -p -r1.435 breakpoint.c --- breakpoint.c 22 Nov 2009 15:38:58 -0000 1.435 +++ breakpoint.c 24 Nov 2009 15:03:10 -0000 @@ -6635,7 +6635,7 @@ find_condition_and_thread (char *tok, CO if (tok == tmptok) error (_("Junk after task keyword.")); if (!valid_task_id (*task)) - error (_("Unknown task %d\n"), *task); + error (_("Unknown task %d."), *task); } else error (_("Junk at end of arguments.")); Index: c-exp.y =================================================================== RCS file: /cvs/src/src/gdb/c-exp.y,v retrieving revision 1.65 diff -u -p -r1.65 c-exp.y --- c-exp.y 11 Nov 2009 16:45:46 -0000 1.65 +++ c-exp.y 24 Nov 2009 15:03:10 -0000 @@ -2250,6 +2250,24 @@ yylex (void) return 0; } + /* For the same reason (breakpoint conditions), "thread N" + terminates the expression. "thread" could be an identifier, but + an identifier is never followed by a number without intervening + punctuation. "task" is similar. Handle abbreviations of these, + similarly to breakpoint.c:find_condition_and_thread. */ + if (namelen >= 1 + && (strncmp (tokstart, "thread", namelen) == 0 + || strncmp (tokstart, "task", namelen) == 0) + && (tokstart[namelen] == ' ' || tokstart[namelen] == '\t') + && ! scanning_macro_expansion ()) + { + char *p = tokstart + namelen + 1; + while (*p == ' ' || *p == '\t') + p++; + if (*p >= '0' && *p <= '9') + return 0; + } + lexptr += namelen; tryname: Index: doc/gdb.texinfo =================================================================== RCS file: /cvs/src/src/gdb/doc/gdb.texinfo,v retrieving revision 1.642 diff -u -p -r1.642 gdb.texinfo --- doc/gdb.texinfo 23 Nov 2009 18:44:10 -0000 1.642 +++ doc/gdb.texinfo 24 Nov 2009 15:03:15 -0000 @@ -5214,8 +5214,8 @@ breakpoint, the breakpoint applies to @e program. You can use the @code{thread} qualifier on conditional breakpoints as -well; in this case, place @samp{thread @var{threadno}} before the -breakpoint condition, like this: +well; in this case, place @samp{thread @var{threadno}} before or +after the breakpoint condition, like this: @smallexample (@value{GDBP}) break frik.c:13 thread 28 if bartab > lim Index: testsuite/gdb.base/condbreak.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.base/condbreak.exp,v retrieving revision 1.13 diff -u -p -r1.13 condbreak.exp --- testsuite/gdb.base/condbreak.exp 3 Jan 2009 05:58:03 -0000 1.13 +++ testsuite/gdb.base/condbreak.exp 24 Nov 2009 15:03:15 -0000 @@ -207,10 +207,10 @@ gdb_expect { setup_xfail hppa2.0w-*-* 11512CLLbs send_gdb "continue\n" gdb_expect { - -re "Continuing\\..*Breakpoint \[0-9\]+, marker2 \\(a=43\\) at .*$srcfile1:($bp_location8|$bp_location9).*($bp_location8|$bp_location9)\[\t \]+.*" { + -re "Continuing\\..*Breakpoint \[0-9\]+, marker2 \\(a=43\\) at .*$srcfile1:($bp_location8|$bp_location9).*($bp_location8|$bp_location9)\[\t \]+.*$gdb_prompt $" { pass "run until breakpoint at marker2" } - -re "Continuing\\..*Breakpoint \[0-9\]+, $hex in marker2 \\(a=43\\) at .*$srcfile1:($bp_location8|$bp_location9).*($bp_location8|$bp_location9)\[\t \]+.*" { + -re "Continuing\\..*Breakpoint \[0-9\]+, $hex in marker2 \\(a=43\\) at .*$srcfile1:($bp_location8|$bp_location9).*($bp_location8|$bp_location9)\[\t \]+.*$gdb_prompt $" { xfail "run until breakpoint at marker2" } -re "$gdb_prompt $" { @@ -220,3 +220,30 @@ gdb_expect { fail "(timeout) run until breakpoint at marker2" } } + +# Test combinations of conditional and thread-specific breakpoints. +gdb_test "break main if (1==1) thread 999" \ + "Unknown thread 999\\." +gdb_test "break main thread 999 if (1==1)" \ + "Unknown thread 999\\." + +# Verify that both if and thread can be distinguished from a breakpoint +# address expression. +gdb_test "break *main if (1==1) thread 999" \ + "Unknown thread 999\\." +gdb_test "break *main thread 999 if (1==1)" \ + "Unknown thread 999\\." + +# Similarly for task. +gdb_test "break *main if (1==1) task 999" \ + "Unknown task 999\\." +gdb_test "break *main task 999 if (1==1)" \ + "Unknown task 999\\." + +# GDB accepts abbreviations for "thread" and "task". +gdb_test "break *main if (1==1) t 999" \ + "Unknown thread 999\\." +gdb_test "break *main if (1==1) th 999" \ + "Unknown thread 999\\." +gdb_test "break *main if (1==1) ta 999" \ + "Unknown task 999\\."