From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) by sourceware.org (Postfix) with ESMTPS id 66C3B3858401 for ; Sat, 6 May 2023 19:06:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 66C3B3858401 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-pf1-x42a.google.com with SMTP id d2e1a72fcca58-64384274895so2185416b3a.2 for ; Sat, 06 May 2023 12:06:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683399989; x=1685991989; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id:from :to:cc:subject:date:message-id:reply-to; bh=y31NJnW1983pmTbsMm9lOZ19qdWtg99fesC09tJw8UM=; b=b8bQrInpRTl11iRyfJg3rweL1IgMX3EhaAGK5QlmBaNgRtJ0m/hSdE1h/Td1kTn4LW RZsDavB68uMzNXYS/Ku4nh0lG2xxynQcNZgVwmRJoI4eJe+74NkY8V03zRO/kEB8QxNJ fbx5BpwYFAxMV5sj1omkgdwk5rWxluRs2t9pZKFFrPD+Di055S657JGT9VJdyQoii6CN +T0n0UwaUPQkb/YdTOZNccJIs2IYK3hu0m2i4G4qxc77pYW1WZsZ2ryWnBXEqnJBNoTL qgNeCvq9GuTve3XvzLsjx3WnAnTDM77hcc30cM9he2xkmsSJuaW7NS1ig40CjKlMWq2I evWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683399989; x=1685991989; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=y31NJnW1983pmTbsMm9lOZ19qdWtg99fesC09tJw8UM=; b=k6vP0kxXuQ6P64oenQrvpm/0BzExsAjnsOLZ1TM+fqVVxS80aGP+V6D2Uczl9cC/KR KSM5UJAuVsnnsdc/x7bzNTyrlyMBiwYL0VZ0NfArVPZ+KTFNDS4Iz8ADkuz7MKKNWPaA t9tT3KKSVprRwRoRLLYQFMk2BFE600HHj6ndQoBYSzRlR8xFyNkqNnIbD/poYPluRMQF 4u9fWKHk6JeuKYeX76kSEuKI6+se7dRBORU5MfFe49Dq6hGksgvUKUhkAbSU1jZHB/Fe TD5pmH6gOU93FzmV2Llmcl+XgEVx0lRMxrErOjV7bERtxYxUUAOrJ0TEEVD350TVdQm/ IdGg== X-Gm-Message-State: AC+VfDx9qa5GeV1HumwLZ/wjErIhifVmnXSvAlJHeicijxPR92Ww1/Hh 1Iz10Pj/vMa2IZij1haPQD9eK7ICCLFsmppxFtA= X-Google-Smtp-Source: ACHHUZ6eWjtv2ukLDGsJ8WGDzJqZ69fxdWS9JGKl3U2hnhd2+HtbVtMAzHZH070TKxIDEIuKwxRSSw== X-Received: by 2002:a05:6a00:1a56:b0:643:b310:6816 with SMTP id h22-20020a056a001a5600b00643b3106816mr4777408pfv.9.1683399989058; Sat, 06 May 2023 12:06:29 -0700 (PDT) Received: from [192.168.117.3] (sd237023.ching-de.ab.nthu.edu.tw. [140.114.237.23]) by smtp.gmail.com with ESMTPSA id t13-20020aa7938d000000b0063f2a5a59d1sm3451917pfe.190.2023.05.06.12.06.27 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 06 May 2023 12:06:28 -0700 (PDT) Message-ID: Date: Sun, 7 May 2023 03:06:24 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.10.1 Subject: [PING] [PATCH v5] [PR python/29603] Disable out-of-scope watchpoints To: JohnsonSun , SimonMarchi , LancelotSIX , gdb-patches@sourceware.org References: <1b60c407-1406-ed3c-7d64-a79c786ae9b7@gmail.com> <20230423095408.7638-1-j3.soon777@gmail.com> Content-Language: en-US From: Johnson Sun In-Reply-To: <20230423095408.7638-1-j3.soon777@gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM,GIT_PATCH_0,KAM_SHORT,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Ping for: Johnson On 4/23/2023 5:54 PM, JohnsonSun wrote: > Currently, when a local software watchpoint goes out of scope, GDB sets > the watchpoint's disposition to `delete at next stop' and then normal > stops (i.e., stop and wait for the next GDB command). When GDB normal > stops, it automatically deletes the breakpoints with their disposition > set to `delete at next stop'. > > Suppose a Python script decides not to normal stop when a local > software watchpoint goes out of scope, the watchpoint will not be > automatically deleted even when its disposition is set to > `delete at next stop'. > > Since GDB single-steps the program and tests the watched expression > after each instruction, not deleting the watchpoint causes the > watchpoint to be hit many more times than it should, as reported in > PR python/29603. > > This was happening because the watchpoint is not deleted or disabled > when going out of scope. > > This commit fixes this issue by disabling the watchpoint when going out > of scope. It also adds a test to ensure this feature isn't regressed in > the future. > > Calling `breakpoint_auto_delete' on all kinds of stops (in > `fetch_inferior_event') seem to solve this issue, but is in fact > inappropriate, since `breakpoint_auto_delete' goes over all breakpoints > instead of just going through the bpstat chain (which only contains the > breakpoints that were hit right now). > > Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=29603 > --- > gdb/breakpoint.c | 1 + > gdb/testsuite/gdb.python/py-watchpoint.c | 27 +++++++++++++ > gdb/testsuite/gdb.python/py-watchpoint.exp | 46 ++++++++++++++++++++++ > gdb/testsuite/gdb.python/py-watchpoint.py | 30 ++++++++++++++ > 4 files changed, 104 insertions(+) > create mode 100644 gdb/testsuite/gdb.python/py-watchpoint.c > create mode 100644 gdb/testsuite/gdb.python/py-watchpoint.exp > create mode 100644 gdb/testsuite/gdb.python/py-watchpoint.py > > diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c > index bff3bac7d1..47dcf1e127 100644 > --- a/gdb/breakpoint.c > +++ b/gdb/breakpoint.c > @@ -1832,6 +1832,7 @@ watchpoint_del_at_next_stop (struct watchpoint *w) > w->related_breakpoint = w; > } > w->disposition = disp_del_at_next_stop; > + disable_breakpoint (w); > } > > /* Extract a bitfield value from value VAL using the bit parameters contained in > diff --git a/gdb/testsuite/gdb.python/py-watchpoint.c b/gdb/testsuite/gdb.python/py-watchpoint.c > new file mode 100644 > index 0000000000..2eeae55021 > --- /dev/null > +++ b/gdb/testsuite/gdb.python/py-watchpoint.c > @@ -0,0 +1,27 @@ > +/* This testcase is part of GDB, the GNU debugger. > + > + Copyright 2022 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 . */ > + > +#include > + > +int > +main (void) > +{ > + int i = -1; > + for (i = 0; i < 3; i++) /* main for */ > + printf ("i = %d; ", i); > + return 0; > +} > diff --git a/gdb/testsuite/gdb.python/py-watchpoint.exp b/gdb/testsuite/gdb.python/py-watchpoint.exp > new file mode 100644 > index 0000000000..fd7dbe20eb > --- /dev/null > +++ b/gdb/testsuite/gdb.python/py-watchpoint.exp > @@ -0,0 +1,46 @@ > +# Copyright (C) 2022 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 . > + > +# Check that Watchpoints are deleted after use. > + > +load_lib gdb-python.exp > + > +standard_testfile > + > +if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} { > + return -1 > +} > + > +require allow_python_tests > + > +if ![runto_main] then { > + return 0 > +} > + > +# For remote host testing > +set pyfile [gdb_remote_download host ${srcdir}/${subdir}/${testfile}.py] > + > +gdb_test_no_output "set can-use-hw-watchpoints 0" "don't use hardware watchpoints" > +set for_line_no [gdb_get_line_number "main for"] > +gdb_test "break $for_line_no" ".*" "set breakpoint before loop" > +gdb_test "continue" ".*" "run until reaching loop" > +gdb_test "clear" ".*" "delete the breakpoint before loop" > +gdb_test "python print(len(gdb.breakpoints()))" "1" "check default BP count" > +gdb_test "source $pyfile" ".*Python script imported.*" \ > + "import python scripts" > +gdb_test "python print(len(gdb.breakpoints()))" "2" "check modified BP count" > +gdb_test "continue" ".*" "run until program stops" > +gdb_test "python print(bpt.n)" "5" "check watchpoint hits" > +gdb_test "python print(len(gdb.breakpoints()))" "1" "check BP count" > diff --git a/gdb/testsuite/gdb.python/py-watchpoint.py b/gdb/testsuite/gdb.python/py-watchpoint.py > new file mode 100644 > index 0000000000..647a653085 > --- /dev/null > +++ b/gdb/testsuite/gdb.python/py-watchpoint.py > @@ -0,0 +1,30 @@ > +# Copyright (C) 2022 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 . > + > + > +class MyBreakpoint(gdb.Breakpoint): > + def __init__(self): > + super().__init__("i", gdb.BP_WATCHPOINT) > + self.n = 0 > + > + def stop(self): > + self.n += 1 > + print("Watchpoint Hit:", self.n, flush=True) > + return False > + > + > +bpt = MyBreakpoint() > + > +print("Python script imported")