From: Andrew Burgess <aburgess@redhat.com>
To: gdb-patches@sourceware.org
Cc: Andrew Burgess <aburgess@redhat.com>
Subject: [PUSHED] gdb: add missing notify_breakpoint_modified call
Date: Wed, 23 Aug 2023 09:06:22 +0100 [thread overview]
Message-ID: <f29ab2e0e350a4b382a1e4eb1b41c28564d83e94.1692777956.git.aburgess@redhat.com> (raw)
In-Reply-To: <b080fe54fb3414b488b8ef323c6c50def061f918.1692287517.git.aburgess@redhat.com>
The commit:
commit b080fe54fb3414b488b8ef323c6c50def061f918
Date: Tue Nov 8 12:32:51 2022 +0000
gdb: add inferior-specific breakpoints
introduced a bug in the function breakpoint_set_inferior. The above
commit includes this line:
gdb::observers::breakpoint_modified.notify (b);
when it should have instead used this line:
notify_breakpoint_modified (b);
The change to use notify_breakpoint_modified was introduced to GDB
after commit b080fe54fb34 was written, but before it was merged, and I
failed to update this part of the code during the rebase.
The consequence of this error is that the MI interpreter will not emit
breakpoint-modified notifications when breakpoint_set_inferior is
called.
In this commit I update the code to call notify_breakpoint_modified,
and add a test that checks the MI events are being emitted correctly
in this case.
---
gdb/breakpoint.c | 2 +-
gdb/testsuite/gdb.mi/mi-py-modify-bp.c | 28 +++++++++++
gdb/testsuite/gdb.mi/mi-py-modify-bp.exp | 61 ++++++++++++++++++++++++
gdb/testsuite/gdb.mi/mi-py-modify-bp.py | 25 ++++++++++
4 files changed, 115 insertions(+), 1 deletion(-)
create mode 100644 gdb/testsuite/gdb.mi/mi-py-modify-bp.c
create mode 100644 gdb/testsuite/gdb.mi/mi-py-modify-bp.exp
create mode 100644 gdb/testsuite/gdb.mi/mi-py-modify-bp.py
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index f88ca1c9b65..f0f5328fb5e 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -1574,7 +1574,7 @@ breakpoint_set_inferior (struct breakpoint *b, int inferior)
int old_inferior = b->inferior;
b->inferior = inferior;
if (old_inferior != inferior)
- gdb::observers::breakpoint_modified.notify (b);
+ notify_breakpoint_modified (b);
}
/* See breakpoint.h. */
diff --git a/gdb/testsuite/gdb.mi/mi-py-modify-bp.c b/gdb/testsuite/gdb.mi/mi-py-modify-bp.c
new file mode 100644
index 00000000000..58546b33387
--- /dev/null
+++ b/gdb/testsuite/gdb.mi/mi-py-modify-bp.c
@@ -0,0 +1,28 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+ Copyright (C) 2023 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/>. */
+
+int
+foo ()
+{
+ return 0;
+}
+
+int
+main ()
+{
+ return foo ();
+}
diff --git a/gdb/testsuite/gdb.mi/mi-py-modify-bp.exp b/gdb/testsuite/gdb.mi/mi-py-modify-bp.exp
new file mode 100644
index 00000000000..95a26eab672
--- /dev/null
+++ b/gdb/testsuite/gdb.mi/mi-py-modify-bp.exp
@@ -0,0 +1,61 @@
+# Copyright (C) 2023 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/>.
+
+# Check that the MI interpreter correctly emits breakpoint-modified
+# notifications when a breakpoint's thread or inferior is set from
+# Python code.
+
+load_lib mi-support.exp
+set MIFLAGS "-i=mi"
+
+standard_testfile
+
+require allow_python_tests
+
+if {[build_executable $testfile.exp $testfile $srcfile] == -1} {
+ return -1
+}
+
+set remote_python_file [gdb_remote_download host \
+ ${srcdir}/${subdir}/${testfile}.py]
+
+mi_clean_restart $binfile
+mi_runto_main
+
+# Delete all breakpoints.
+mi_delete_breakpoints
+
+# Create a breakpoint. At this point the breakpoint is global, but
+# this will be adjusted from Python code.
+mi_create_breakpoint "foo" "break in foo" -disp keep -func foo
+set bpnum [mi_get_valueof "/d" "\$bpnum" "INVALID" \
+ "get number for thread-specific breakpoint"]
+
+# Some patterns used in the expected output below.
+set thr_group_re [string_to_regexp {thread-groups=["i1"]}]
+set times_re [string_to_regexp {times="0"}]
+
+# Source the Python script, the script changes the thread then
+# inferior field of the first breakpoint, we expect to see the
+# breakpoint modified four times.
+mi_gdb_test "source $remote_python_file" \
+ [multi_line \
+ "&\"source \[^\r\n\]+\"" \
+ "=breakpoint-modified,bkpt=\\{number=\"$bpnum\",\[^\r\n\]+\\,$thr_group_re,thread=\"1\",$times_re,\[^\r\n\]+}" \
+ "=breakpoint-modified,bkpt=\\{number=\"$bpnum\",\[^\r\n\]+\\,$thr_group_re,$times_re,\[^\r\n\]+}" \
+ "=breakpoint-modified,bkpt=\\{number=\"$bpnum\",\[^\r\n\]+\\,$thr_group_re,inferior=\"1\",$times_re,\[^\r\n\]+}" \
+ "=breakpoint-modified,bkpt=\\{number=\"$bpnum\",\[^\r\n\]+\\,$thr_group_re,$times_re,\[^\r\n\]+}" \
+ "\\^done"] \
+ "source python script"
diff --git a/gdb/testsuite/gdb.mi/mi-py-modify-bp.py b/gdb/testsuite/gdb.mi/mi-py-modify-bp.py
new file mode 100644
index 00000000000..6e1034c38bd
--- /dev/null
+++ b/gdb/testsuite/gdb.mi/mi-py-modify-bp.py
@@ -0,0 +1,25 @@
+# Copyright (C) 2023 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/>.
+
+import gdb
+
+bps = gdb.breakpoints()
+bp = bps[0]
+
+bp.thread = 1
+bp.thread = None
+
+bp.inferior = 1
+bp.inferior = None
base-commit: 835f16daa77952015d1a97ae6eab48cc2ea14fb8
--
2.25.4
next prev parent reply other threads:[~2023-08-23 8:06 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-28 11:25 [PATCH 0/6] Inferior specific breakpoints Andrew Burgess
2022-11-28 11:25 ` [PATCH 1/6] gdb/remote: announce thread exit events for remote targets Andrew Burgess
2022-11-28 11:25 ` [PATCH 2/6] gdb/testsuite: don't try to set non-stop mode on a running target Andrew Burgess
2022-11-28 11:25 ` [PATCH 3/6] gdb: fix display of thread condition for multi-location breakpoints Andrew Burgess
2022-12-23 8:37 ` Aktemur, Tankut Baris
2022-11-28 11:25 ` [PATCH 4/6] gdb: error if 'thread' or 'task' keywords are overused Andrew Burgess
2022-11-28 13:10 ` Eli Zaretskii
2022-11-28 11:25 ` [PATCH 5/6] gdb: add inferior-specific breakpoints and watchpoints Andrew Burgess
2022-11-28 13:18 ` Eli Zaretskii
2022-12-23 10:05 ` Aktemur, Tankut Baris
2023-01-19 19:13 ` Andrew Burgess
2023-01-20 13:12 ` Aktemur, Tankut Baris
2022-11-28 11:25 ` [PATCH 6/6] gdb: convert the 'start' breakpoint to use inferior keyword Andrew Burgess
2022-12-23 10:17 ` Aktemur, Tankut Baris
2022-12-23 10:55 ` [PATCH 0/6] Inferior specific breakpoints Aktemur, Tankut Baris
2023-01-20 9:46 ` [PATCHv2 " Andrew Burgess
2023-01-20 9:46 ` [PATCHv2 1/6] gdb/remote: announce thread exit events for remote targets Andrew Burgess
2023-02-02 17:50 ` Pedro Alves
2023-02-04 15:46 ` Andrew Burgess
2023-01-20 9:46 ` [PATCHv2 2/6] gdb/testsuite: don't try to set non-stop mode on a running target Andrew Burgess
2023-02-04 16:22 ` Andrew Burgess
2023-01-20 9:46 ` [PATCHv2 3/6] gdb: fix display of thread condition for multi-location breakpoints Andrew Burgess
2023-02-02 18:13 ` Pedro Alves
2023-02-06 14:48 ` Andrew Burgess
2023-02-06 17:01 ` Pedro Alves
2023-02-07 14:42 ` Andrew Burgess
2023-01-20 9:46 ` [PATCHv2 4/6] gdb: error if 'thread' or 'task' keywords are overused Andrew Burgess
2023-01-20 13:22 ` Eli Zaretskii
2023-02-02 14:08 ` Andrew Burgess
2023-02-02 14:31 ` Eli Zaretskii
2023-02-02 18:21 ` Pedro Alves
2023-02-03 16:41 ` Andrew Burgess
2023-02-04 5:52 ` Joel Brobecker
2023-02-04 15:40 ` Andrew Burgess
2023-02-06 11:06 ` Andrew Burgess
2023-01-20 9:46 ` [PATCHv2 5/6] gdb: add inferior-specific breakpoints and watchpoints Andrew Burgess
2023-01-20 13:25 ` Eli Zaretskii
2023-02-02 19:17 ` Pedro Alves
2023-02-03 16:55 ` Andrew Burgess
2023-02-06 17:24 ` Pedro Alves
2023-02-16 12:56 ` Aktemur, Tankut Baris
2023-01-20 9:46 ` [PATCHv2 6/6] gdb: convert the 'start' breakpoint to use inferior keyword Andrew Burgess
2023-02-16 12:59 ` Aktemur, Tankut Baris
2023-03-16 17:03 ` [PATCHv3 0/2] Inferior specific breakpoints Andrew Burgess
2023-03-16 17:03 ` [PATCHv3 1/2] gdb: cleanup around some set_momentary_breakpoint_at_pc calls Andrew Burgess
2023-04-03 14:12 ` Andrew Burgess
2023-03-16 17:03 ` [PATCHv3 2/2] gdb: add inferior-specific breakpoints Andrew Burgess
2023-04-03 14:14 ` [PATCHv4] " Andrew Burgess
2023-05-15 19:15 ` [PATCHv5] " Andrew Burgess
2023-05-30 20:41 ` [PATCHv6] " Andrew Burgess
2023-07-07 10:23 ` [PATCHv7] " Andrew Burgess
2023-08-17 15:53 ` [PUSHEDv8] " Andrew Burgess
2023-08-23 8:06 ` Andrew Burgess [this message]
2023-08-23 8:19 ` [PUSHED] gdb/testsuite: improve MI support for inferior specific breakpoints Andrew Burgess
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f29ab2e0e350a4b382a1e4eb1b41c28564d83e94.1692777956.git.aburgess@redhat.com \
--to=aburgess@redhat.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).