From patchwork Fri Jun 12 12:27:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Tremblay X-Patchwork-Id: 7141 Received: (qmail 105915 invoked by alias); 12 Jun 2015 12:27:47 -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 105882 invoked by uid 89); 12 Jun 2015 12:27:45 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.5 required=5.0 tests=AWL, BAYES_00, SPF_PASS autolearn=ham version=3.3.2 X-HELO: usevmg20.ericsson.net Received: from usevmg20.ericsson.net (HELO usevmg20.ericsson.net) (198.24.6.45) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Fri, 12 Jun 2015 12:27:41 +0000 Received: from EUSAAHC002.ericsson.se (Unknown_Domain [147.117.188.78]) by usevmg20.ericsson.net (Symantec Mail Security) with SMTP id 33.21.32689.2667A755; Fri, 12 Jun 2015 08:04:18 +0200 (CEST) Received: from elxa4wqvvz1.dyn.mo.ca.am.ericsson.se (147.117.188.8) by smtps-am.internal.ericsson.com (147.117.188.78) with Microsoft SMTP Server (TLS) id 14.3.210.2; Fri, 12 Jun 2015 08:27:38 -0400 From: Antoine Tremblay To: CC: Antoine Tremblay Subject: [PATCH v3] Fix MI dprintf-insert not printing on a resolved pending location. Date: Fri, 12 Jun 2015 08:27:32 -0400 Message-ID: <1434112052-6972-1-git-send-email-antoine.tremblay@ericsson.com> In-Reply-To: <5534ED92.1010604@ericsson.com> References: <5534ED92.1010604@ericsson.com> MIME-Version: 1.0 X-IsSubscribed: yes --- Diffs in v3 : - some syntax formating for int main - wording changes to make it more clear that the pending location is now resolved - more explicit mi_expect_stop --- This patch fixes the "Format string required" error when trying to print a dprintf on a now resolved, pending location when set via the MI interface even if the format string is entered correctly. This patch also adds a test case to check that issue called mi-dprintf-pending.exp. gdb/ChangeLog: PR breakpoints/16465 * breakpoint.c (create_breakpoint): Save extra_string for pending breakpoints. gdb/testsuite/ChangeLog: PR breakpoints/16465 * gdb.mi/mi-dprintf-pending.c: New file. * gdb.mi/mi-dprintf-pending.exp: New test. * gdb.mi/mi-dprintf-pendshr.c: New file. --- gdb/breakpoint.c | 13 ++++- gdb/testsuite/gdb.mi/mi-dprintf-pending.c | 25 +++++++++ gdb/testsuite/gdb.mi/mi-dprintf-pending.exp | 79 +++++++++++++++++++++++++++++ gdb/testsuite/gdb.mi/mi-dprintf-pendshr.c | 27 ++++++++++ 4 files changed, 142 insertions(+), 2 deletions(-) create mode 100644 gdb/testsuite/gdb.mi/mi-dprintf-pending.c create mode 100644 gdb/testsuite/gdb.mi/mi-dprintf-pending.exp create mode 100644 gdb/testsuite/gdb.mi/mi-dprintf-pendshr.c diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 657c58e..0a960f8 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -9773,7 +9773,10 @@ create_breakpoint (struct gdbarch *gdbarch, b->addr_string = copy_arg; if (parse_arg) - b->cond_string = NULL; + { + b->cond_string = NULL; + b->extra_string = NULL; + } else { /* Create a private copy of condition string. */ @@ -9782,10 +9785,16 @@ create_breakpoint (struct gdbarch *gdbarch, cond_string = xstrdup (cond_string); make_cleanup (xfree, cond_string); } + /* Create a private copy of any extra string. */ + if (extra_string != NULL) + { + extra_string = xstrdup (extra_string); + make_cleanup (xfree, extra_string); + } b->cond_string = cond_string; + b->extra_string = extra_string; b->thread = thread; } - b->extra_string = NULL; b->ignore_count = ignore_count; b->disposition = tempflag ? disp_del : disp_donttouch; b->condition_not_parsed = 1; diff --git a/gdb/testsuite/gdb.mi/mi-dprintf-pending.c b/gdb/testsuite/gdb.mi/mi-dprintf-pending.c new file mode 100644 index 0000000..dcb9a0a --- /dev/null +++ b/gdb/testsuite/gdb.mi/mi-dprintf-pending.c @@ -0,0 +1,25 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2015 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 . */ + +extern void pendfunc (); + +int +main (void) +{ + pendfunc (); + return 0; /* set breakpoint 1 here */ +} diff --git a/gdb/testsuite/gdb.mi/mi-dprintf-pending.exp b/gdb/testsuite/gdb.mi/mi-dprintf-pending.exp new file mode 100644 index 0000000..5bb4a1b --- /dev/null +++ b/gdb/testsuite/gdb.mi/mi-dprintf-pending.exp @@ -0,0 +1,79 @@ +# Copyright 2015 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 test checks if dprintf prints correctly when it's resolved from +# pending state. +# See PR breakpoints/16465. + +load_lib mi-support.exp + +if {[skip_shlib_tests]} { + return 0 +} + +standard_testfile mi-dprintf-pending.c + +set libfile1 "mi-dprintf-pendshr" +set libsrc1 $srcdir/$subdir/$libfile1.c +set lib_sl1 [standard_output_file $libfile1.sl] +set lib_opts debug +set exec_opts [list debug shlib=$lib_sl1 shlib_load] + +if {[get_compiler_info]} { + return -1 +} + +if {[gdb_compile_shlib $libsrc1 $lib_sl1 $lib_opts] != ""} { + untested "Could not compile $libsrc1" + return -1 +} + +if {[gdb_compile $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != ""} { + untested "Could not compile $srcdir/$subdir/$srcfile" + return -1 +} + +# Start with a fresh gdb. +gdb_exit +mi_gdb_start +mi_gdb_reinitialize_dir $srcdir/$subdir +mi_gdb_load ${binfile} +mi_load_shlibs $lib_sl1 + +set bp_location1 [gdb_get_line_number "set breakpoint 1 here"] + +# Set pending dprintf via MI. +mi_gdb_test "-dprintf-insert -f pendfunc1 \"hello\"" \ + ".*\\^done,bkpt={number=\"1\",type=\"dprintf\",disp=\"keep\",enabled=\"y\",addr=\"\",pending=\"pendfunc1\",times=\"0\",original-location=\"pendfunc1\"}" \ + "mi set dprintf" + +mi_create_breakpoint $bp_location1 "mi insert breakpoint bp_location1" \ + -type "breakpoint" -line $bp_location1 -file $srcdir/$subdir/$srcfile + +mi_run_cmd + +set msg "mi dprintf" +gdb_expect { + -re ".*~\"hello\"" { + pass $msg + } + -re ".*$mi_gdb_prompt$" { + fail $msg + } + timeout { + fail $msg + } +} +mi_expect_stop ".*" "main" ".*" ".*$srcfile" "$bp_location1" "" "$msg stop" diff --git a/gdb/testsuite/gdb.mi/mi-dprintf-pendshr.c b/gdb/testsuite/gdb.mi/mi-dprintf-pendshr.c new file mode 100644 index 0000000..05d188c --- /dev/null +++ b/gdb/testsuite/gdb.mi/mi-dprintf-pendshr.c @@ -0,0 +1,27 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2015 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 . */ + +void +pendfunc1 (void) +{ +} + +void +pendfunc (void) +{ + pendfunc1 (); +}