Fix MI dprintf-insert not printing when a location is pending.
Commit Message
This patch fixes the "Format string required" error when trying to print
a dprintf on a 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 | 24 +++++++++
gdb/testsuite/gdb.mi/mi-dprintf-pending.exp | 78 +++++++++++++++++++++++++++++
gdb/testsuite/gdb.mi/mi-dprintf-pendshr.c | 27 ++++++++++
4 files changed, 140 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
Comments
On 03/27/2015 05:36 AM, Antoine Tremblay wrote:
> 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..6185329
> --- /dev/null
> +++ b/gdb/testsuite/gdb.mi/mi-dprintf-pending.exp
...
> +set msg "mi dprintf"
> +gdb_expect {
> + -re ".*~\"hello\"" {
> + pass $msg
> + }
> + -re ".*$mi_gdb_prompt$" {
> + fail $msg
> + }
> + timeout {
> + fail $msg
> + }
> +}
Pending a previous query about using mi_gdb_test here, I recommend a
maintainer approve this patch.
Thank you for your patch!
Keith
On 03/27/2015 12:51 PM, Keith Seitz wrote:
> On 03/27/2015 05:36 AM, Antoine Tremblay wrote:
>> 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..6185329
>> --- /dev/null
>> +++ b/gdb/testsuite/gdb.mi/mi-dprintf-pending.exp
> ...
>
>> +set msg "mi dprintf"
>> +gdb_expect {
>> + -re ".*~\"hello\"" {
>> + pass $msg
>> + }
>> + -re ".*$mi_gdb_prompt$" {
>> + fail $msg
>> + }
>> + timeout {
>> + fail $msg
>> + }
>> +}
>
> Pending a previous query about using mi_gdb_test here, I recommend a
> maintainer approve this patch.
>
Indeed I had missed that you can call it without a command, my mind must
have skipped that line, thanks :)
However there is still a problem forcing me to use gdb_expect I think,
namely mi_gdb_test waits for a command prompt like so :
-re "^($string_regex\[\r\n\]+)?($pattern\[\r\n\]+$mi_gdb_prompt\[ \]*)"
However dprintf does mean you will get a prompt printed...
You will get a prompt only when hitting the breakpoint I placed.
This means that if for some reason the breakpoint would not hit, the
dprintf test would fail, when it's the breakpoint that should fail.
I could remove mi_expect_stop at the end and assume that breakpoint will
not fail but I think it's not right ? also mi-dprintf.exp is using the
same mi_run_cmd / gdb_expect / mi_expect_stop ...
What do you think ?
On 03/27/2015 10:12 AM, Antoine Tremblay wrote:
> However there is still a problem forcing me to use gdb_expect I think,
> namely mi_gdb_test waits for a command prompt like so :
>
> -re "^($string_regex\[\r\n\]+)?($pattern\[\r\n\]+$mi_gdb_prompt\[ \]*)"
>
> However dprintf does mean you will get a prompt printed...
>
> You will get a prompt only when hitting the breakpoint I placed.
Ick. Yeah, you are right. My bad.
> I could remove mi_expect_stop at the end and assume that breakpoint will
> not fail but I think it's not right ? also mi-dprintf.exp is using the
> same mi_run_cmd / gdb_expect / mi_expect_stop ...
>
> What do you think ?
I think everything is fine as it is. Sorry about the noise.
So, once again, while I am not a maintainer, I recommend a maintainer
approve this patch.
Thank you for your patience,
Keith
ping...
On 03/27/2015 01:34 PM, Keith Seitz wrote:
> On 03/27/2015 10:12 AM, Antoine Tremblay wrote:
>> However there is still a problem forcing me to use gdb_expect I think,
>> namely mi_gdb_test waits for a command prompt like so :
>>
>> -re "^($string_regex\[\r\n\]+)?($pattern\[\r\n\]+$mi_gdb_prompt\[ \]*)"
>>
>> However dprintf does mean you will get a prompt printed...
>>
>> You will get a prompt only when hitting the breakpoint I placed.
>
> Ick. Yeah, you are right. My bad.
>
>> I could remove mi_expect_stop at the end and assume that breakpoint will
>> not fail but I think it's not right ? also mi-dprintf.exp is using the
>> same mi_run_cmd / gdb_expect / mi_expect_stop ...
>>
>> What do you think ?
>
> I think everything is fine as it is. Sorry about the noise.
>
> So, once again, while I am not a maintainer, I recommend a maintainer
> approve this patch.
>
> Thank you for your patience,
> Keith
>
@@ -9774,7 +9774,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. */
@@ -9783,10 +9786,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;
new file mode 100644
@@ -0,0 +1,24 @@
+/* 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 <http://www.gnu.org/licenses/>. */
+
+extern void pendfunc ();
+
+int main (void)
+{
+ pendfunc ();
+ return 0; /* set breakpoint 1 here */
+}
new file mode 100644
@@ -0,0 +1,78 @@
+# 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 <http://www.gnu.org/licenses/>.
+
+# This test checks if dprintf prints correctly when it's pending.
+# 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>\",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 ".*" ".*" ".*" ".*" ".*" "" "$msg stop"
new file mode 100644
@@ -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 <http://www.gnu.org/licenses/>. */
+
+void
+pendfunc1 (void)
+{
+}
+
+void
+pendfunc (void)
+{
+ pendfunc1 ();
+}