From d7154a8d08b142d1258dc2e4189ff0d00cd26493 Mon Sep 17 00:00:00 2001 From: Jan Vrany Date: Thu, 31 May 2018 09:56:33 +0100 Subject: [PATCH] Notify about breakpoint modification when enabling/disabling single location When a single breakpoint location enableness was modified by a CLI command, observers were not notified about it. This issue is now fixed. gdb/ChangeLog: * breakpoint.c (enable_disable_bp_num_loc): Notify observers. gdb/testsuite/ChangeLog: * gdb.mi/mi-breakpoint-location-ena-dis.cc: New file. * gdb.mi/mi-breakpoint-location-ena-dis.exp: New file. --- gdb/ChangeLog | 4 ++ gdb/breakpoint.c | 2 + gdb/testsuite/ChangeLog | 5 ++ .../gdb.mi/mi-breakpoint-location-ena-dis.cc | 36 ++++++++++++ .../gdb.mi/mi-breakpoint-location-ena-dis.exp | 56 +++++++++++++++++++ 5 files changed, 103 insertions(+) create mode 100644 gdb/testsuite/gdb.mi/mi-breakpoint-location-ena-dis.cc create mode 100644 gdb/testsuite/gdb.mi/mi-breakpoint-location-ena-dis.exp diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 8862ae4c1d0..e6f8e5b149c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2018-07-25 Jan Vrany + + * breakpoint.c (enable_disable_bp_num_loc): Notify observers. + 2018-07-25 Joel Brobecker * MAINTAINERS (Global Maintainers): Add Tom Tromey. diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 9e04c7ea83a..6b6e1f6c257 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -14220,6 +14220,8 @@ enable_disable_bp_num_loc (int bp_num, int loc_num, bool enable) target_disable_tracepoint (loc); } update_global_location_list (UGLL_DONT_INSERT); + + gdb::observers::breakpoint_modified.notify (loc->owner); } /* Enable or disable a range of breakpoint locations. BP_NUM is the diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 6d086644a6a..80c99a8f071 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-07-25 Jan Vrany + + * gdb.mi/mi-breakpoint-location-ena-dis.cc: New file. + * gdb.mi/mi-breakpoint-location-ena-dis.exp: New file. + 2018-07-20 Tom de Vries * gdb.base/vla-optimized-out.c: Make noclone attribute conditional on diff --git a/gdb/testsuite/gdb.mi/mi-breakpoint-location-ena-dis.cc b/gdb/testsuite/gdb.mi/mi-breakpoint-location-ena-dis.cc new file mode 100644 index 00000000000..981fbc8d82f --- /dev/null +++ b/gdb/testsuite/gdb.mi/mi-breakpoint-location-ena-dis.cc @@ -0,0 +1,36 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2018 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 . */ + +static int +add (int a, int b) +{ + return a + b; +} + +static double +add (double a, double b) +{ + return a + b; +} + +int +main (void) +{ + int i = add (3, 4); + double d = add (3.0, 4.0); + return 1; +} diff --git a/gdb/testsuite/gdb.mi/mi-breakpoint-location-ena-dis.exp b/gdb/testsuite/gdb.mi/mi-breakpoint-location-ena-dis.exp new file mode 100644 index 00000000000..03e03d23657 --- /dev/null +++ b/gdb/testsuite/gdb.mi/mi-breakpoint-location-ena-dis.exp @@ -0,0 +1,56 @@ +# Copyright 2018 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 . + +# Tests whether =breakpoint=modified notification is sent when a single +# breakpoint location is enabled or disabled via CLI. + +load_lib mi-support.exp +set MIFLAGS "-i=mi" + +gdb_exit +if {[mi_gdb_start]} { + continue +} + +# +# Start here +# +standard_testfile .cc + +if {[gdb_compile "$srcdir/$subdir/$srcfile" $binfile executable {debug c++}] != "" } { + return -1 +} + +mi_run_to_main + +mi_gdb_test "break add" \ + {(&.*)*.*~"Breakpoint 2 at.*\\n".*=breakpoint-created,bkpt=\{number="2",type="breakpoint".*\},\{number="2.1",enabled="y".*\}.*\n\^done} \ + "break add" + +# Modify enableness through MI commands shouldn't trigger MI +# notification. +mi_gdb_test "-break-disable 2.2" "\\^done" "-break-disable 2.2" +mi_gdb_test "-break-enable 2.2" "\\^done" "-break-enable 2.2" + +# Modify enableness through CLI commands should trigger MI +# notification. +mi_gdb_test "dis 2.2" \ + {.*=breakpoint-modified,bkpt=\{number="2",type="breakpoint".*\},\{number="2.1",enabled="y".*\},\{number="2.2",enabled="n".*\}.*\n\^done} \ + "dis 2.2" +mi_gdb_test "en 2.2" \ + {.*=breakpoint-modified,bkpt=\{number="2",type="breakpoint".*\},\{number="2.1",enabled="y".*\},\{number="2.2",enabled="y".*\}.*\n\^done} \ + "en 2.2" + +mi_gdb_exit -- 2.30.2