From patchwork Wed Jan 18 16:17:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 63346 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BAD6D3858417 for ; Wed, 18 Jan 2023 16:18:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BAD6D3858417 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1674058723; bh=rRJaLXSfhEhZ70URiE03Yme6ELdRTEtJ1ojH5Bq/Rww=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=svpJTre2qo+vJNnB4EJKJBYmfzi7+sKV2jvbQxl1UDq3PGSkxEhXH+pKa1m6WnPs7 fTUauusGIKftAfc9vzlpvNOmV5fAG5YbUZ+BC6ZOzzLV5Bo9uu4mFDa9NLUdE8QZ1O ATLjQiNPmC1G8oGzT6h6YZHQITM/H2IFyeuDWYEs= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 3BA263858C52 for ; Wed, 18 Jan 2023 16:18:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3BA263858C52 Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-663-Lo-L9IyuPPaMGqC0RV3g3Q-1; Wed, 18 Jan 2023 11:18:17 -0500 X-MC-Unique: Lo-L9IyuPPaMGqC0RV3g3Q-1 Received: by mail-qk1-f197.google.com with SMTP id bm30-20020a05620a199e00b006ff813575b1so25363292qkb.16 for ; Wed, 18 Jan 2023 08:18:17 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rRJaLXSfhEhZ70URiE03Yme6ELdRTEtJ1ojH5Bq/Rww=; b=HRSdEykT4hJ8Q0/2RWBC2oGlSO3ezUWBL9X/xPT813e+wuBnksSsQ5uFqSQIipNOhy cvoT0iHcADP7yWi+WTAyrh2fP0b057X1QGgQQHenmS3gg4AqWFBHd3PuaMC8OjaE3/ho 9w0NHYCgl1hLyOzq5RZyTCRcyljsrSg8ZFb4IH8NygAtmKGM6auG8hhV+FJMdz4/OBIk XLMqplf+Nw+zkTVUtIf4WIafF5qgou7sE9eL5n5WtChRgTrtXmMrEbcHQbF7A0tT4mEl NWrO1v8md2Xn24sS0MSOjhE+YgFjCfqOsXUe34PfBg7DnYfoZfCM3hZOy6TdGmoNJRfu G1cA== X-Gm-Message-State: AFqh2kqEH6t6IfhqeAbBIGBM7BRm5aWJ1PRkd6+9xSoJnkHXQojrHPfy Vw2ReKN+tu+H4mIZqTt0CNdEW7opJyA1siH15Y9zUbUTVHhS+qSynoZq6Dwk8ZbkgFyHzrbxHc+ oRjXZ6kvj18mBLQhOhpaMV/ZpcbgwYXvgXRQSDDQnH1+gPIrzFwP44HYUmLQBI7pxQeFaUobXIQ == X-Received: by 2002:a05:6214:4413:b0:534:6d5c:d5ad with SMTP id oj19-20020a056214441300b005346d5cd5admr11582896qvb.4.1674058696832; Wed, 18 Jan 2023 08:18:16 -0800 (PST) X-Google-Smtp-Source: AMrXdXuHzv6Q5GhWvlBKAoA7LBRDAZKEcVeAUNfDRQl9MLzkqw+choWj98bMaKQ3QIvgZrHAQOZAsw== X-Received: by 2002:a05:6214:4413:b0:534:6d5c:d5ad with SMTP id oj19-20020a056214441300b005346d5cd5admr11582860qvb.4.1674058696465; Wed, 18 Jan 2023 08:18:16 -0800 (PST) Received: from localhost (95.72.115.87.dyn.plus.net. [87.115.72.95]) by smtp.gmail.com with ESMTPSA id y15-20020a05620a0e0f00b006f7ee901674sm22305402qkm.2.2023.01.18.08.18.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jan 2023 08:18:16 -0800 (PST) To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCHv2 01/13] gdb/doc: extended documentation for inferior function calls Date: Wed, 18 Jan 2023 16:17:57 +0000 Message-Id: X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP, WEIRD_PORT autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Andrew Burgess via Gdb-patches From: Andrew Burgess Reply-To: Andrew Burgess Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" I noticed that the documentation for inferior function calls doesn't say much about what happens if/when an inferior function call is interrupted, i.e. it doesn't describe what the dummy frame looks like on the stack, or how GDB behaves when the inferior is continued and reaches the dummy frame. This commit aims to add some of this missing information. --- gdb/doc/gdb.texinfo | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index 9c0018ea5c1..e05813ff502 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -20731,6 +20731,36 @@ @end table +When calling a function within a program, it is possible that the +program could enter a state from which the called function may never +return. If this happens then it is possible to interrupt the function +call by typing the interrupt character (often @kbd{Ctrl-c}). + +If a called function is interrupted for any reason, and the stack is +not unwound (due to @code{set unwind-on-terminating-exception on} or +@code{set unwindonsignal on}), then the dummy-frame, created by +@value{GDBN} to facilitate the call to the program function, will be +visible in the backtrace, for example frame @code{#3} in the following +backtrace: + +@smallexample +(@value{GDBP}) backtrace +#0 0x00007ffff7b3d1e7 in nanosleep () from /lib64/libc.so.6 +#1 0x00007ffff7b3d11e in sleep () from /lib64/libc.so.6 +#2 0x000000000040113f in deadlock () at test.cc:13 +#3 +#4 breakpt () at test.cc:20 +#5 0x0000000000401151 in main () at test.cc:25 +@end smallexample + +At this point it is possible to examine the state of the inferior just +like any other stop. + +Depending on why the function was interrupted then it may be possible +to resume the inferior (using commands like @code{continue}, +@code{step}, etc). In this case, when the inferior finally returns to +the dummy-frame, @value{GDBN} will once again halt the inferior. + @subsection Calling functions with no debug info @cindex no debug info functions From patchwork Wed Jan 18 16:17:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 63348 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BD309385AC39 for ; Wed, 18 Jan 2023 16:19:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BD309385AC39 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1674058752; bh=WUGwHUbPKvjAqeCpFb0H8y+oncREQxbV7n+T1POL8Yk=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=h/64t132ftew4ADmVV2O08+kp36rCVNUueNxrMFY4SjeQ4npRfB+z1pxudtrrN+LI 3oPrthdSHE17u1pUdxbmWLowwQrBPJHgyv1SwAaCJviZWLJeP634u3TTlNtHObgjQo UKTGKAnOrd9mcFclGJa5jcfYwnxlSCQs0aG/flq8= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 64CAB3858C30 for ; Wed, 18 Jan 2023 16:18:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 64CAB3858C30 Received: from mail-yb1-f198.google.com (mail-yb1-f198.google.com [209.85.219.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-354-Ua_3lsDrO_atHk9gqCXq2A-1; Wed, 18 Jan 2023 11:18:19 -0500 X-MC-Unique: Ua_3lsDrO_atHk9gqCXq2A-1 Received: by mail-yb1-f198.google.com with SMTP id 81-20020a250b54000000b007c002e178dfso28420068ybl.9 for ; Wed, 18 Jan 2023 08:18:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WUGwHUbPKvjAqeCpFb0H8y+oncREQxbV7n+T1POL8Yk=; b=VlUW/sT92CW1zbX821FYHklT5cDVSx0yVffpNW71dro6kWkx5E5skoK5Ar7lGgsjvb Ro414xjpwQJPI1EfwKmuHSVBdG11YtRVLHZkbVpAvCxer34bhv0pjrZjiWwDSLKKaWB/ sM20ZlByIw/zqr/PL+jzTAow7TE4L9T5kCn50v5VnX/kZix4gkQE5UbQSPahqNU1iysT YGPB8z7nZ+7jDEelR1ZVvg1Y2/nkgO9FB7196g83wepZEw5JFONsOihDvNG36KwY1ENI HwCLnmxuA46i0cKpguC5myeSxYqJ5FaR7ThnYVZb1Y+OmRWkOLYAz1N0R06EdUI684+a sSQA== X-Gm-Message-State: AFqh2krzjEdrQ0ZuzqWQzfX9KoAArVAJTvih2pDi7cVCh49wcE+R+9e3 pFjz8GWsG3r633PdkEIOykFiLhCrFzw9UrG9j69CF6BbwV05VHgfOt3iUbFK5MSXSHnSTRw9UgU bSILPlV+IWF9ufS6hYWU3CddoUPxhI0LU3eQVi4RVd/wmV7CTLQg5mT61LwMAuxt5/1A6yu3bWw == X-Received: by 2002:a05:7500:510:b0:f0:f14:b4f4 with SMTP id j16-20020a057500051000b000f00f14b4f4mr553993gac.49.1674058699129; Wed, 18 Jan 2023 08:18:19 -0800 (PST) X-Google-Smtp-Source: AMrXdXttY0KDfoAs0Kyx5An4oL2iFvuTDt6EzDOPlVFb51UecqJ12O6l6tSH1xFAqC/XpxHnA/eYZw== X-Received: by 2002:a05:7500:510:b0:f0:f14:b4f4 with SMTP id j16-20020a057500051000b000f00f14b4f4mr553979gac.49.1674058698729; Wed, 18 Jan 2023 08:18:18 -0800 (PST) Received: from localhost (95.72.115.87.dyn.plus.net. [87.115.72.95]) by smtp.gmail.com with ESMTPSA id bq8-20020a05620a468800b00704c9015e68sm5597571qkb.116.2023.01.18.08.18.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jan 2023 08:18:18 -0800 (PST) To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCHv2 02/13] gdb/doc: extend the documentation for conditional breakpoints Date: Wed, 18 Jan 2023 16:17:58 +0000 Message-Id: <93c3968f10fcc7e2c85e1dae3cbbf1bcf122ea44.1674058359.git.aburgess@redhat.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Andrew Burgess via Gdb-patches From: Andrew Burgess Reply-To: Andrew Burgess Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" This documentation update adds more text to describe what happens if a conditional breakpoint calls an inferior function, and the inferior function is interrupted for some reason. --- gdb/doc/gdb.texinfo | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index e05813ff502..6ea173b5d0b 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -5713,6 +5713,17 @@ purpose of performing side effects when a breakpoint is reached (@pxref{Break Commands, ,Breakpoint Command Lists}). +If a breakpoint condition calls a function in your program, then it is +possible that your program could stop for some reason while in the +called function. For example, @value{GDBN} might hit a breakpoint in +the called function, or the called function may receive a signal +(e.g.@ a @code{SIGSEGV}) as a result of some undefined behaviour, if +this happens then @value{GDBN} will stop. Depending on the settings +@code{unwindonsignal} and @code{unwind-on-terminating-exception} +(@pxref{Calling,,Calling Program Functions}) @value{GDBN} may unwind +the stack back to the breakpoint location, or may leave the program at +the frame where the stop occurred. + Breakpoint conditions can also be evaluated on the target's side if the target supports it. Instead of evaluating the conditions locally, @value{GDBN} encodes the expression into an agent expression From patchwork Wed Jan 18 16:17:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 63351 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5134E3858D35 for ; Wed, 18 Jan 2023 16:19:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5134E3858D35 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1674058787; bh=3hg/Ljsb4w2LA3EeldLARughoSJms5qTc5v0uT5o4I4=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=ReOvyAciy/3KtA3E7F/nzZZiIcGUocYCgq4wsanHbL/CehxUzWKBtIZFkbSMwYDsE 9xQcx+QRT+acDSaJUjATqdPAORlRQIsSRyje3Uaig3ni2BeXMrbjnTqT0eK4wFZeLL Zo2mGqX9LU24jp+681WwOtCtgiUkG58lLptQKeP0= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 785F23858288 for ; Wed, 18 Jan 2023 16:18:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 785F23858288 Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-631-MupHnq0gOr6A_T1GSfxViQ-1; Wed, 18 Jan 2023 11:18:22 -0500 X-MC-Unique: MupHnq0gOr6A_T1GSfxViQ-1 Received: by mail-qk1-f199.google.com with SMTP id bm30-20020a05620a199e00b006ff813575b1so25363412qkb.16 for ; Wed, 18 Jan 2023 08:18:22 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3hg/Ljsb4w2LA3EeldLARughoSJms5qTc5v0uT5o4I4=; b=7cHr7FmK6PEiNezYUgElRv3gCvdckOvsXPuMEYBzS75VvPWkjBMgaW3g1mYVp7028B loTUs80Myid+43LXhFhpnVitBX6z3pDuShbOmKGOQBQ7lAhzy68gkVXbdZnGOTIhpP1r 0UsATIim3My8xNs1XmaPM9PsmusbCP5HKsNi4mqS/HdMHJL36e6H+EuWcaya7vVWoeI4 sYjeLqrxoFk5/dsq+2bVrNCAy13oXjpqvHU9CQMihHI9YuROCraIEOdVa3XeEx/+aZDy 2m6zlLQUmUkMRVB9dUNxcZgBtmtwmk3qy/hKkjz0t+q47dpuKmBQDrqNKtbqZHPybNgu rNRQ== X-Gm-Message-State: AFqh2kpICh1cUz9APxmMc1UDkryCm/CJEeMmfhBs+Kh1A2E8KITm2Cg7 JPwNqsUXHoaL1l1OQODk19HrBmLmzu79fl2ONwh6YcgR5FqNbXGgZg5jeLbHx23gb6HGkKgICSr 58wAibRY6tgwVHgnsewJFPlCygciBAg57f7jbq3XnDOhKU6RDj9B9tplLH7wyCqRF7oZrR02S5g == X-Received: by 2002:a05:622a:1828:b0:3b6:3a12:2bf9 with SMTP id t40-20020a05622a182800b003b63a122bf9mr11955319qtc.2.1674058701376; Wed, 18 Jan 2023 08:18:21 -0800 (PST) X-Google-Smtp-Source: AMrXdXuFv3IsyX7JKTjc0Dic1A/xEELvx/oRBULoEL7zxpUcV7QimOEGWYBXAj758TL1M3Ay3KgS4g== X-Received: by 2002:a05:622a:1828:b0:3b6:3a12:2bf9 with SMTP id t40-20020a05622a182800b003b63a122bf9mr11955269qtc.2.1674058700872; Wed, 18 Jan 2023 08:18:20 -0800 (PST) Received: from localhost (95.72.115.87.dyn.plus.net. [87.115.72.95]) by smtp.gmail.com with ESMTPSA id w22-20020ac87196000000b003b62deadddcsm5235733qto.42.2023.01.18.08.18.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jan 2023 08:18:20 -0800 (PST) To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCHv2 03/13] gdb: include breakpoint number in testing condition error message Date: Wed, 18 Jan 2023 16:17:59 +0000 Message-Id: <478a1e660361f1290c2dd8e9ad999d59d0ad3dcb.1674058359.git.aburgess@redhat.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Andrew Burgess via Gdb-patches From: Andrew Burgess Reply-To: Andrew Burgess Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" When GDB fails to test the condition of a conditional breakpoint, for whatever reason, the error message looks like this: (gdb) break foo if (*(int *) 0) == 1 Breakpoint 1 at 0x40111e: file bpcond.c, line 11. (gdb) r Starting program: /tmp/bpcond Error in testing breakpoint condition: Cannot access memory at address 0x0 Breakpoint 1, foo () at bpcond.c:11 11 int a = 32; (gdb) The line I'm interested in for this commit is this one: Error in testing breakpoint condition: In the case above we can figure out that the problematic breakpoint was #1 because in the final line of the message GDB reports the stop a breakpoint #1. However, in the next few patches I plan to change this. In some cases I don't think it makes sense for GDB to report the stop as being at breakpoint #1, consider this case: (gdb) list some_func 1 int 2 some_func () 3 { 4 int *p = 0; 5 return *p; 6 } 7 8 void 9 foo () 10 { (gdb) break foo if (some_func ()) Breakpoint 1 at 0x40111e: file bpcond.c, line 11. (gdb) r Starting program: /tmp/bpcond Program received signal SIGSEGV, Segmentation fault. 0x0000000000401116 in some_func () at bpcond.c:5 5 return *p; Error in testing breakpoint condition: The program being debugged was signaled while in a function called from GDB. GDB remains in the frame where the signal was received. To change this behavior use "set unwindonsignal on". Evaluation of the expression containing the function (some_func) will be abandoned. When the function is done executing, GDB will silently stop. Program received signal SIGSEGV, Segmentation fault. Breakpoint 1, 0x0000000000401116 in some_func () at bpcond.c:5 5 return *p; (gdb) Notice that, the final lines of output report the stop as being at breakpoint #1, even though we are actually located within some_func. I find this behaviour confusing, and propose that this should be changed. However, if I make that change then every reference to breakpoint #1 will be lost from the error message. So, in this commit, in preparation for the later commits, I propose to change the 'Error in testing breakpoint condition:' line to this: Error in testing condition for breakpoint NUMBER: where NUMBER will be filled in as appropriate. Here's the first example with the updated error: (gdb) break foo if (*(int *) 0) == 0 Breakpoint 1 at 0x40111e: file bpcond.c, line 11. (gdb) r Starting program: /tmp/bpcond Error in testing condition for breakpoint 1: Cannot access memory at address 0x0 Breakpoint 1, foo () at bpcond.c:11 11 int a = 32; (gdb) The breakpoint number does now appear twice in the output, but I don't see that as a negative. This commit just changes the one line of the error, and updates the few tests that either included the old error in comments, or actually checked for the error in the expected output. As the only test that checked the line I modified is a Python test, I've added a new test that doesn't rely on Python that checks the error message in detail. While working on the new test, I spotted that it would fail when run with native-gdbserver and native-extended-gdbserver target boards. This turns out to be due to a gdbserver bug. To avoid cluttering this commit I've added a work around to the new test script so that the test passes for the remote boards, in the next few commits I will fix gdbserver, and update the test script to remove the work around. --- gdb/breakpoint.c | 3 +- gdb/testsuite/gdb.base/bp-cond-failure.c | 30 +++++++ gdb/testsuite/gdb.base/bp-cond-failure.exp | 83 +++++++++++++++++++ .../gdb.base/catch-signal-siginfo-cond.exp | 2 +- gdb/testsuite/gdb.base/gnu-ifunc.exp | 2 +- .../gdb.python/py-finish-breakpoint.exp | 2 +- gdb/testsuite/lib/gdb.exp | 8 ++ 7 files changed, 126 insertions(+), 4 deletions(-) create mode 100644 gdb/testsuite/gdb.base/bp-cond-failure.c create mode 100644 gdb/testsuite/gdb.base/bp-cond-failure.exp diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 00cc2ab401c..eecaeefed3e 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -5542,7 +5542,8 @@ bpstat_check_breakpoint_conditions (bpstat *bs, thread_info *thread) catch (const gdb_exception &ex) { exception_fprintf (gdb_stderr, ex, - "Error in testing breakpoint condition:\n"); + "Error in testing condition for breakpoint %d:\n", + b->number); } } else diff --git a/gdb/testsuite/gdb.base/bp-cond-failure.c b/gdb/testsuite/gdb.base/bp-cond-failure.c new file mode 100644 index 00000000000..be9d1fdcf2d --- /dev/null +++ b/gdb/testsuite/gdb.base/bp-cond-failure.c @@ -0,0 +1,30 @@ +/* Copyright 2022 Free Software Foundation, Inc. + + This file is part of GDB. + + 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 . */ + +int +foo () +{ + return 0; /* Breakpoint here. */ +} + +int +main () +{ + int res = foo (); + + return res; +} diff --git a/gdb/testsuite/gdb.base/bp-cond-failure.exp b/gdb/testsuite/gdb.base/bp-cond-failure.exp new file mode 100644 index 00000000000..6f89771d187 --- /dev/null +++ b/gdb/testsuite/gdb.base/bp-cond-failure.exp @@ -0,0 +1,83 @@ +# 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 . + +# Check the format of the error message given when a breakpoint +# condition fails. +# +# In this case the breakpoint condition does not make use of inferior +# function calls, instead, the expression used for the breakpoint +# condition will throw an error when evaluated. +# +# We check that the correct breakpoint number appears in the error +# message, and that the error is reported at the correct source +# location. + +standard_testfile + +if { [prepare_for_testing "failed to prepare" ${binfile} "${srcfile}" \ + {debug}] == -1 } { + return +} + +# This test relies on reading address zero triggering a SIGSEGV. +if { [is_address_zero_readable] } { + return +} + +# Where the breakpoint will be placed. +set bp_line [gdb_get_line_number "Breakpoint here"] + +proc run_test { cond_eval } { + clean_restart ${::binfile} + + if {![runto_main]} { + fail "run to main" + return -1 + } + + if { $cond_eval != "auto" } { + gdb_test_no_output "set breakpoint condition-evaluation ${cond_eval}" + } + + # Setup the conditional breakpoint and record its number. + gdb_breakpoint "${::srcfile}:${::bp_line} if (*(int *) 0) == 0" + set bp_num [get_integer_valueof "\$bpnum" "*UNKNOWN*"] + + gdb_test "continue" \ + [multi_line \ + "Continuing\\." \ + "Error in testing condition for breakpoint ${bp_num}:" \ + "Cannot access memory at address 0x0" \ + "" \ + "Breakpoint ${bp_num}, foo \\(\\) at \[^\r\n\]+:${::bp_line}" \ + "${::decimal}\\s+\[^\r\n\]+Breakpoint here\[^\r\n\]+"] +} + +# If we're using a remote target then conditions could be evaulated +# locally on the host, or on the remote target. Otherwise, conditions +# are always evaluated locally (which is what auto will select). +# +# NOTE: 'target' is not included here for remote targets as a +# gdbserver bug prevents the test from passing. This will be fixed in +# the next commit, and this test updated. +if { [gdb_is_remote_or_extended_remote_target] } { + set cond_eval_modes { "host" } +} else { + set cond_eval_modes { "auto" } +} + +foreach_with_prefix cond_eval $cond_eval_modes { + run_test $cond_eval +} diff --git a/gdb/testsuite/gdb.base/catch-signal-siginfo-cond.exp b/gdb/testsuite/gdb.base/catch-signal-siginfo-cond.exp index 182b2f25faa..f400fc03b28 100644 --- a/gdb/testsuite/gdb.base/catch-signal-siginfo-cond.exp +++ b/gdb/testsuite/gdb.base/catch-signal-siginfo-cond.exp @@ -18,7 +18,7 @@ # # (gdb) continue # Continuing. -# Error in testing breakpoint condition: +# Error in testing condition for breakpoint NUM: # Selected thread is running. # # Catchpoint 3 (signal SIGUSR1), 0x0000003615e35877 in __GI_raise (sig=10) at raise.c:56 diff --git a/gdb/testsuite/gdb.base/gnu-ifunc.exp b/gdb/testsuite/gdb.base/gnu-ifunc.exp index 0a435806409..22462bea233 100644 --- a/gdb/testsuite/gdb.base/gnu-ifunc.exp +++ b/gdb/testsuite/gdb.base/gnu-ifunc.exp @@ -281,7 +281,7 @@ proc misc_tests {resolver_attr resolver_debug final_debug} { # Also test a former patch regression: # Continuing. - # Error in testing breakpoint condition: + # Error in testing condition for breakpoint NUM: # Attempt to take address of value not located in memory. # # Breakpoint 2, main () at ./gdb.base/gnu-ifunc.c:33 diff --git a/gdb/testsuite/gdb.python/py-finish-breakpoint.exp b/gdb/testsuite/gdb.python/py-finish-breakpoint.exp index b6bd7a63c8f..e5a46874afd 100644 --- a/gdb/testsuite/gdb.python/py-finish-breakpoint.exp +++ b/gdb/testsuite/gdb.python/py-finish-breakpoint.exp @@ -188,7 +188,7 @@ with_test_prefix "finish in normal frame" { gdb_test "python TestBreakpoint()" "TestBreakpoint init" "set BP in condition" gdb_test "continue" \ - "test don't stop: 1.*test don't stop: 2.*test stop.*Error in testing breakpoint condition.*The program being debugged stopped while in a function called from GDB.*" \ + "test don't stop: 1.*test don't stop: 2.*test stop.*Error in testing condition for breakpoint ${::decimal}.*The program being debugged stopped while in a function called from GDB.*" \ "stop in condition function" gdb_test "continue" "Continuing.*" "finish condition evaluation" diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 68337bd235c..f51332b0177 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -9332,5 +9332,13 @@ proc has_dependency { file dep } { return [regexp $dep $output] } +# Return true if we are currently testing the 'remote' or +# 'extended-remote' targets. +proc gdb_is_remote_or_extended_remote_target {} { + return [target_info exists gdb_protocol] + && ([target_info gdb_protocol] == "remote" + || [target_info gdb_protocol] == "extended-remote") +} + # Always load compatibility stuff. load_lib future.exp From patchwork Wed Jan 18 16:18:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 63347 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3DC293858C60 for ; Wed, 18 Jan 2023 16:18:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3DC293858C60 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1674058735; bh=OE1uL6yvVfCCxE656XTl3nXLX8KrynaygoS5NdDgQY4=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=bYQHH8WQzU/yc2XE1YVP9qlqvJO0eNU3IyMdH5/9sRcA/j7pt4u7RXq4OinfpUNNy DC1At2leyR9kBN+QPazo76LTcbyxjwooAFXmyBSQSEhuaFQQLZZf7WcfR1mgmWun4d NBwGQ0l/DitjdmNSa5vRnxo328KYcv4Qw1BwG1ko= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id EABAC38582AC for ; Wed, 18 Jan 2023 16:18:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EABAC38582AC Received: from mail-yb1-f200.google.com (mail-yb1-f200.google.com [209.85.219.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-437-gRF8GE0rNr-9AFJnckOc7A-1; Wed, 18 Jan 2023 11:18:24 -0500 X-MC-Unique: gRF8GE0rNr-9AFJnckOc7A-1 Received: by mail-yb1-f200.google.com with SMTP id y15-20020a2586cf000000b007d35ff419e6so13866502ybm.5 for ; Wed, 18 Jan 2023 08:18:24 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OE1uL6yvVfCCxE656XTl3nXLX8KrynaygoS5NdDgQY4=; b=DfVX5QF1SbPFpOtFr/LG39v1EvyCin1jyqljm7jlyPC57ryaCoUtt1+GFH2ae/0JPX 78MEN3Yq0fD/FPnjFlCMOsmCWe6Ev2YbOlw7BmSWrh/Ls39XZTOxFv0ejOAnwrTgCJhb EggMd+iZPc5cBteZdWIluy7+XDGGZ+HLCmBBA5AH4WGyrNre6A8W+TLo/u+cmiRbLkzT ebIMoEnyfDgI1TG1O/G8zuFTR7yfWJX3FTZqhE88fBQybj5mw9Ql67aRA31E2870c10+ 15rYcMx03FuBkVqekkAHekJiz4YkftHuRfRcVrtKb3Q4QKBJM7BBNG6Vd6+r/iUKxcUw SDcg== X-Gm-Message-State: AFqh2kp5yFbC2ya18z9PEIT0yzcnSj2kMx7it/JrFNmAVFCcDpTpf91y NU6z/VxCwnxZb+6ztVddEKlZpIN8fZXFJ6yWrZTzdyIxwz9h9l0zI992kfRUejCWfdJt4Vvin1j hx3C5ybxGDT5shtkdFYVtlbJl9d5sNbCjNEBk8GN3kFlIt8WF5e3x0plL99lOwMfoqN8C8tC3vQ == X-Received: by 2002:a25:b8c9:0:b0:7cb:40de:ba17 with SMTP id g9-20020a25b8c9000000b007cb40deba17mr6550181ybm.16.1674058703466; Wed, 18 Jan 2023 08:18:23 -0800 (PST) X-Google-Smtp-Source: AMrXdXtJtgB60R+DpMMyClViFqRZOcFgXK8MkkvbekjefrMeYEQCSnm3o87mHUF8GMXNzWSK1YWbnA== X-Received: by 2002:a25:b8c9:0:b0:7cb:40de:ba17 with SMTP id g9-20020a25b8c9000000b007cb40deba17mr6550148ybm.16.1674058703062; Wed, 18 Jan 2023 08:18:23 -0800 (PST) Received: from localhost (95.72.115.87.dyn.plus.net. [87.115.72.95]) by smtp.gmail.com with ESMTPSA id f9-20020a05620a280900b006fcaa1eab0esm22823407qkp.123.2023.01.18.08.18.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jan 2023 08:18:22 -0800 (PST) To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCHv2 04/13] gdbserver: allows agent_mem_read to return an error code Date: Wed, 18 Jan 2023 16:18:00 +0000 Message-Id: <38df45adb7bfb18c47724d63f67bd35b5cd0923c.1674058360.git.aburgess@redhat.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Andrew Burgess via Gdb-patches From: Andrew Burgess Reply-To: Andrew Burgess Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" Currently the gdbserver function agent_mem_read ignores any errors from calling read_inferior_memory. This means that if there is an attempt to access invalid memory then this will appear to succeed. In this I update agent_mem_read so that if read_inferior_memory fails, agent_mem_read will return an error code. However, non of the callers of agent_mem_read actually check the return value, so this commit will have no effect on anything. In the next commit I will update the users of agent_mem_read to check for the error code. I've also updated the header comments on agent_mem_read to better reflect what the function does, and its possible return values. --- gdbserver/tracepoint.cc | 11 ++++------- gdbserver/tracepoint.h | 9 +++++++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/gdbserver/tracepoint.cc b/gdbserver/tracepoint.cc index 37a9a8c5b7c..60918fc0678 100644 --- a/gdbserver/tracepoint.cc +++ b/gdbserver/tracepoint.cc @@ -4914,8 +4914,7 @@ condition_true_at_tracepoint (struct tracepoint_hit_ctx *ctx, return (value ? 1 : 0); } -/* Do memory copies for bytecodes. */ -/* Do the recording of memory blocks for actions and bytecodes. */ +/* See tracepoint.h. */ int agent_mem_read (struct eval_agent_expr_context *ctx, @@ -4927,10 +4926,7 @@ agent_mem_read (struct eval_agent_expr_context *ctx, /* If a 'to' buffer is specified, use it. */ if (to != NULL) - { - read_inferior_memory (from, to, len); - return 0; - } + return read_inferior_memory (from, to, len); /* Otherwise, create a new memory block in the trace buffer. */ while (remaining > 0) @@ -4951,7 +4947,8 @@ agent_mem_read (struct eval_agent_expr_context *ctx, memcpy (mspace, &blocklen, sizeof (blocklen)); mspace += sizeof (blocklen); /* Record the memory block proper. */ - read_inferior_memory (from, mspace, blocklen); + if (read_inferior_memory (from, mspace, blocklen) != 0) + return 1; trace_debug ("%d bytes recorded", blocklen); remaining -= blocklen; from += blocklen; diff --git a/gdbserver/tracepoint.h b/gdbserver/tracepoint.h index a30f540d130..e424dc9dfb8 100644 --- a/gdbserver/tracepoint.h +++ b/gdbserver/tracepoint.h @@ -161,8 +161,13 @@ void gdb_agent_about_to_close (int pid); struct traceframe; struct eval_agent_expr_context; -/* Do memory copies for bytecodes. */ -/* Do the recording of memory blocks for actions and bytecodes. */ +/* When TO is not NULL, do memory copies for bytecodes, read LEN bytes + starting at address FROM, and place the result in the buffer TO. + Return 0 on success, otherwise a non-zero error code. + + When TO is NULL, do the recording of memory blocks for actions and + bytecodes into a new traceframe block. Return 0 on success, otherwise, + return 1 if there is an error. */ int agent_mem_read (struct eval_agent_expr_context *ctx, unsigned char *to, CORE_ADDR from, From patchwork Wed Jan 18 16:18:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 63355 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A3E3D3854381 for ; Wed, 18 Jan 2023 16:20:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A3E3D3854381 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1674058817; bh=LCjfycesF3lyIvgRhuxOZll32Bd6KAbeEnf9R8JAoF8=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=ZMLuwTkIAfTzfXniHIj400dsm+pHZ+MehcI0xbDPEI/kgiNEL7khcurs9vJNiP0Gv Soq0TYPB4v9FalVDaCat0CUx8vR8hPFXcGtQuNJZzFcQD6I6nW2p7zWOPdoogYQ0DA dlTE6DXWyT1qVRZiQjvM6jjo6urs7/yGsikpmB2w= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id BB7923858439 for ; Wed, 18 Jan 2023 16:18:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BB7923858439 Received: from mail-yw1-f199.google.com (mail-yw1-f199.google.com [209.85.128.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-225-u2DLPI5OPqmnp6jLvyGKcQ-1; Wed, 18 Jan 2023 11:18:26 -0500 X-MC-Unique: u2DLPI5OPqmnp6jLvyGKcQ-1 Received: by mail-yw1-f199.google.com with SMTP id 00721157ae682-4d5097a95f5so230084607b3.1 for ; Wed, 18 Jan 2023 08:18:26 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LCjfycesF3lyIvgRhuxOZll32Bd6KAbeEnf9R8JAoF8=; b=mY3EspDtsobCL+5pjQlLA+xeEz9E2xi238b86jnWmugS4vF19CsSpwCwfrTsrFRe0D 1zw+TwIRH+7M3jHdr/mStb15sFyrc/13AK7193NbugVPiQI5b9IpcFJJoO2OJfQuYN2S yUy647krXGl6kKvfePOHxogYmP8aPh58kogR9yvPQD87JTSI26Bt+mJ14s6rjYzzStF4 2Bl7bE/n9skazjJD6l779TS4OE1qb6lmHaT8+bhWQ2PpOwgsbGb/T5SQY5NafFuejaOn ynepn8SGnPODs3l0EBiz/0cfl8FqAvVYhCfkVkui8jNINJ3ROfeA+hJMU1J2SAs29Tko XWGw== X-Gm-Message-State: AFqh2kq9WYyI3M4I/c2YGXvgDFpsktrmn5O2Kw1v05jjc5R7Nz4gf71A MEgO1N5PMS2fabPqwJtVa3e/vzxhaEpzwcgrE5wcImous+q4+CpsVMl8CBLVR0F22QZLMiENAMc nY5RGLFzSIxZKuuPbQ27LAkfb5aKaOxJUsxRUnN/kQICZMfahAv6336ZlIy9+8mqG58ao1xOS6w == X-Received: by 2002:a81:430d:0:b0:477:f2c8:6def with SMTP id q13-20020a81430d000000b00477f2c86defmr22864553ywa.49.1674058705401; Wed, 18 Jan 2023 08:18:25 -0800 (PST) X-Google-Smtp-Source: AMrXdXsKDEZkyaitZtpVi/OfL8MOND7DdSf/G78vAtR4pRELOWSGyrXUpF4N4Z2Jc3QE0RH4DhWNyg== X-Received: by 2002:a81:430d:0:b0:477:f2c8:6def with SMTP id q13-20020a81430d000000b00477f2c86defmr22864528ywa.49.1674058705059; Wed, 18 Jan 2023 08:18:25 -0800 (PST) Received: from localhost (95.72.115.87.dyn.plus.net. [87.115.72.95]) by smtp.gmail.com with ESMTPSA id w26-20020a05620a0e9a00b006fa22f0494bsm2916236qkm.117.2023.01.18.08.18.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jan 2023 08:18:24 -0800 (PST) To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCHv2 05/13] gdbserver: allow agent expressions to fail with invalid memory access Date: Wed, 18 Jan 2023 16:18:01 +0000 Message-Id: X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Andrew Burgess via Gdb-patches From: Andrew Burgess Reply-To: Andrew Burgess Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" This commit extends gdbserver to take account of a failed memory access from agent_mem_read, and to return a new eval_result_type expr_eval_invalid_memory_access. I have only updated the agent_mem_read calls related directly to reading memory, I have not updated any of the calls related to tracepoint data collection. This is just because I'm not familiar with that area of gdb/gdbserver, and I don't want to break anything, so leaving the existing behaviour as is seems like the safest approach. I've then update gdb.base/bp-cond-failure.exp to test evaluating the breakpoints on the target, and have also extended the test so that it checks for different sizes of memory access. --- gdb/testsuite/gdb.base/bp-cond-failure.exp | 16 +++++++--------- gdbserver/ax.cc | 12 ++++++++---- gdbserver/ax.h | 3 ++- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/gdb/testsuite/gdb.base/bp-cond-failure.exp b/gdb/testsuite/gdb.base/bp-cond-failure.exp index 6f89771d187..aa39b638592 100644 --- a/gdb/testsuite/gdb.base/bp-cond-failure.exp +++ b/gdb/testsuite/gdb.base/bp-cond-failure.exp @@ -39,7 +39,7 @@ if { [is_address_zero_readable] } { # Where the breakpoint will be placed. set bp_line [gdb_get_line_number "Breakpoint here"] -proc run_test { cond_eval } { +proc run_test { cond_eval access_type } { clean_restart ${::binfile} if {![runto_main]} { @@ -52,7 +52,7 @@ proc run_test { cond_eval } { } # Setup the conditional breakpoint and record its number. - gdb_breakpoint "${::srcfile}:${::bp_line} if (*(int *) 0) == 0" + gdb_breakpoint "${::srcfile}:${::bp_line} if (*(${access_type} *) 0) == 0" set bp_num [get_integer_valueof "\$bpnum" "*UNKNOWN*"] gdb_test "continue" \ @@ -68,16 +68,14 @@ proc run_test { cond_eval } { # If we're using a remote target then conditions could be evaulated # locally on the host, or on the remote target. Otherwise, conditions # are always evaluated locally (which is what auto will select). -# -# NOTE: 'target' is not included here for remote targets as a -# gdbserver bug prevents the test from passing. This will be fixed in -# the next commit, and this test updated. if { [gdb_is_remote_or_extended_remote_target] } { - set cond_eval_modes { "host" } + set cond_eval_modes { "host" "target" } } else { set cond_eval_modes { "auto" } } -foreach_with_prefix cond_eval $cond_eval_modes { - run_test $cond_eval +foreach_with_prefix access_type { "char" "short" "int" "long long" } { + foreach_with_prefix cond_eval $cond_eval_modes { + run_test $cond_eval $access_type + } } diff --git a/gdbserver/ax.cc b/gdbserver/ax.cc index 38ebfbbd750..fba5b4ad0fc 100644 --- a/gdbserver/ax.cc +++ b/gdbserver/ax.cc @@ -1112,22 +1112,26 @@ gdb_eval_agent_expr (struct eval_agent_expr_context *ctx, break; case gdb_agent_op_ref8: - agent_mem_read (ctx, cnv.u8.bytes, (CORE_ADDR) top, 1); + if (agent_mem_read (ctx, cnv.u8.bytes, (CORE_ADDR) top, 1) != 0) + return expr_eval_invalid_memory_access; top = cnv.u8.val; break; case gdb_agent_op_ref16: - agent_mem_read (ctx, cnv.u16.bytes, (CORE_ADDR) top, 2); + if (agent_mem_read (ctx, cnv.u16.bytes, (CORE_ADDR) top, 2) != 0) + return expr_eval_invalid_memory_access; top = cnv.u16.val; break; case gdb_agent_op_ref32: - agent_mem_read (ctx, cnv.u32.bytes, (CORE_ADDR) top, 4); + if (agent_mem_read (ctx, cnv.u32.bytes, (CORE_ADDR) top, 4) != 0) + return expr_eval_invalid_memory_access; top = cnv.u32.val; break; case gdb_agent_op_ref64: - agent_mem_read (ctx, cnv.u64.bytes, (CORE_ADDR) top, 8); + if (agent_mem_read (ctx, cnv.u64.bytes, (CORE_ADDR) top, 8) != 0) + return expr_eval_invalid_memory_access; top = cnv.u64.val; break; diff --git a/gdbserver/ax.h b/gdbserver/ax.h index 8e64a7a593e..c98e36a83c6 100644 --- a/gdbserver/ax.h +++ b/gdbserver/ax.h @@ -41,7 +41,8 @@ enum eval_result_type expr_eval_unhandled_opcode, expr_eval_unrecognized_opcode, expr_eval_divide_by_zero, - expr_eval_invalid_goto + expr_eval_invalid_goto, + expr_eval_invalid_memory_access }; struct agent_expr From patchwork Wed Jan 18 16:18:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 63349 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9AF853857C44 for ; Wed, 18 Jan 2023 16:19:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9AF853857C44 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1674058756; bh=VC/OTvpVTQIhffKkm83Wwo1ekc1QUvnsSlyFjCXzLg0=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=XCrordKbZK9OKsjNUZJkeA1ebwhCrQgyat0yefdqiLoanZVCBt/8vDnvMOBnApGbw cyUDfaPs+PngtGHYgUJ99Pj9GEfhS/EXG9a5L0xYGUMSgjNRFpvQ9avS+5Aiv1/t4A Vct4EDqB4CYG8+omUpnGoPgfSDRyLNyqH/RkvNXA= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 143A83858022 for ; Wed, 18 Jan 2023 16:18:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 143A83858022 Received: from mail-vk1-f197.google.com (mail-vk1-f197.google.com [209.85.221.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-180-11Rw-B_1NNeLgx8lZKJkxw-1; Wed, 18 Jan 2023 11:18:28 -0500 X-MC-Unique: 11Rw-B_1NNeLgx8lZKJkxw-1 Received: by mail-vk1-f197.google.com with SMTP id l197-20020a1ffece000000b003e1cb6fe65dso366555vki.9 for ; Wed, 18 Jan 2023 08:18:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VC/OTvpVTQIhffKkm83Wwo1ekc1QUvnsSlyFjCXzLg0=; b=ZlmDZLA2EbiN+ZVnDw2K1Ey1GoEWzj2f14xUwDqk9IOB64nYQVQUGy2N+gVbDx2ZeF eVMb5wpsENpdUHF1DFr8PB5FuvA2nq4n+aK98Kj0z4WgUiHoe4mrBq4zk57zomImplO3 szhXGBfFpeweKS3hLU3By1YLbLTU1om3wav3POKKNJSNaL5tu2Ng38/yXf+Wd/oBDnuE w4oMW5IUve7aQwID5wGdk9M5y+HnqeHB4qVx6KS2OxXjYuY3G8DdIJYMd6HzUX1775JM 5s0pl49b5Ki+2kXQsEnfVnhmp8twWFBRlV3jDxCx608pd/iLbXXqxZhaUQYDc1RT/BnS 3fCQ== X-Gm-Message-State: AFqh2krzYglpIxGyUl17XiE2ftX9mSxyTEqU7b2Rlui5ieO43jyYttQN 2OTdRQXLQ0K1GRTzSdX9xagbg8h8uBZsbl6oRCL1x6FuzItTzN8aj4JWUeTGryAuPDHn+/6mE0C oMyC6XJlDgjUA+dLRr9BEaR5EcdoFDUOAsfKNTxn8AySvv2CUQny66RpQoqPeO1bYudPBIuijiQ == X-Received: by 2002:a1f:a194:0:b0:3e1:b027:833b with SMTP id k142-20020a1fa194000000b003e1b027833bmr3241357vke.16.1674058707564; Wed, 18 Jan 2023 08:18:27 -0800 (PST) X-Google-Smtp-Source: AMrXdXuH8KQSnKpuiRqfKEI8+WdzNJosQKIi3i9yFX/fzLWfr0hNQQ7W4A3LyW6FqLwXOH6yyTGpIg== X-Received: by 2002:a1f:a194:0:b0:3e1:b027:833b with SMTP id k142-20020a1fa194000000b003e1b027833bmr3241331vke.16.1674058707044; Wed, 18 Jan 2023 08:18:27 -0800 (PST) Received: from localhost (95.72.115.87.dyn.plus.net. [87.115.72.95]) by smtp.gmail.com with ESMTPSA id c23-20020a05620a269700b006fb11eee465sm22824815qkp.64.2023.01.18.08.18.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jan 2023 08:18:26 -0800 (PST) To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCHv2 06/13] gdb: avoid repeated signal reporting during failed conditional breakpoint Date: Wed, 18 Jan 2023 16:18:02 +0000 Message-Id: <63d1953385883e9ed1bd87aecc928784fc41ae91.1674058360.git.aburgess@redhat.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Andrew Burgess via Gdb-patches From: Andrew Burgess Reply-To: Andrew Burgess Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" Consider the following case: (gdb) list some_func 1 int 2 some_func () 3 { 4 int *p = 0; 5 return *p; 6 } 7 8 void 9 foo () 10 { (gdb) break foo if (some_func ()) Breakpoint 1 at 0x40111e: file bpcond.c, line 11. (gdb) r Starting program: /tmp/bpcond Program received signal SIGSEGV, Segmentation fault. 0x0000000000401116 in some_func () at bpcond.c:5 5 return *p; Error in testing breakpoint condition: The program being debugged was signaled while in a function called from GDB. GDB remains in the frame where the signal was received. To change this behavior use "set unwindonsignal on". Evaluation of the expression containing the function (some_func) will be abandoned. When the function is done executing, GDB will silently stop. Program received signal SIGSEGV, Segmentation fault. Breakpoint 1, 0x0000000000401116 in some_func () at bpcond.c:5 5 return *p; (gdb) Notice that this line: Program received signal SIGSEGV, Segmentation fault. Appears twice in the output. The first time is followed by the current location. The second time is a little odd, why do we print that? Printing that line is controlled, in part, by a global variable, stopped_by_random_signal. This variable is reset to zero in handle_signal_stop, and is set if/when GDB figures out that the inferior stopped due to some random signal. The problem is, in our case, GDB first stops at the breakpoint for foo, and enters handle_signal_stop and the stopped_by_random_signal global is reset to 0. Later within handle_signal_stop GDB calls bpstat_stop_status, it is within this function (via bpstat_check_breakpoint_conditions) that the breakpoint condition is checked, and, we end up calling the inferior function (some_func in our example above). In our case above the thread performing the inferior function call segfaults in some_func. GDB catches the SIGSEGV and handles the stop, this causes us to reenter handle_signal_stop. The global variable stopped_by_random_signal is updated, this time it is set to true because the thread stopped due to SIGSEGV. As a result of this we print the first instance of the line (as seen above in the example). Finally we unwind GDB's call stack, the inferior function call is complete, and we return to the original handle_signal_stop. However, the stopped_by_random_signal global is still carrying the value as computed for the inferior function call's stop, which is why we now print a second instance of the line, as seen in the example. To prevent this, I propose adding a scoped_restore before we start an inferior function call, this will save and restore the global stopped_by_random_signal value. With this done, the output from our example is now this: (gdb) list some_func 1 int 2 some_func () 3 { 4 int *p = 0; 5 return *p; 6 } 7 8 void 9 foo () 10 { (gdb) break foo if (some_func ()) Breakpoint 1 at 0x40111e: file bpcond.c, line 11. (gdb) r Starting program: /tmp/bpcond Program received signal SIGSEGV, Segmentation fault. 0x0000000000401116 in some_func () at bpcond.c:5 5 return *p; Error in testing condition for breakpoint 1: The program being debugged stopped while in a function called from GDB. Evaluation of the expression containing the function (some_func) will be abandoned. When the function is done executing, GDB will silently stop. Breakpoint 1, 0x0000000000401116 in some_func () at bpcond.c:5 5 return *p; (gdb) We now only see the 'Program received signal SIGSEGV, ...' line once, which I think makes more sense. Finally, I'm aware that the last few lines, that report the stop as being at 'Breakpoint 1', when this is not where the thread is actually located anymore, is not great. I'll address that in the next commit. --- gdb/infcall.c | 9 + gdb/testsuite/gdb.base/infcall-failure.c | 48 ++++++ gdb/testsuite/gdb.base/infcall-failure.exp | 184 +++++++++++++++++++++ 3 files changed, 241 insertions(+) create mode 100644 gdb/testsuite/gdb.base/infcall-failure.c create mode 100644 gdb/testsuite/gdb.base/infcall-failure.exp diff --git a/gdb/infcall.c b/gdb/infcall.c index e09904f9a35..e1b785e437b 100644 --- a/gdb/infcall.c +++ b/gdb/infcall.c @@ -1296,6 +1296,15 @@ call_function_by_hand_dummy (struct value *function, /* Register a clean-up for unwind_on_terminating_exception_breakpoint. */ SCOPE_EXIT { delete_std_terminate_breakpoint (); }; + /* The stopped_by_random_signal variable is global. If we are here + as part of a breakpoint condition check then the global will have + already been setup as part of the original breakpoint stop. By + making the inferior call the global will be changed when GDB + handles the stop after the inferior call. Avoid confusion by + restoring the current value after the inferior call. */ + scoped_restore restore_stopped_by_random_signal + = make_scoped_restore (&stopped_by_random_signal, 0); + /* - SNIP - SNIP - SNIP - SNIP - SNIP - SNIP - SNIP - SNIP - SNIP - If you're looking to implement asynchronous dummy-frames, then just below is the place to chop this function in two.. */ diff --git a/gdb/testsuite/gdb.base/infcall-failure.c b/gdb/testsuite/gdb.base/infcall-failure.c new file mode 100644 index 00000000000..00f4369e164 --- /dev/null +++ b/gdb/testsuite/gdb.base/infcall-failure.c @@ -0,0 +1,48 @@ +/* Copyright 2022 Free Software Foundation, Inc. + + This file is part of GDB. + + 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 . */ + +/* A function that segfaults (assuming that reads of address zero are + prohibited), this is used from within a breakpoint condition. */ +int +func_segfault () +{ + volatile int *p = 0; + return *p; /* Segfault here. */ +} + +/* A function in which we will place a breakpoint. This function is itself + then used from within a breakpoint condition. */ +int +func_bp () +{ + int res = 0; /* Second breakpoint. */ + return res; +} + +int +foo () +{ + return 0; /* First breakpoint. */ +} + +int +main () +{ + int res = foo (); + + return res; +} diff --git a/gdb/testsuite/gdb.base/infcall-failure.exp b/gdb/testsuite/gdb.base/infcall-failure.exp new file mode 100644 index 00000000000..2dcdda34b4d --- /dev/null +++ b/gdb/testsuite/gdb.base/infcall-failure.exp @@ -0,0 +1,184 @@ +# 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 . + +# Some simple tests of inferior function calls from breakpoint +# conditions, in a single-threaded inferior. +# +# Test what happens when the inferior function (from a breakpoint +# condition) either hits a nested breakpoint, or segfaults. + +standard_testfile + +if { [build_executable "failed to prepare" ${binfile} "${srcfile}" \ + {debug}] == -1 } { + return +} + +set bp_1_line [gdb_get_line_number "First breakpoint"] +set bp_2_line [gdb_get_line_number "Second breakpoint"] +set segv_line [gdb_get_line_number "Segfault here"] + +# Start GDB based on TARGET_ASYNC and TARGET_NON_STOP, and then runto +# main. +proc start_gdb_and_runto_main { target_async target_non_stop } { + save_vars { ::GDBFLAGS } { + append ::GDBFLAGS \ + " -ex \"maint set target-non-stop $target_non_stop\"" + append ::GDBFLAGS \ + " -ex \"maintenance set target-async ${target_async}\"" + + clean_restart ${::binfile} + } + + if {![runto_main]} { + fail "run to main" + return -1 + } + + return 0 +} + +# Start GDB according to ASYNC_P and NON_STOP_P, then setup a +# conditional breakpoint. The breakpoint condition includes an +# inferior function call that will itself hit a breakpoint. Check how +# GDB reports this to the user. +proc_with_prefix run_cond_hits_breakpoint_test { async_p non_stop_p } { + if { [start_gdb_and_runto_main $async_p $non_stop_p] == -1 } { + return + } + + # Setup the conditional breakpoint and record its number. + gdb_breakpoint "${::srcfile}:${::bp_1_line} if (func_bp ())" + set bp_1_num [get_integer_valueof "\$bpnum" "*UNKNOWN*" \ + "get number of first breakpoint"] + + # Setup a breakpoint inside func_bp. + gdb_breakpoint "${::srcfile}:${::bp_2_line}" + set bp_2_num [get_integer_valueof "\$bpnum" "*UNKNOWN*" \ + "get number of second breakpoint"] + + gdb_test "continue" \ + [multi_line \ + "Continuing\\." \ + "" \ + "Breakpoint ${bp_2_num}, func_bp \\(\\) at \[^\r\n\]+:${::bp_2_line}" \ + "${::decimal}\\s+\[^\r\n\]+Second breakpoint\[^\r\n\]+" \ + "Error in testing condition for breakpoint ${bp_1_num}:" \ + "The program being debugged stopped while in a function called from GDB\\." \ + "Evaluation of the expression containing the function" \ + "\\(func_bp\\) will be abandoned\\." \ + "When the function is done executing, GDB will silently stop\\." \ + "" \ + "Breakpoint ${bp_1_num}, \[^\r\n\]+" \ + "${::decimal}\\s+\[^\r\n\]+Second breakpoint\[^\r\n\]+"] +} + +# Start GDB according to ASYNC_P and NON_STOP_P, then call an inferior +# function. The inferior function being called will itself have a +# breakpoint within it. Check how GDB reports this to the user. +proc_with_prefix run_call_hits_breakpoint_test { async_p non_stop_p } { + if { [start_gdb_and_runto_main $async_p $non_stop_p] == -1 } { + return + } + + # Setup a breakpoint inside func_bp. + gdb_breakpoint "${::srcfile}:${::bp_2_line}" + set bp_2_num [get_integer_valueof "\$bpnum" "*UNKNOWN*" \ + "get number of second breakpoint"] + + + gdb_test "call func_bp ()" \ + [multi_line \ + "" \ + "Breakpoint ${bp_2_num}, func_bp \\(\\) at \[^\r\n\]+:${::bp_2_line}" \ + "${::decimal}\\s+\[^\r\n\]+Second breakpoint\[^\r\n\]+" \ + "The program being debugged stopped while in a function called from GDB\\." \ + "Evaluation of the expression containing the function" \ + "\\(func_bp\\) will be abandoned\\." \ + "When the function is done executing, GDB will silently stop\\."] +} + +# Start GDB according to ASYNC_P and NON_STOP_P, then setup a +# conditional breakpoint. The breakpoint condition includes an +# inferior function call that segfaults. Check how GDB reports this +# to the user. +proc_with_prefix run_cond_hits_segfault_test { async_p non_stop_p } { + if { [start_gdb_and_runto_main $async_p $non_stop_p] == -1 } { + return + } + + # This test relies on the inferior segfaulting when trying to + # access address zero. + if { [is_address_zero_readable] } { + return + } + + # Setup the conditional breakpoint and record its number. + gdb_breakpoint "${::srcfile}:${::bp_1_line} if (func_segfault ())" + set bp_1_num [get_integer_valueof "\$bpnum" "*UNKNOWN*" \ + "get number of first breakpoint"] + + gdb_test "continue" \ + [multi_line \ + "Continuing\\." \ + "" \ + "Program received signal SIGSEGV, Segmentation fault\\." \ + "${::hex} in func_segfault \\(\\) at \[^\r\n\]+:${::segv_line}" \ + "${::decimal}\\s+\[^\r\n\]+Segfault here\[^\r\n\]+" \ + "Error in testing condition for breakpoint ${bp_1_num}:" \ + "The program being debugged stopped while in a function called from GDB\\." \ + "Evaluation of the expression containing the function" \ + "\\(func_segfault\\) will be abandoned\\." \ + "When the function is done executing, GDB will silently stop\\." \ + "" \ + "Breakpoint ${bp_1_num}, \[^\r\n\]+" \ + "${::decimal}\\s+\[^\r\n\]+Segfault here\[^\r\n\]+"] +} + +# Start GDB according to ASYNC_P and NON_STOP_P, then call an inferior +# function. The inferior function will segfault. Check how GDB +# reports this to the user. +proc_with_prefix run_call_hits_segfault_test { async_p non_stop_p } { + if { [start_gdb_and_runto_main $async_p $non_stop_p] == -1 } { + return + } + + # This test relies on the inferior segfaulting when trying to + # access address zero. + if { [is_address_zero_readable] } { + return + } + + gdb_test "call func_segfault ()" \ + [multi_line \ + "" \ + "Program received signal SIGSEGV, Segmentation fault\\." \ + "${::hex} in func_segfault \\(\\) at \[^\r\n\]+:${::segv_line}" \ + "${::decimal}\\s+\[^\r\n\]+Segfault here\[^\r\n\]+" \ + "The program being debugged stopped while in a function called from GDB\\." \ + "Evaluation of the expression containing the function" \ + "\\(func_segfault\\) will be abandoned\\." \ + "When the function is done executing, GDB will silently stop\\."] +} + +foreach_with_prefix target_async { "on" "off" } { + foreach_with_prefix target_non_stop { "on" "off" } { + run_cond_hits_breakpoint_test $target_async $target_non_stop + run_call_hits_breakpoint_test $target_async $target_non_stop + + run_cond_hits_segfault_test $target_async $target_non_stop + run_call_hits_segfault_test $target_async $target_non_stop + } +} From patchwork Wed Jan 18 16:18:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 63356 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 458B83854393 for ; Wed, 18 Jan 2023 16:20:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 458B83854393 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1674058848; bh=V+ErLct8LXX4NVV5I/yZP8O52bnCZHA/CjCAswlA+dM=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=c0f3ZM4nBchL1QgDUselnvX//ktVhhWARipA8WnMnB98uYZR7AbNZyGGRSbXkmmIu Lukax7gW1oh7eju9QcM9dRIl+wntPigr6ujcFwgPCrUtyv7/MpGxExqqrxMorc0BZf gfQ3JXHcowAbhab5HJlXbkDzy8ZZ9JZqgXYzDZq0= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 4AD2D3858296 for ; Wed, 18 Jan 2023 16:18:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4AD2D3858296 Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-46-0bk8oeb9PSWq4C6DZpUX6A-1; Wed, 18 Jan 2023 11:18:30 -0500 X-MC-Unique: 0bk8oeb9PSWq4C6DZpUX6A-1 Received: by mail-qv1-f69.google.com with SMTP id pm24-20020ad446d8000000b0053233e46a00so12938865qvb.23 for ; Wed, 18 Jan 2023 08:18:30 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=V+ErLct8LXX4NVV5I/yZP8O52bnCZHA/CjCAswlA+dM=; b=z6ZGWBniCu4WpDWhkcetwMK/tErjBtct3i4DJ/XOF1KpYE+nibB9B7IdVeJ1iHfLfc 1o62kYMxqBBGoOxRoXIWD0pTqxLV02zVjVYqL32ZWNoZ9eCEucGzORLqdE2FVupt+HE5 7gUPUAyQnYpHZoS+BSkQcS+QB5aFPe0uJ5CoJTq9gdxaUe7DNLdr4CSVDuZWm9MytPTI IOS1uG/NLYrdo3482gBMclyIDrL+yIWOWR+RSSsC/YVOouF3fnh+TtqtTUoJQVlqPYJ3 vEgWu89bueZbC3rubzgbfLo592opgDhjrwHn2+i+my0LmrI8ha1uaHtYRfbYIQMvi7hk yEAw== X-Gm-Message-State: AFqh2kqG3537MjWRrZqUL3GLShroX5VvJsXXHXnE3PRkI4p4iQGaWcf0 3v5mSN2DTO9PdOWcFqSTdaOB8d5liDhgNf++ZiADkQgxg1xz2/ffo9YC4zYJJNWd7TbnD69tcfq iAK+KY5YLjjUHtPi/m+qdmgEP3tqf8Mj3DRE9sYFARHDuvhwnbUSQTE1ndfnkHpnv7PJnOK9Dpw == X-Received: by 2002:a0c:8dc9:0:b0:534:fe24:db68 with SMTP id u9-20020a0c8dc9000000b00534fe24db68mr10638783qvb.4.1674058709343; Wed, 18 Jan 2023 08:18:29 -0800 (PST) X-Google-Smtp-Source: AMrXdXszW8zHszm98cr+CLiLHqY/OBj5+ExptudKvk3AgP6x7Fd4j3g1kRdpvdnAsjVLNQ2iaHkizw== X-Received: by 2002:a0c:8dc9:0:b0:534:fe24:db68 with SMTP id u9-20020a0c8dc9000000b00534fe24db68mr10638749qvb.4.1674058708942; Wed, 18 Jan 2023 08:18:28 -0800 (PST) Received: from localhost (95.72.115.87.dyn.plus.net. [87.115.72.95]) by smtp.gmail.com with ESMTPSA id q44-20020a05620a2a6c00b006fc9fe67e34sm8407593qkp.81.2023.01.18.08.18.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jan 2023 08:18:28 -0800 (PST) To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCHv2 07/13] gdb: don't always print breakpoint location after failed condition check Date: Wed, 18 Jan 2023 16:18:03 +0000 Message-Id: <6f9398a42867d24757af1a0b74623f24fb1cd606.1674058360.git.aburgess@redhat.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Andrew Burgess via Gdb-patches From: Andrew Burgess Reply-To: Andrew Burgess Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" Consider the following session: (gdb) list some_func 1 int 2 some_func () 3 { 4 int *p = 0; 5 return *p; 6 } 7 8 void 9 foo () 10 { (gdb) break foo if (some_func ()) Breakpoint 1 at 0x40111e: file bpcond.c, line 11. (gdb) r Starting program: /tmp/bpcond Program received signal SIGSEGV, Segmentation fault. 0x0000000000401116 in some_func () at bpcond.c:5 5 return *p; Error in testing condition for breakpoint 1: The program being debugged stopped while in a function called from GDB. Evaluation of the expression containing the function (some_func) will be abandoned. When the function is done executing, GDB will silently stop. Breakpoint 1, 0x0000000000401116 in some_func () at bpcond.c:5 5 return *p; (gdb) What happens here is the breakpoint condition includes a call to an inferior function, and the inferior function segfaults. We can see that GDB reports the segfault, and then gives an error message that indicates that an inferior function call was interrupted. After this GDB appears to report that it is stopped at Breakpoint 1, inside some_func. I find this second stop report a little confusing. Yes, GDB has stopped as a result of hitting breakpoint 1, but, I think the message as it currently is might give the impression that the thread is actually stopped at a location of breakpoint 1, which is not the case. Also, I find the second stop message draws attention away from the "Program received signal SIGSEGV, Segmentation fault" stop message, and this second stop might be thought of as replacing in someway the earlier message. In short, I think that the in the situation above, I think things would be clearer if the second stop message were not reported at all, so the output should (I think) look like this: (gdb) list some_func 1 int 2 some_func () 3 { 4 int *p = 0; 5 return *p; 6 } 7 8 void 9 foo () 10 { (gdb) break foo if (some_func ()) Breakpoint 1 at 0x40111e: file bpcond.c, line 11. (gdb) r Starting program: /tmp/bpcond Program received signal SIGSEGV, Segmentation fault. 0x0000000000401116 in some_func () at bpcond.c:5 5 return *p; Error in testing condition for breakpoint 1: The program being debugged stopped while in a function called from GDB. Evaluation of the expression containing the function (some_func) will be abandoned. When the function is done executing, GDB will silently stop. (gdb) The user can still find the number of the breakpoint that triggered the initial stop in this line: Error in testing condition for breakpoint 1: But there's now only one stop reason reported, the SIGSEGV, which I think is much clearer. To achieve this change I set the bpstat::print field when: (a) a breakpoint condition evaluation failed, and (b) the $pc of the thread changed during condition evaluation. I've updated the existing tests that checked the error message printed when a breakpoint condition evaluation failed. --- gdb/breakpoint.c | 12 ++++++++++++ gdb/testsuite/gdb.base/infcall-failure.exp | 18 ++++++++---------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index eecaeefed3e..c4fec7e8e55 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -5533,6 +5533,7 @@ bpstat_check_breakpoint_conditions (bpstat *bs, thread_info *thread) else within_current_scope = false; } + CORE_ADDR pc_before_check = get_frame_pc (get_selected_frame (nullptr)); if (within_current_scope) { try @@ -5544,6 +5545,17 @@ bpstat_check_breakpoint_conditions (bpstat *bs, thread_info *thread) exception_fprintf (gdb_stderr, ex, "Error in testing condition for breakpoint %d:\n", b->number); + + /* If the pc value changed as a result of evaluating the + condition then we probably stopped within an inferior + function call due to some unexpected stop, e.g. the thread + hit another breakpoint, or the thread received an + unexpected signal. In this case we don't want to also + print the information about this breakpoint. */ + CORE_ADDR pc_after_check + = get_frame_pc (get_selected_frame (nullptr)); + if (pc_before_check != pc_after_check) + bs->print = 0; } } else diff --git a/gdb/testsuite/gdb.base/infcall-failure.exp b/gdb/testsuite/gdb.base/infcall-failure.exp index 2dcdda34b4d..8fa2c407fc5 100644 --- a/gdb/testsuite/gdb.base/infcall-failure.exp +++ b/gdb/testsuite/gdb.base/infcall-failure.exp @@ -79,10 +79,7 @@ proc_with_prefix run_cond_hits_breakpoint_test { async_p non_stop_p } { "The program being debugged stopped while in a function called from GDB\\." \ "Evaluation of the expression containing the function" \ "\\(func_bp\\) will be abandoned\\." \ - "When the function is done executing, GDB will silently stop\\." \ - "" \ - "Breakpoint ${bp_1_num}, \[^\r\n\]+" \ - "${::decimal}\\s+\[^\r\n\]+Second breakpoint\[^\r\n\]+"] + "When the function is done executing, GDB will silently stop\\."] } # Start GDB according to ASYNC_P and NON_STOP_P, then call an inferior @@ -138,13 +135,12 @@ proc_with_prefix run_cond_hits_segfault_test { async_p non_stop_p } { "${::hex} in func_segfault \\(\\) at \[^\r\n\]+:${::segv_line}" \ "${::decimal}\\s+\[^\r\n\]+Segfault here\[^\r\n\]+" \ "Error in testing condition for breakpoint ${bp_1_num}:" \ - "The program being debugged stopped while in a function called from GDB\\." \ + "The program being debugged was signaled while in a function called from GDB\\." \ + "GDB remains in the frame where the signal was received\\." \ + "To change this behavior use \"set unwindonsignal on\"\\." \ "Evaluation of the expression containing the function" \ "\\(func_segfault\\) will be abandoned\\." \ - "When the function is done executing, GDB will silently stop\\." \ - "" \ - "Breakpoint ${bp_1_num}, \[^\r\n\]+" \ - "${::decimal}\\s+\[^\r\n\]+Segfault here\[^\r\n\]+"] + "When the function is done executing, GDB will silently stop\\."] } # Start GDB according to ASYNC_P and NON_STOP_P, then call an inferior @@ -167,7 +163,9 @@ proc_with_prefix run_call_hits_segfault_test { async_p non_stop_p } { "Program received signal SIGSEGV, Segmentation fault\\." \ "${::hex} in func_segfault \\(\\) at \[^\r\n\]+:${::segv_line}" \ "${::decimal}\\s+\[^\r\n\]+Segfault here\[^\r\n\]+" \ - "The program being debugged stopped while in a function called from GDB\\." \ + "The program being debugged was signaled while in a function called from GDB\\." \ + "GDB remains in the frame where the signal was received\\." \ + "To change this behavior use \"set unwindonsignal on\"\\." \ "Evaluation of the expression containing the function" \ "\\(func_segfault\\) will be abandoned\\." \ "When the function is done executing, GDB will silently stop\\."] From patchwork Wed Jan 18 16:18:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 63350 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 94DFE385B53D for ; Wed, 18 Jan 2023 16:19:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 94DFE385B53D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1674058758; bh=rZkOoTaoZ/26sQ5YZxxEHdir7t2ATXyzcN36nTQz838=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=sPJs5kvFGDVlP+ppAlZXzZcYHulmeSeXf7ICWQWDtaLBGbV70tUxfDZFDr35q+InA M9X97AzWkFrUfuWHRqDsJzgxwTx7Pxo4ba+Q/EjTyn2rUuu2mwF+D6HuQJ1XFs89dl wOlSaUnHWVfkqRFj7OHWwyuEnrpmuL3P8oaHlroE= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 96357385841E for ; Wed, 18 Jan 2023 16:18:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 96357385841E Received: from mail-yb1-f198.google.com (mail-yb1-f198.google.com [209.85.219.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-164-Epa5yIY7OzuyafZvpzMxHw-1; Wed, 18 Jan 2023 11:18:32 -0500 X-MC-Unique: Epa5yIY7OzuyafZvpzMxHw-1 Received: by mail-yb1-f198.google.com with SMTP id i135-20020a25d18d000000b007e64108adb4so8983779ybg.0 for ; Wed, 18 Jan 2023 08:18:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rZkOoTaoZ/26sQ5YZxxEHdir7t2ATXyzcN36nTQz838=; b=Y3bELX0vCUmKVUa+d8PrZ9kQKgPATkUtb5vtfXvB0vdKbDOmGXTyVGoSGRzs+oW3Dr CSKjsf4h+pl+TSYi2IcWbGj5ii7KXnvz7ZBeHoJQ7Py4FwPfLnCdUAmXNtwoHSAIujCr ptXbougezh0A5oDFWsdoGjd11XgqEF6k6JzEwF0PmeS0//AprrEOw09jsrOjrH/BruEE Ds7oAheyahW3IOHrIIm9MDZ1K52DMrbXfRxd/0awgOcQYKQEVWw09Ugm2TjvGRoPJTa4 NDEfG7nFWkUbHsiZNPj90qqLkKhGrD4O8K+OUwK8SLivoQ9QT4gG6NKgpM6O0Y8SgnAQ SyNw== X-Gm-Message-State: AFqh2kqkh1V7K9fsGG+hAg0BNvlectRbjGhaKH3PM7j7u9gSISeL/ZcN sjFApYZXfJ4emkNZVt2lPxueqwi9KeWuewuaHcetz+1WhT2n8xZt4i9V05mvlV/M+XuYVk1HVLd yVuC4H+zmKH2D4RBCW7LifMErfSDwGyVNSJMfqrazdb2YZti/8C1OCj+7lfyykf3PS4fMzBPkvw == X-Received: by 2002:a05:7508:630a:b0:4a:823a:3271 with SMTP id cl10-20020a057508630a00b0004a823a3271mr498124gbb.10.1674058711365; Wed, 18 Jan 2023 08:18:31 -0800 (PST) X-Google-Smtp-Source: AMrXdXsw8hkZSD4hRrHbAkkwlbG/t6XvUgOQpo3AKquXsB/x6jlIeNBGmzn1e8IQIkPtrp8c+w2lZw== X-Received: by 2002:a05:7508:630a:b0:4a:823a:3271 with SMTP id cl10-20020a057508630a00b0004a823a3271mr498108gbb.10.1674058710922; Wed, 18 Jan 2023 08:18:30 -0800 (PST) Received: from localhost (95.72.115.87.dyn.plus.net. [87.115.72.95]) by smtp.gmail.com with ESMTPSA id bk14-20020a05620a1a0e00b006ce580c2663sm22612663qkb.35.2023.01.18.08.18.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jan 2023 08:18:30 -0800 (PST) To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCHv2 08/13] Revert "gdb: remove unnecessary parameter wait_ptid from do_target_wait" Date: Wed, 18 Jan 2023 16:18:04 +0000 Message-Id: <60af9af218f6b6753fec0a9bca8c78b91d54f41e.1674058360.git.aburgess@redhat.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Andrew Burgess via Gdb-patches From: Andrew Burgess Reply-To: Andrew Burgess Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" This reverts commit ac0d67ed1dcf470bad6a3bc4800c2ddc9bedecca. There was nothing wrong with the commit which I'm reverting here, but it removed some functionality that will be needed for a later commit; that is, the ability for GDB to ask for events from a specific ptid_t via the do_target_wait function. In a follow up commit, this functionality will be used to implement inferior function calls in multi-threaded inferiors. --- gdb/infrun.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gdb/infrun.c b/gdb/infrun.c index edfb5ab0a91..5af8635a1ab 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -3741,7 +3741,8 @@ do_target_wait_1 (inferior *inf, ptid_t ptid, more events. Polls for events from all inferiors/targets. */ static bool -do_target_wait (execution_control_state *ecs, target_wait_flags options) +do_target_wait (ptid_t wait_ptid, execution_control_state *ecs, + target_wait_flags options) { int num_inferiors = 0; int random_selector; @@ -3751,9 +3752,10 @@ do_target_wait (execution_control_state *ecs, target_wait_flags options) polling the rest of the inferior list starting from that one in a circular fashion until the whole list is polled once. */ - auto inferior_matches = [] (inferior *inf) + auto inferior_matches = [&wait_ptid] (inferior *inf) { - return inf->process_target () != nullptr; + return (inf->process_target () != NULL + && ptid_t (inf->pid).matches (wait_ptid)); }; /* First see how many matching inferiors we have. */ @@ -3792,7 +3794,7 @@ do_target_wait (execution_control_state *ecs, target_wait_flags options) auto do_wait = [&] (inferior *inf) { - ecs->ptid = do_target_wait_1 (inf, minus_one_ptid, &ecs->ws, options); + ecs->ptid = do_target_wait_1 (inf, wait_ptid, &ecs->ws, options); ecs->target = inf->process_target (); return (ecs->ws.kind () != TARGET_WAITKIND_IGNORE); }; @@ -4169,7 +4171,7 @@ fetch_inferior_event () the event. */ scoped_disable_commit_resumed disable_commit_resumed ("handling event"); - if (!do_target_wait (&ecs, TARGET_WNOHANG)) + if (!do_target_wait (minus_one_ptid, &ecs, TARGET_WNOHANG)) { infrun_debug_printf ("do_target_wait returned no event"); disable_commit_resumed.reset_and_commit (); From patchwork Wed Jan 18 16:18:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 63354 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6A0A3383FB8C for ; Wed, 18 Jan 2023 16:19:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6A0A3383FB8C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1674058798; bh=FM1QRywl6+hl7V+HhPuaMT6cOW6AMTjBCnyweKO3D0g=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=PNKdntxNWytnVsSTLENlGtumNs16NiSZteoZaMD3QqxNfqFh93EYHzcasq1cgqK4H 3umHALnHCuRlnlTD3M5svq5Ih7ZFKmqstEpINxc8wOs+j1klqIBcKi8Enav/Axeg7K Y1ZLjI0R1GJ7QRYOB1RpHuROl9/fdaLs2Fez6QKw= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id A3024385828E for ; Wed, 18 Jan 2023 16:18:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A3024385828E Received: from mail-yb1-f198.google.com (mail-yb1-f198.google.com [209.85.219.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-489-SJY96ih8M1m_N_h1TAqwyg-1; Wed, 18 Jan 2023 11:18:36 -0500 X-MC-Unique: SJY96ih8M1m_N_h1TAqwyg-1 Received: by mail-yb1-f198.google.com with SMTP id u186-20020a2560c3000000b007c8e2cf3668so20243413ybb.14 for ; Wed, 18 Jan 2023 08:18:36 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FM1QRywl6+hl7V+HhPuaMT6cOW6AMTjBCnyweKO3D0g=; b=RYcD4xjAHqjxQ5dGceANotwagxGPIHl90dUqwPusPg7XNs+2tiFXLfwxFGvZf070qd lHuvS+YxW0qU2nHteK1fv94L92UT8y4IpsMUUHrm0P9lZ6WigxeCAlshozw2j3nx5a30 CoQ+ZclvrYEwsncuErDURr5Fa+dc1WKk1eMx7EI2qv8ZCZroEeis/glOy2UVoJc+YPlV jqKNHtFwTpsP9rJ8ANGXxZ2kZ6BstjPCCLWcnmW5uiUEtEGSJ4QUEXWGwCuKU3s8934X pjF2hyAqlw5kadLqRMvrfvsfUIHq1R+j6KSBarPLfTdHf5S0sh10bqqMDH6evJF34RSc QQ/w== X-Gm-Message-State: AFqh2koPpC2EAoXKX8pM0LpGwr8+4mVs7pmoeWQalGYIgoiXMcozmlE4 g6HGOGNt/7SfSMZir0qAqzp4TT6f9baYzWan3OoDCCzv6megOnEhHjczlW9lGYQfDbAZ02Zegjg gm1e2E+voKH+a9C4btaWCOfIvY9GkExODaa4yUAxNMITiYfB8U7/VzegHlv2/kD8N2CIgnHZ4RA == X-Received: by 2002:a81:52c5:0:b0:46f:3644:5bf2 with SMTP id g188-20020a8152c5000000b0046f36445bf2mr6265535ywb.47.1674058714424; Wed, 18 Jan 2023 08:18:34 -0800 (PST) X-Google-Smtp-Source: AMrXdXsVBgLgjTJ45R8R17Sneq2M6gehPScgr5CIfKqGJWJY+z7P7OoYEb6t7ReGcga1QPdhGLMf3A== X-Received: by 2002:a81:52c5:0:b0:46f:3644:5bf2 with SMTP id g188-20020a8152c5000000b0046f36445bf2mr6265450ywb.47.1674058713185; Wed, 18 Jan 2023 08:18:33 -0800 (PST) Received: from localhost (95.72.115.87.dyn.plus.net. [87.115.72.95]) by smtp.gmail.com with ESMTPSA id g19-20020a05620a40d300b006cec8001bf4sm22805567qko.26.2023.01.18.08.18.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jan 2023 08:18:32 -0800 (PST) To: gdb-patches@sourceware.org Cc: Andrew Burgess , Natalia Saiapova , Tankut Baris Aktemur Subject: [PATCHv2 09/13] gdb: fix b/p conditions with infcalls in multi-threaded inferiors Date: Wed, 18 Jan 2023 16:18:05 +0000 Message-Id: X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Andrew Burgess via Gdb-patches From: Andrew Burgess Reply-To: Andrew Burgess Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" This commit fixes bug PR 28942, that is, creating a conditional breakpoint in a multi-threaded inferior, where the breakpoint condition includes an inferior function call. Currently, when a user tries to create such a breakpoint, then GDB will fail with: (gdb) break infcall-from-bp-cond-single.c:61 if (return_true ()) Breakpoint 2 at 0x4011fa: file /tmp/build/gdb/testsuite/../../../src/gdb/testsuite/gdb.threads/infcall-from-bp-cond-single.c, line 61. (gdb) continue Continuing. [New Thread 0x7ffff7c5d700 (LWP 2460150)] [New Thread 0x7ffff745c700 (LWP 2460151)] [New Thread 0x7ffff6c5b700 (LWP 2460152)] [New Thread 0x7ffff645a700 (LWP 2460153)] [New Thread 0x7ffff5c59700 (LWP 2460154)] Error in testing breakpoint condition: Couldn't get registers: No such process. An error occurred while in a function called from GDB. Evaluation of the expression containing the function (return_true) will be abandoned. When the function is done executing, GDB will silently stop. Selected thread is running. (gdb) Or, in some cases, like this: (gdb) break infcall-from-bp-cond-simple.c:56 if (is_matching_tid (arg, 1)) Breakpoint 2 at 0x401194: file /tmp/build/gdb/testsuite/../../../src/gdb/testsuite/gdb.threads/infcall-from-bp-cond-simple.c, line 56. (gdb) continue Continuing. [New Thread 0x7ffff7c5d700 (LWP 2461106)] [New Thread 0x7ffff745c700 (LWP 2461107)] ../../src.release/gdb/nat/x86-linux-dregs.c:146: internal-error: x86_linux_update_debug_registers: Assertion `lwp_is_stopped (lwp)' failed. A problem internal to GDB has been detected, further debugging may prove unreliable. The precise error depends on the exact thread state; so there's race conditions depending on which threads have fully started, and which have not. But the underlying problem is always the same; when GDB tries to execute the inferior function call from within the breakpoint condition, GDB will, incorrectly, try to resume threads that are already running - GDB doesn't realise that some threads might already be running. The solution proposed in this patch requires an additional member variable thread_info::in_cond_eval. This flag is set to true (in breakpoint.c) when GDB is evaluating a breakpoint condition. In user_visible_resume_ptid (infrun.c), when the in_cond_eval flag is true, then GDB will only try to resume the current thread, that is, the thread for which the breakpoint condition is being evaluated. This solves the problem of GDB trying to resume threads that are already running. The next problem is that inferior function calls are assumed to be synchronous, that is, GDB doesn't expect to start an inferior function call in thread #1, then receive a stop from thread #2 for some other, unrelated reason. To prevent GDB responding to an event from another thread, we update fetch_inferior_event and do_target_wait in infrun.c, so that, when an inferior function call (on behalf of a breakpoint condition) is in progress, we only wait for events from the current thread (the one evaluating the condition). The fix in do_target_wait is because previously, we only ever waited for the general any-thread, minus_one_ptid, for which matching against the inferior::pid would always succeed. However, now we might wait against a specific ptid value, in which case we need to ensure we only compare the pid part of the ptid. In fetch_inferior_event, after receiving the event, we only want to stop all the other threads, and call inferior_event_handler with INF_EXEC_COMPLETE, if we are not evaluating a conditional breakpoint. If we are, then all the other threads should be left doing whatever they were before. The inferior_event_handler call will be performed once the breakpoint condition has finished being evaluated, and GDB decides to stop or not. The final problem that needs solving relates to GDB's commit-resume mechanism, this allows GDB to collect resume requests into a single packet in order to reduce traffic to a remote target. The problem is that the commit-resume mechanism will not send any resume requests for an inferior if there are already events pending on the GDB side. Imagine an inferior with two threads. Both threads hit a breakpoint, maybe the same conditional breakpoint. At this point there are two pending events, one for each thread. GDB selects one of the events and spots that this is a conditional breakpoint, GDB evaluates the condition. The condition includes an inferior function call, so GDB sets up for the call and resumes the one thread, the resume request is added to the commit-resume queue. When the commit-resume queue is committed GDB sees that there is a pending event from another thread, and so doesn't send any resume requests to the actual target, GDB is assuming that when we wait we will select the event from the other thread. However, as this is an inferior function call for a condition evaluation, we will not select the event from the other thread, we only care about events from the thread that is evaluating the condition - and the resume for this thread was never sent to the target. And so, GDB hangs, waiting for an event from a thread that was never fully resumed. To fix this issue I have added the concept of "forcing" the commit-resume queue. When enabling commit resume, if the force flag is true, then any resumes will be committed to the target, even if there are other threads with pending events. A note on authorship: this patch was based on some work done by Natalia Saiapova and Tankut Baris Aktemur from Intel[1]. I have made some changes to their work in this version. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=28942 [1] https://sourceware.org/pipermail/gdb-patches/2020-October/172454.html Co-authored-by: Natalia Saiapova Co-authored-by: Tankut Baris Aktemur --- gdb/breakpoint.c | 2 + gdb/gdbthread.h | 3 + gdb/infcall.c | 6 + gdb/infrun.c | 46 +++- gdb/infrun.h | 2 +- .../infcall-from-bp-cond-other-thread-event.c | 135 ++++++++++ ...nfcall-from-bp-cond-other-thread-event.exp | 175 +++++++++++++ .../gdb.threads/infcall-from-bp-cond-simple.c | 89 +++++++ .../infcall-from-bp-cond-simple.exp | 236 ++++++++++++++++++ .../gdb.threads/infcall-from-bp-cond-single.c | 139 +++++++++++ .../infcall-from-bp-cond-single.exp | 119 +++++++++ 11 files changed, 940 insertions(+), 12 deletions(-) create mode 100644 gdb/testsuite/gdb.threads/infcall-from-bp-cond-other-thread-event.c create mode 100644 gdb/testsuite/gdb.threads/infcall-from-bp-cond-other-thread-event.exp create mode 100644 gdb/testsuite/gdb.threads/infcall-from-bp-cond-simple.c create mode 100644 gdb/testsuite/gdb.threads/infcall-from-bp-cond-simple.exp create mode 100644 gdb/testsuite/gdb.threads/infcall-from-bp-cond-single.c create mode 100644 gdb/testsuite/gdb.threads/infcall-from-bp-cond-single.exp diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index c4fec7e8e55..0cb4382ba5b 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -5538,6 +5538,8 @@ bpstat_check_breakpoint_conditions (bpstat *bs, thread_info *thread) { try { + scoped_restore reset_in_cond_eval + = make_scoped_restore (&thread->control.in_cond_eval, true); condition_result = breakpoint_cond_eval (cond); } catch (const gdb_exception &ex) diff --git a/gdb/gdbthread.h b/gdb/gdbthread.h index 11d69fceab0..b0421bac95f 100644 --- a/gdb/gdbthread.h +++ b/gdb/gdbthread.h @@ -171,6 +171,9 @@ struct thread_control_state command. This is used to decide whether "set scheduler-locking step" behaves like "on" or "off". */ int stepping_command = 0; + + /* True if the thread is evaluating a BP condition. */ + bool in_cond_eval = false; }; /* Inferior thread specific part of `struct infcall_suspend_state'. */ diff --git a/gdb/infcall.c b/gdb/infcall.c index e1b785e437b..8a48909bc2c 100644 --- a/gdb/infcall.c +++ b/gdb/infcall.c @@ -641,6 +641,12 @@ run_inferior_call (std::unique_ptr sm, proceed (real_pc, GDB_SIGNAL_0); + /* Enable commit resume, but pass true for the force flag. This + ensures any thread we set running in proceed will actually be + committed to the target, even if some other thread in the current + target has a pending event. */ + scoped_enable_commit_resumed enable ("infcall", true); + infrun_debug_show_threads ("non-exited threads after proceed for inferior-call", all_non_exited_threads ()); diff --git a/gdb/infrun.c b/gdb/infrun.c index 5af8635a1ab..861be6eae2f 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -2149,6 +2149,14 @@ user_visible_resume_ptid (int step) mode. */ resume_ptid = inferior_ptid; } + else if (inferior_ptid != null_ptid + && inferior_thread ()->control.in_cond_eval) + { + /* The inferior thread is evaluating a BP condition. Other threads + might be stopped or running and we do not want to change their + state, thus, resume only the current thread. */ + resume_ptid = inferior_ptid; + } else if (!sched_multi && target_supports_multi_process ()) { /* Resume all threads of the current process (and none of other @@ -2861,7 +2869,7 @@ schedlock_applies (struct thread_info *tp) pending events. */ static void -maybe_set_commit_resumed_all_targets () +maybe_set_commit_resumed_all_targets (bool force_p) { scoped_restore_current_thread restore_thread; @@ -2890,7 +2898,7 @@ maybe_set_commit_resumed_all_targets () status to report, handle it before requiring the target to commit its resumed threads: handling the status might lead to resuming more threads. */ - if (proc_target->has_resumed_with_pending_wait_status ()) + if (!force_p && proc_target->has_resumed_with_pending_wait_status ()) { infrun_debug_printf ("not requesting commit-resumed for target %s, a" " thread has a pending waitstatus", @@ -2900,7 +2908,7 @@ maybe_set_commit_resumed_all_targets () switch_to_inferior_no_thread (inf); - if (target_has_pending_events ()) + if (!force_p && target_has_pending_events ()) { infrun_debug_printf ("not requesting commit-resumed for target %s, " "target has pending events", @@ -2993,7 +3001,7 @@ scoped_disable_commit_resumed::reset () { /* This is the outermost instance, re-enable COMMIT_RESUMED_STATE on the targets where it's possible. */ - maybe_set_commit_resumed_all_targets (); + maybe_set_commit_resumed_all_targets (false); } else { @@ -3026,7 +3034,7 @@ scoped_disable_commit_resumed::reset_and_commit () /* See infrun.h. */ scoped_enable_commit_resumed::scoped_enable_commit_resumed - (const char *reason) + (const char *reason, bool force_p) : m_reason (reason), m_prev_enable_commit_resumed (enable_commit_resumed) { @@ -3038,7 +3046,7 @@ scoped_enable_commit_resumed::scoped_enable_commit_resumed /* Re-enable COMMIT_RESUMED_STATE on the targets where it's possible. */ - maybe_set_commit_resumed_all_targets (); + maybe_set_commit_resumed_all_targets (force_p); maybe_call_commit_resumed_all_targets (); } @@ -3752,10 +3760,11 @@ do_target_wait (ptid_t wait_ptid, execution_control_state *ecs, polling the rest of the inferior list starting from that one in a circular fashion until the whole list is polled once. */ - auto inferior_matches = [&wait_ptid] (inferior *inf) + ptid_t wait_ptid_pid {wait_ptid.pid ()}; + auto inferior_matches = [&wait_ptid_pid] (inferior *inf) { return (inf->process_target () != NULL - && ptid_t (inf->pid).matches (wait_ptid)); + && ptid_t (inf->pid).matches (wait_ptid_pid)); }; /* First see how many matching inferiors we have. */ @@ -4171,7 +4180,17 @@ fetch_inferior_event () the event. */ scoped_disable_commit_resumed disable_commit_resumed ("handling event"); - if (!do_target_wait (minus_one_ptid, &ecs, TARGET_WNOHANG)) + /* Is the current thread performing an inferior function call as part + of a breakpoint condition evaluation? */ + bool in_cond_eval = (inferior_ptid != null_ptid + && inferior_thread ()->control.in_cond_eval); + + /* If the thread is in the middle of the condition evaluation, wait for + an event from the current thread, otherwise, wait for an event from + any thread. */ + ptid_t waiton_ptid = in_cond_eval ? inferior_ptid : minus_one_ptid; + + if (!do_target_wait (waiton_ptid, &ecs, TARGET_WNOHANG)) { infrun_debug_printf ("do_target_wait returned no event"); disable_commit_resumed.reset_and_commit (); @@ -4223,7 +4242,12 @@ fetch_inferior_event () bool should_notify_stop = true; bool proceeded = false; - stop_all_threads_if_all_stop_mode (); + /* If the thread that stopped just completed an inferior + function call as part of a condition evaluation, then we + don't want to stop all the other threads. */ + if (ecs.event_thread == nullptr + || !ecs.event_thread->control.in_cond_eval) + stop_all_threads_if_all_stop_mode (); clean_up_just_stopped_threads_fsms (&ecs); @@ -4238,7 +4262,7 @@ fetch_inferior_event () proceeded = normal_stop (); } - if (!proceeded) + if (!proceeded && !in_cond_eval) { inferior_event_handler (INF_EXEC_COMPLETE); cmd_done = 1; diff --git a/gdb/infrun.h b/gdb/infrun.h index 43fd1b44f5a..ced2ec5843c 100644 --- a/gdb/infrun.h +++ b/gdb/infrun.h @@ -395,7 +395,7 @@ extern void maybe_call_commit_resumed_all_targets (); struct scoped_enable_commit_resumed { - explicit scoped_enable_commit_resumed (const char *reason); + explicit scoped_enable_commit_resumed (const char *reason, bool force_p = false); ~scoped_enable_commit_resumed (); DISABLE_COPY_AND_ASSIGN (scoped_enable_commit_resumed); diff --git a/gdb/testsuite/gdb.threads/infcall-from-bp-cond-other-thread-event.c b/gdb/testsuite/gdb.threads/infcall-from-bp-cond-other-thread-event.c new file mode 100644 index 00000000000..a6abdeb29a6 --- /dev/null +++ b/gdb/testsuite/gdb.threads/infcall-from-bp-cond-other-thread-event.c @@ -0,0 +1,135 @@ +/* Copyright 2022 Free Software Foundation, Inc. + + This file is part of GDB. + + 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 +#include +#include +#include + +#define NUM_THREADS 2 + +pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; + +/* Some global variables to poke, just for something to do. */ +volatile int global_var_0 = 0; +volatile int global_var_1 = 0; + +/* This flag is updated from GDB. */ +volatile int raise_signal = 0; + +/* Implement the breakpoint condition function. Release the other thread + and try to give the other thread a chance to run. Then return ANSWER. */ +int +condition_core_func (int answer) +{ + /* This unlock should release the other thread. */ + if (pthread_mutex_unlock (&mutex) != 0) + abort (); + + /* And this yield and sleep should (hopefully) give the other thread a + chance to run. This isn't guaranteed of course, but once the other + thread does run it should hit a breakpoint, which GDB should + (temporarily) ignore, so there's no easy way for us to know the other + thread has done what it needs to, thus, yielding and sleeping is the + best we can do. */ + sched_yield (); + sleep (2); + + return answer; +} + +void +stop_marker () +{ + int a = 100; /* Final breakpoint here. */ +} + +/* A breakpoint condition function that always returns true. */ +int +condition_true_func () +{ + return condition_core_func (1); +} + +/* A breakpoint condition function that always returns false. */ +int +condition_false_func () +{ + return condition_core_func (0); +} + +void * +worker_func (void *arg) +{ + volatile int *ptr = 0; + int tid = *((int *) arg); + + switch (tid) + { + case 0: + global_var_0 = 11; /* First thread breakpoint. */ + break; + + case 1: + if (pthread_mutex_lock (&mutex) != 0) + abort (); + if (raise_signal) + global_var_1 = *ptr; /* Signal here. */ + else + global_var_1 = 99; /* Other thread breakpoint. */ + break; + + default: + abort (); + } + + return NULL; +} + +int +main () +{ + pthread_t threads[NUM_THREADS]; + int args[NUM_THREADS]; + + /* Set an alarm, just in case the test deadlocks. */ + alarm (300); + + /* We want the mutex to start locked. */ + if (pthread_mutex_lock (&mutex) != 0) + abort (); + + for (int i = 0; i < NUM_THREADS; i++) + { + args[i] = i; + pthread_create (&threads[i], NULL, worker_func, &args[i]); + } + + for (int i = 0; i < NUM_THREADS; i++) + { + void *retval; + pthread_join (threads[i], &retval); + } + + /* Unlock once we're done, just for cleanliness. */ + if (pthread_mutex_unlock (&mutex) != 0) + abort (); + + stop_marker (); + + return 0; +} diff --git a/gdb/testsuite/gdb.threads/infcall-from-bp-cond-other-thread-event.exp b/gdb/testsuite/gdb.threads/infcall-from-bp-cond-other-thread-event.exp new file mode 100644 index 00000000000..0c8ef728009 --- /dev/null +++ b/gdb/testsuite/gdb.threads/infcall-from-bp-cond-other-thread-event.exp @@ -0,0 +1,175 @@ +# 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 . + +# Test for conditional breakpoints where the breakpoint condition includes +# an inferior function call. +# +# The tests in this script are testing what happens when an event arrives in +# another thread while GDB is waiting for the inferior function call (in the +# breakpoint condition) to finish. +# +# The expectation is that GDB will queue events for other threads and wait +# for the inferior function call to complete, if the condition is true, then +# the conditional breakpoint should be reported first. The other thread +# event should of course, not get lost, and should be reported as soon as +# the user tries to continue the inferior. +# +# If the conditional breakpoint ends up not being taken (the condition is +# false), then the other thread event should be reported immediately. +# +# This script tests what happens when the other thread event is (a) the +# other thread hitting a breakpoint, and (b) the other thread taking a +# signal (SIGSEGV in this case). + +standard_testfile + +if { [build_executable "failed to prepare" ${binfile} "${srcfile}" \ + {debug pthreads}] == -1 } { + return +} + +set cond_bp_line [gdb_get_line_number "First thread breakpoint"] +set other_bp_line [gdb_get_line_number "Other thread breakpoint"] +set final_bp_line [gdb_get_line_number "Final breakpoint here"] +set signal_line [gdb_get_line_number "Signal here"] + +# Start GDB based on TARGET_ASYNC and TARGET_NON_STOP, and then runto main. +proc start_gdb_and_runto_main { target_async target_non_stop } { + save_vars { ::GDBFLAGS } { + append ::GDBFLAGS \ + " -ex \"maint set target-non-stop $target_non_stop\"" + append ::GDBFLAGS \ + " -ex \"maintenance set target-async ${target_async}\"" + + clean_restart ${::binfile} + } + + if {![runto_main]} { + fail "run to main" + return -1 + } + + return 0 +} + +# Run a test of GDB's conditional breakpoints, where the conditions include +# inferior function calls. While the inferior function call is executing +# another thread will hit a breakpoint (when OTHER_THREAD_SIGNAL is false), +# or receive a signal (when OTHER_THREAD_SIGNAL is true). GDB should report +# the conditional breakpoint first (if the condition is true), and then +# report the second thread event once the inferior is continued again. +# +# When STOP_AT_COND is true then the conditional breakpoint will have a +# condition that evaluates to true (and the GDB will stop at the +# breakpoint), otherwise, the condition will evaluate to false (and GDB will +# not stop at the breakpoint). +proc run_condition_test { stop_at_cond other_thread_signal \ + target_async target_non_stop } { + if { [start_gdb_and_runto_main $target_async \ + $target_non_stop] == -1 } { + return + } + + # Setup the conditional breakpoint. + if { $stop_at_cond } { + set cond_func "condition_true_func" + } else { + set cond_func "condition_false_func" + } + gdb_breakpoint \ + "${::srcfile}:${::cond_bp_line} if (${cond_func} ())" + set cond_bp_num [get_integer_valueof "\$bpnum" "*UNKNOWN*" \ + "get number for conditional breakpoint"] + + if { $other_thread_signal } { + # Arrange for the other thread to raise a signal while GDB is + # evaluating the breakpoint condition. + gdb_test_no_output "set raise_signal = 1" + } else { + # And a breakpoint that will be hit by another thread only once the + # breakpoint condition starts to be evaluated. + gdb_breakpoint "${::srcfile}:${::other_bp_line}" + set other_bp_num [get_integer_valueof "\$bpnum" "*UNKNOWN*" \ + "get number for other breakpoint"] + } + + # A final breakpoint once the test has completed. + gdb_breakpoint "${::srcfile}:${::final_bp_line}" + set final_bp_num [get_integer_valueof "\$bpnum" "*UNKNOWN*" \ + "get number for final breakpoint"] + + if { $stop_at_cond } { + # Continue. The first breakpoint we hit should be the conditional + # breakpoint. The other thread will have hit its breakpoint, but + # that will have been deferred until the conditional breakpoint is + # reported. + gdb_test "continue" \ + [multi_line \ + "Continuing\\." \ + ".*" \ + "" \ + "Thread ${::decimal} \"\[^\"\r\n\]+\" hit Breakpoint ${cond_bp_num}, worker_func \[^\r\n\]+:${::cond_bp_line}" \ + "${::decimal}\\s+\[^\r\n\]+First thread breakpoint\[^\r\n\]+"] \ + "hit the conditional breakpoint" + } + + if { $other_thread_signal } { + # Now continue again, the other thread will now report that it + # received a signal. + gdb_test "continue" \ + [multi_line \ + "Continuing\\." \ + ".*" \ + "Thread ${::decimal} \"\[^\"\r\n\]+\" received signal SIGSEGV, Segmentation fault\\." \ + "\\\[Switching to Thread \[^\r\n\]+\\\]" \ + "${::hex} in worker_func \[^\r\n\]+:${::signal_line}" \ + "${::decimal}\\s+\[^\r\n\]+Signal here\[^\r\n\]+"] \ + "received signal in other thread" + } else { + # Now continue again, the other thread will now report its + # breakpoint. + gdb_test "continue" \ + [multi_line \ + "Continuing\\." \ + ".*" \ + "" \ + "Thread ${::decimal} \"\[^\"\r\n\]+\" hit Breakpoint ${other_bp_num}, worker_func \[^\r\n\]+:${::other_bp_line}" \ + "${::decimal}\\s+\[^\r\n\]+Other thread breakpoint\[^\r\n\]+"] \ + "hit the breakpoint in other thread" + + # Run to the stop marker. + gdb_test "continue" \ + [multi_line \ + "Continuing\\." \ + ".*" \ + "" \ + "Thread ${::decimal} \"\[^\"\r\n\]+\" hit Breakpoint ${final_bp_num}, stop_marker \[^\r\n\]+:${::final_bp_line}" \ + "${::decimal}\\s+\[^\r\n\]+Final breakpoint here\[^\r\n\]+"] \ + "hit the final breakpoint" + } + + gdb_exit +} + +foreach_with_prefix target_async { "on" "off" } { + foreach_with_prefix target_non_stop { "on" "off" } { + foreach_with_prefix other_thread_signal { true false } { + foreach_with_prefix stop_at_cond { true false } { + run_condition_test $stop_at_cond $other_thread_signal \ + $target_async $target_non_stop + } + } + } +} diff --git a/gdb/testsuite/gdb.threads/infcall-from-bp-cond-simple.c b/gdb/testsuite/gdb.threads/infcall-from-bp-cond-simple.c new file mode 100644 index 00000000000..f2a24a52b01 --- /dev/null +++ b/gdb/testsuite/gdb.threads/infcall-from-bp-cond-simple.c @@ -0,0 +1,89 @@ +/* Copyright 2022 Free Software Foundation, Inc. + + This file is part of GDB. + + 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 +#include + +#define NUM_THREADS 3 + +int +is_matching_tid (int *tid_ptr, int tid_value) +{ + return *tid_ptr == tid_value; +} + +int +return_true () +{ + return 1; +} + +int +return_false () +{ + return 0; +} + +int +function_that_segfaults () +{ + int *p = 0; + *p = 1; /* Segfault happens here. */ +} + +int +function_with_breakpoint () +{ + return 1; /* Nested breakpoint. */ +} + +void * +worker_func (void *arg) +{ + int a = 42; /* Breakpoint here. */ +} + +void +stop_marker () +{ + int b = 99; /* Stop marker. */ +} + +int +main () +{ + pthread_t threads[NUM_THREADS]; + int args[NUM_THREADS]; + + alarm (300); + + for (int i = 0; i < NUM_THREADS; i++) + { + args[i] = i; + pthread_create (&threads[i], NULL, worker_func, &args[i]); + } + + for (int i = 0; i < NUM_THREADS; i++) + { + void *retval; + pthread_join (threads[i], &retval); + } + + stop_marker (); + + return 0; +} diff --git a/gdb/testsuite/gdb.threads/infcall-from-bp-cond-simple.exp b/gdb/testsuite/gdb.threads/infcall-from-bp-cond-simple.exp new file mode 100644 index 00000000000..8d94d24f9b3 --- /dev/null +++ b/gdb/testsuite/gdb.threads/infcall-from-bp-cond-simple.exp @@ -0,0 +1,236 @@ +# 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 . + +# Some simple tests of inferior function calls from breakpoint +# conditions, in multi-threaded inferiors. +# +# This test sets up a multi-threaded inferior, and places a breakpoint +# at a location that many of the threads will reach. We repeat the +# test with different conditions, sometimes a single thread should +# stop at the breakpoint, sometimes multiple threads should stop, and +# sometime no threads should stop. + +standard_testfile + +if { [build_executable "failed to prepare" ${binfile} "${srcfile}" \ + {debug pthreads}] == -1 } { + return +} + +set cond_bp_line [gdb_get_line_number "Breakpoint here"] +set stop_bp_line [gdb_get_line_number "Stop marker"] +set nested_bp_line [gdb_get_line_number "Nested breakpoint"] +set segv_line [gdb_get_line_number "Segfault happens here"] + +# Start GDB based on TARGET_ASYNC and TARGET_NON_STOP, and then runto main. +proc start_gdb_and_runto_main { target_async target_non_stop } { + save_vars { ::GDBFLAGS } { + append ::GDBFLAGS \ + " -ex \"maint set target-non-stop $target_non_stop\"" + append ::GDBFLAGS \ + " -ex \"maintenance set target-async ${target_async}\"" + + clean_restart ${::binfile} + } + + if {![runto_main]} { + fail "run to main" + return -1 + } + + return 0 +} + +# Run a test of GDB's conditional breakpoints, where the conditions include +# inferior function calls. +# +# CONDITION is combined (with &&) to some additional logic, and used as the +# breakpoint condition. +# +# N_EXPECTED_HITS is the number of threads that we expect to stop due to +# CONDITON. +# +# MESSAGE is used as a test name prefix. +proc run_condition_test { message n_expected_hits condition \ + target_async target_non_stop } { + with_test_prefix $message { + + if { [start_gdb_and_runto_main $target_async \ + $target_non_stop] == -1 } { + return + } + + # Use this convenience variable to track how often the + # breakpoint condition has been evaluated, this should be once + # per thread. + gdb_test "set \$n_cond_eval = 0" + + # Setup the conditional breakpoint. + gdb_breakpoint \ + "${::srcfile}:${::cond_bp_line} if ((++\$n_cond_eval) ${condition})" + + # And a breakpoint that we hit when the test is over, this one is + # not conditional. Only the main thread gets here once all the + # other threads have finished. + gdb_breakpoint "${::srcfile}:${::stop_bp_line}" + + # The number of times we stop at the conditional breakpoint. + set n_hit_condition 0 + + # Now keep 'continue'-ing GDB until all the threads have finished + # and we reach the stop_marker breakpoint. + gdb_test_multiple "continue" "spot all breakpoint hits" { + -re " worker_func \[^\r\n\]+${::srcfile}:${::cond_bp_line}\r\n${::decimal}\\s+\[^\r\n\]+Breakpoint here\[^\r\n\]+\r\n${::gdb_prompt} $" { + incr n_hit_condition + send_gdb "continue\n" + exp_continue + } + + -re " stop_marker \[^\r\n\]+${::srcfile}:${::stop_bp_line}\r\n${::decimal}\\s+\[^\r\n\]+Stop marker\[^\r\n\]+\r\n${::gdb_prompt} $" { + pass $gdb_test_name + } + } + + gdb_assert { $n_hit_condition == $n_expected_hits } \ + "stopped at breakpoint the expected number of times" + + # Ensure the breakpoint condition was evaluated once per thread. + gdb_test "print \$n_cond_eval" "= 3" "condition was evaluated twice" + } +} + +# Check that after handling a conditional breakpoint (where the condition +# includes an inferior call), it is still possible to kill the running +# inferior, and then restart the inferior. +# +# At once point doing this would result in GDB giving an assertion error. +proc_with_prefix run_kill_and_restart_test { target_async target_non_stop } { + # This test relies on the 'start' command, which is not possible with + # the plain 'remote' target. + if {[target_info gdb_protocol] == "remote"} { + return + } + + if { [start_gdb_and_runto_main $target_async \ + $target_non_stop] == -1 } { + return + } + + # Setup the conditional breakpoint. + gdb_breakpoint \ + "${::srcfile}:${::cond_bp_line} if (is_matching_tid (arg, 1))" + gdb_continue_to_breakpoint "worker_func" + + # Now kill the program being debugged. + gdb_test "kill" "" "kill process" \ + "Kill the program being debugged.*y or n. $" "y" + + # Check we can restart the inferior. At one point this would trigger an + # assertion. + gdb_test "start" ".*" +} + +# Create a conditional breakpoint which includes a call to a function that +# segfaults. Run GDB and check what happens when the inferior segfaults +# during the inferior call. +proc_with_prefix run_bp_cond_segfaults { target_async target_non_stop } { + if { [start_gdb_and_runto_main $target_async \ + $target_non_stop] == -1 } { + return + } + + # This test relies on the inferior segfaulting when trying to + # access address zero. + if { [is_address_zero_readable] } { + return + } + + # Setup the conditional breakpoint, include a call to + # 'function_that_segfaults', which triggers the segfault. + gdb_breakpoint \ + "${::srcfile}:${::cond_bp_line} if (is_matching_tid (arg, 0) && function_that_segfaults ())" + set bp_1_num [get_integer_valueof "\$bpnum" "*UNKNOWN*" \ + "get number of conditional breakpoint"] + + gdb_test "continue" \ + [multi_line \ + "Continuing\\." \ + ".*" \ + "Thread ${::decimal} \"infcall-from-bp\" received signal SIGSEGV, Segmentation fault\\." \ + "${::hex} in function_that_segfaults \\(\\) at \[^\r\n\]+:${::segv_line}" \ + "${::decimal}\\s+\[^\r\n\]+Segfault happens here\[^\r\n\]+" \ + "Error in testing condition for breakpoint ${bp_1_num}:" \ + "The program being debugged was signaled while in a function called from GDB\\." \ + "GDB remains in the frame where the signal was received\\." \ + "To change this behavior use \"set unwindonsignal on\"\\." \ + "Evaluation of the expression containing the function" \ + "\\(function_that_segfaults\\) will be abandoned\\." \ + "When the function is done executing, GDB will silently stop\\."] +} + +# Create a conditional breakpoint which includes a call to a function that +# itself has a breakpoint set within it. Run GDB and check what happens +# when GDB hits the nested breakpoint. +proc_with_prefix run_bp_cond_hits_breakpoint { target_async target_non_stop } { + if { [start_gdb_and_runto_main $target_async \ + $target_non_stop] == -1 } { + return + } + + # Setup the conditional breakpoint, include a call to + # 'function_with_breakpoint' in which we will shortly place a + # breakpoint. + gdb_breakpoint \ + "${::srcfile}:${::cond_bp_line} if (is_matching_tid (arg, 0) && function_with_breakpoint ())" + set bp_1_num [get_integer_valueof "\$bpnum" "*UNKNOWN*" \ + "get number of conditional breakpoint"] + + gdb_breakpoint "${::srcfile}:${::nested_bp_line}" + set bp_2_num [get_integer_valueof "\$bpnum" "*UNKNOWN*" \ + "get number of nested breakpoint"] + + gdb_test "continue" \ + [multi_line \ + "Continuing\\." \ + ".*" \ + "Thread ${::decimal} \"infcall-from-bp\" hit Breakpoint ${bp_2_num}, function_with_breakpoint \\(\\) at \[^\r\n\]+:${::nested_bp_line}" \ + "${::decimal}\\s+\[^\r\n\]+Nested breakpoint\[^\r\n\]+" \ + "Error in testing condition for breakpoint ${bp_1_num}:" \ + "The program being debugged stopped while in a function called from GDB\\." \ + "Evaluation of the expression containing the function" \ + "\\(function_with_breakpoint\\) will be abandoned\\." \ + "When the function is done executing, GDB will silently stop\\."] +} + +foreach_with_prefix target_async { "on" "off" } { + foreach_with_prefix target_non_stop { "on" "off" } { + run_condition_test "exactly one thread is hit" \ + 1 "&& is_matching_tid (arg, 1)" \ + $target_async $target_non_stop + run_condition_test "exactly two threads are hit" \ + 2 "&& (is_matching_tid (arg, 0) || is_matching_tid (arg, 2))" \ + $target_async $target_non_stop + run_condition_test "all three threads are hit" \ + 3 "|| return_true ()" \ + $target_async $target_non_stop + run_condition_test "no thread is hit" \ + 0 "&& return_false ()" \ + $target_async $target_non_stop + + run_kill_and_restart_test $target_async $target_non_stop + run_bp_cond_segfaults $target_async $target_non_stop + run_bp_cond_hits_breakpoint $target_async $target_non_stop + } +} diff --git a/gdb/testsuite/gdb.threads/infcall-from-bp-cond-single.c b/gdb/testsuite/gdb.threads/infcall-from-bp-cond-single.c new file mode 100644 index 00000000000..c87f1f2bfc6 --- /dev/null +++ b/gdb/testsuite/gdb.threads/infcall-from-bp-cond-single.c @@ -0,0 +1,139 @@ +/* Copyright 2022 Free Software Foundation, Inc. + + This file is part of GDB. + + 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 +#include +#include +#include + +#define NUM_THREADS 5 + +/* Semaphores, used to track when threads have started, and to control + when the threads finish. */ +sem_t startup_semaphore; +sem_t finish_semaphore; + +/* Mutex to control when the first worker thread hit a breakpoint + location. */ +pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; + +/* Global variable to poke, just so threads have something to do. */ +volatile int global_var = 0; + +int +return_true () +{ + return 1; +} + +int +return_false () +{ + return 0; +} + +void * +worker_func (void *arg) +{ + int tid = *((int *) arg); + + switch (tid) + { + case 0: + /* Wait for MUTEX to become available, then pass through the + conditional breakpoint location. */ + if (pthread_mutex_lock (&mutex) != 0) + abort (); + global_var = 99; /* Conditional breakpoint here. */ + if (pthread_mutex_unlock (&mutex) != 0) + abort (); + break; + + default: + /* Notify the main thread that the thread has started, then wait for + the main thread to tell us to finish. */ + sem_post (&startup_semaphore); + if (sem_wait (&finish_semaphore) != 0) + abort (); + break; + } +} + +void +stop_marker () +{ + global_var = 99; /* Stop marker. */ +} + +int +main () +{ + pthread_t threads[NUM_THREADS]; + int args[NUM_THREADS]; + void *retval; + + /* An alarm, just in case the thread deadlocks. */ + alarm (300); + + /* Semaphore initialization. */ + if (sem_init (&startup_semaphore, 0, 0) != 0) + abort (); + if (sem_init (&finish_semaphore, 0, 0) != 0) + abort (); + + /* Lock MUTEX, this prevents the first worker thread from rushing ahead. */ + if (pthread_mutex_lock (&mutex) != 0) + abort (); + + /* Worker thread creation. */ + for (int i = 0; i < NUM_THREADS; i++) + { + args[i] = i; + pthread_create (&threads[i], NULL, worker_func, &args[i]); + } + + /* Wait for every thread (other than the first) to tell us it has started + up. */ + for (int i = 1; i < NUM_THREADS; i++) + { + if (sem_wait (&startup_semaphore) != 0) + abort (); + } + + /* Unlock the first thread so it can proceed. */ + if (pthread_mutex_unlock (&mutex) != 0) + abort (); + + /* Wait for the first thread only. */ + pthread_join (threads[0], &retval); + + /* Now post FINISH_SEMAPHORE to allow all the other threads to finish. */ + for (int i = 1; i < NUM_THREADS; i++) + sem_post (&finish_semaphore); + + /* Now wait for the remaining threads to complete. */ + for (int i = 1; i < NUM_THREADS; i++) + pthread_join (threads[i], &retval); + + /* Semaphore cleanup. */ + sem_destroy (&finish_semaphore); + sem_destroy (&startup_semaphore); + + stop_marker (); + + return 0; +} diff --git a/gdb/testsuite/gdb.threads/infcall-from-bp-cond-single.exp b/gdb/testsuite/gdb.threads/infcall-from-bp-cond-single.exp new file mode 100644 index 00000000000..aa1e94190cd --- /dev/null +++ b/gdb/testsuite/gdb.threads/infcall-from-bp-cond-single.exp @@ -0,0 +1,119 @@ +# 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 . + +# This test reprocuces bug gdb/28942, performing an inferior function +# call from a breakpoint condition in a multi-threaded inferior. +# +# The important part of this test is that, when the conditional +# breakpoint is hit, and the condition (which includes an inferior +# function call) is evaluated, the other threads are running. + +standard_testfile + +if { [build_executable "failed to prepare" ${binfile} "${srcfile}" \ + {debug pthreads}] == -1 } { + return +} + +set cond_bp_line [gdb_get_line_number "Conditional breakpoint here"] +set final_bp_line [gdb_get_line_number "Stop marker"] + +# Start GDB based on TARGET_ASYNC and TARGET_NON_STOP, and then runto main. +proc start_gdb_and_runto_main { target_async target_non_stop } { + save_vars { ::GDBFLAGS } { + append ::GDBFLAGS \ + " -ex \"maint set target-non-stop $target_non_stop\"" + append ::GDBFLAGS \ + " -ex \"maintenance set target-async ${target_async}\"" + + clean_restart ${::binfile} + } + + if {![runto_main]} { + fail "run to main" + return -1 + } + + return 0 +} + +# Run a test of GDB's conditional breakpoints, where the conditions include +# inferior function calls. +# +# CONDITION is combined (with &&) to some additional logic, and used as the +# breakpoint condition. +# +# N_EXPECTED_HITS is the number of threads that we expect to stop due to +# CONDITON. +# +# MESSAGE is used as a test name prefix. +proc run_condition_test { stop_at_cond \ + target_async target_non_stop } { + if { [start_gdb_and_runto_main $target_async \ + $target_non_stop] == -1 } { + return + } + + # Setup the conditional breakpoint. + if { $stop_at_cond } { + set cond_func "return_true" + } else { + set cond_func "return_false" + } + gdb_breakpoint \ + "${::srcfile}:${::cond_bp_line} if (${cond_func} ())" + set cond_bp_num [get_integer_valueof "\$bpnum" "*UNKNOWN*" \ + "get number for conditional breakpoint"] + + # And a breakpoint that we hit when the test is over, this one is + # not conditional. + gdb_breakpoint "${::srcfile}:${::final_bp_line}" + set final_bp_num [get_integer_valueof "\$bpnum" "*UNKNOWN*" \ + "get number for final breakpoint"] + + if { $stop_at_cond } { + # Continue. The first breakpoint we hit should be the conditional + # breakpoint. The other thread will have hit its breakpoint, but + # that will have been deferred until the conditional breakpoint is + # reported. + gdb_test "continue" \ + [multi_line \ + "Continuing\\." \ + ".*" \ + "" \ + "Thread ${::decimal} \"\[^\"\r\n\]+\" hit Breakpoint ${cond_bp_num}, worker_func \[^\r\n\]+:${::cond_bp_line}" \ + "${::decimal}\\s+\[^\r\n\]+Conditional breakpoint here\[^\r\n\]+"] \ + "hit the conditional breakpoint" + } + + # Run to the stop marker. + gdb_test "continue" \ + [multi_line \ + "Continuing\\." \ + ".*" \ + "" \ + "Thread ${::decimal} \"\[^\"\r\n\]+\" hit Breakpoint ${final_bp_num}, stop_marker \[^\r\n\]+:${::final_bp_line}" \ + "${::decimal}\\s+\[^\r\n\]+Stop marker\[^\r\n\]+"] \ + "hit the final breakpoint" +} + +foreach_with_prefix target_async { "on" "off" } { + foreach_with_prefix target_non_stop { "on" "off" } { + foreach_with_prefix stop_at_cond { true false } { + run_condition_test $stop_at_cond \ + $target_async $target_non_stop + } + } +} From patchwork Wed Jan 18 16:18:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 63352 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7F37438493EA for ; Wed, 18 Jan 2023 16:19:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7F37438493EA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1674058795; bh=Y3/JENam5glooCo5X0tr6oTBaEOJzoIz/bnLNRDbn4o=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=RM6+Eg4NpoB+2WIqTjHNhtazpHJuDACmt+BFJZWY7fxOk29M30GwPs7PFkCNb+oV6 IVt5u4dqSjvc+SFcAd+w616ckiXbHos1Lrq4ZUCH6BJudGW4gBerdbjBe+0ItZpx5q x/50s+kNtrRn6D9BccuySGR2UmPNKrXkLI5pQOFM= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 773C13857438 for ; Wed, 18 Jan 2023 16:18:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 773C13857438 Received: from mail-yb1-f200.google.com (mail-yb1-f200.google.com [209.85.219.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-552-BQdhQdYnNqaQ0EwUFjwj3A-1; Wed, 18 Jan 2023 11:18:38 -0500 X-MC-Unique: BQdhQdYnNqaQ0EwUFjwj3A-1 Received: by mail-yb1-f200.google.com with SMTP id z17-20020a256651000000b007907852ca4dso37937733ybm.16 for ; Wed, 18 Jan 2023 08:18:38 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Y3/JENam5glooCo5X0tr6oTBaEOJzoIz/bnLNRDbn4o=; b=xjoT6k0uF59ckncSErTFipseCGTfXztgsmIHKNjtWdwQWQaSGYNxTp1VkKJDFwlSMo SE1v+8aBBMT+d3vxyLx0kMnpaUKPt7GW0JMveSSzyIYu7+GC1BZvhsPPs5sv5lbG6Cq7 TFNun/WI8FLNGZzPIct8teEN4nzKAlB05pLA9/RQXbisY9j5zyBvMS4OY5VqwPrkeWb7 AbtPmw1nFXju9UZX4ffNO7lQYf/EOPbQP/98/CHAu5WeUtXt/E2njMyMa2T33cciPkXx ESpPYIsNKEwORfEIhMjVQR9J4NxOwo6h7qfPsoH1aj1JSv52vVC2WqpU0kCWRXxVZMGI ICDA== X-Gm-Message-State: AFqh2kpcqu/LP8QkWSZ5EuFVpqozwDK1HsQpW6CrotC6n1fqyAGJxd9y /aYAjdY3EkSSVl+Iy76ZNULlsqdHf+/hGYACAopmpiTqGht/zK4r/FcNRmyt0ApFBCG9p3Tw6nD Pr8PjeOHJAur+BAZg/fjpVg8vHKELfaFKZxxGQvgqkxUk3csHcmVgiBcMdDQ2CAAaIvOH8vd/RQ == X-Received: by 2002:a25:e64c:0:b0:7c0:322:8220 with SMTP id d73-20020a25e64c000000b007c003228220mr6173533ybh.27.1674058716645; Wed, 18 Jan 2023 08:18:36 -0800 (PST) X-Google-Smtp-Source: AMrXdXsKFcsYK+oODLzZbdJ/V3RUDNJid2JcY1YsIDNdvk0T+TINhUndUvQvYTnPuhWdXH0bltR2sQ== X-Received: by 2002:a25:e64c:0:b0:7c0:322:8220 with SMTP id d73-20020a25e64c000000b007c003228220mr6173452ybh.27.1674058715481; Wed, 18 Jan 2023 08:18:35 -0800 (PST) Received: from localhost (95.72.115.87.dyn.plus.net. [87.115.72.95]) by smtp.gmail.com with ESMTPSA id e124-20020a37b582000000b0070495934152sm22146390qkf.48.2023.01.18.08.18.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jan 2023 08:18:35 -0800 (PST) To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCHv2 10/13] gdb: add timeouts for inferior function calls Date: Wed, 18 Jan 2023 16:18:06 +0000 Message-Id: <9008dc2605a09477a5978381c107a33f8b6760a9.1674058360.git.aburgess@redhat.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Andrew Burgess via Gdb-patches From: Andrew Burgess Reply-To: Andrew Burgess Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" In the previous commits I have been working on improving inferior function call support. One thing that worries me about using inferior function calls from a conditional breakpoint is: what happens if the inferior function call fails? If the failure is obvious, e.g. the thread performing the call crashes, or hits a breakpoint, then this case is already well handled, and the error is reported to the user. But what if the thread performing the inferior call just deadlocks? If the user made the call from a 'print' or 'call' command, then the user might have some expectation of when the function call should complete, and, when this time limit is exceeded, the user will (hopefully) interrupt GDB and regain control of the debug session. But, when the inferior function call is from a breakpoint condition it is much harder to understand that GDB is deadlocked within an inferior call. Maybe the breakpoint hasn't been hit yet? Or maybe the condition was always false? Or maybe GDB is deadlocked in an inferior call? The only way to know for sure is to periodically interrupt GDB, check on all the threads, and then continue. Additionally, the focus of the previous commit was inferior function calls, from a conditional breakpoint, in a multi-threaded inferior. This opens up a whole new set of potential failure conditions. For example, what if the function called relies on interaction with some other thread, and the other thread crashes? Or hits a breakpoint? Given how inferior function calls work - in a synchronous manor, a stop event in some other thread is going to be ignored when the inferior function call is being done as part of a breakpoint condition, and this means that GDB could get stuck waiting for the original condition thread, which will now never complete. In this commit I propose a solution to this problem. A timeout. For targets that support async-mode we can install an event-loop timer before starting the inferior function call. When the timer expires we will stop the thread performing the inferior function call. With this mechanism in place a user can be sure that any inferior call they make will either complete, or timeout eventually. Adding a timer like this is obviously a change in behaviour for the more common 'call' and 'print' uses of inferior function calls, so, in this patch, I propose having two different timers. One I call the 'direct-call-timeout', which is used for 'call' and 'print' commands. This timeout is by default set to unlimited, which, not surprisingly, means there is no timeout in place. A second timer, which I've called 'indirect-call-timeout', is used for inferior function calls from breakpoint conditions. This timeout has a default value of 300 seconds. This is still a pretty substantial time to be waiting for a single inferior call to complete, but I didn't want to be too aggressive with the value I selected. A user can, of course, still use Ctrl-c to interrupt an inferior function call, but this limit will ensure that GDB will stop at some point. The new commands added by this commit are: set direct-call-timeout SECONDS show direct-call-timeout set indirect-call-timeout SECONDS show indirect-call-timeout These new timeouts do depend on async-mode, so, if async-mode is disabled (maint set target-async off), or not supported (e.g. target sim), then the timeout is treated as unlimited (that is, no timeout is set). For targets that "fake" non-async mode, e.g. Linux native, where non-async mode is really just async mode, but then we park the target in a sissuspend, we could easily fix things so that the timeouts still work, however, for targets that really are not async aware, like the simulator, fixing things so that timeouts work correctly would be a much bigger task - that effort would be better spent just making the target async-aware. And so, I'm happy for now that this feature will only work on async targets. The two new show commands will display slightly different text if the current target is a non-async target, which should allow users to understand what's going on. There's a somewhat random test adjustment needed in gdb.base/help.exp, the test uses a regexp with the apropos command, and expects to find a single result. Turns out the new settings I added also matched the regexp, which broke the test. I've updated the regexp a little to exclude my new settings. --- gdb/NEWS | 18 ++ gdb/doc/gdb.texinfo | 66 ++++++ gdb/infcall.c | 210 +++++++++++++++++- gdb/testsuite/gdb.base/help.exp | 2 +- gdb/testsuite/gdb.base/infcall-timeout.c | 36 +++ gdb/testsuite/gdb.base/infcall-timeout.exp | 82 +++++++ .../infcall-from-bp-cond-timeout.c | 169 ++++++++++++++ .../infcall-from-bp-cond-timeout.exp | 156 +++++++++++++ 8 files changed, 734 insertions(+), 5 deletions(-) create mode 100644 gdb/testsuite/gdb.base/infcall-timeout.c create mode 100644 gdb/testsuite/gdb.base/infcall-timeout.exp create mode 100644 gdb/testsuite/gdb.threads/infcall-from-bp-cond-timeout.c create mode 100644 gdb/testsuite/gdb.threads/infcall-from-bp-cond-timeout.exp diff --git a/gdb/NEWS b/gdb/NEWS index c0aac212e30..2689569a8f3 100644 --- a/gdb/NEWS +++ b/gdb/NEWS @@ -17,6 +17,24 @@ maintenance print record-instruction [ N ] prints how GDB would undo the N-th previous instruction, and if N is positive, it prints how GDB will redo the N-th following instruction. +set direct-call-timeout SECONDS +show direct-call-timeout +set indirect-call-timeout SECONDS +show indirect-call-timeout + These new settings can be used to limit how long GDB will wait for + an inferior function call to complete. The direct timeout is used + for inferior function calls from e.g. 'call' and 'print' commands, + while the indirect timeout is used for inferior function calls from + within a conditional breakpoint expression. + + The default for the direct timeout is unlimited, while the default + for the indirect timeout is 30 seconds. + + These timeouts will only have an effect for targets that are + operating in async mode. For non-async targets the timeouts are + ignored, GDB will wait indefinitely for an inferior function to + complete, unless interrupted by the user using Ctrl-C. + * MI changes ** mi now reports 'no-history' as a stop reason when hitting the end of the diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index 6ea173b5d0b..9eb8b1db00e 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -20772,6 +20772,72 @@ @code{step}, etc). In this case, when the inferior finally returns to the dummy-frame, @value{GDBN} will once again halt the inferior. +On targets that support asynchronous execution (@pxref{Background +Execution}) @value{GDBN} can place a timeout on any functions called +from @value{GDBN}. If the timeout expires and the function call is +still ongoing, then @value{GDBN} will interrupt the program. + +For targets that don't support asynchronous execution +(@pxref{Background Execution}) then timeouts for functions called from +@value{GDBN} are not supported, the timeout settings described below +will be treated as @code{unlimited}, meaning @value{GDBN} will wait +indefinitely for function call to complete, unless interrupted by the +user using @kbd{Ctrl-C}. + +@table @code +@item set direct-call-timeout @var{seconds} +@kindex set direct-call-timeout +@cindex timeout for called functions +Set the timeout used when calling functions in the program to +@var{seconds}, which should be an integer greater than zero, or the +special value @code{unlimited}, which indicates no timeout should be +used. The default for this setting is @code{unlimited}. + +This setting is used when the user calls a function directly from the +command prompt, for example with a @code{call} or @code{print} +command. + +This setting only works for targets that support asynchronous +execution (@pxref{Background Execution}), for any other target the +setting is treated as @code{unlimited}. + +@item show direct-call-timeout +@kindex show direct-call-timeout +@cindex timeout for called functions +Show the timeout used when calling functions in the program with a +@code{call} or @code{print} command. +@end table + +It is also possible to call functions within the program from the +condition of a conditional breakpoint (@pxref{Conditions, ,Break +Conditions}). A different setting controls the timeout used for +function calls made from a breakpoint condition. + +@table @code +@item set indirect-call-timeout @var{seconds} +@kindex set indirect-call-timeout +@cindex timeout for called functions +Set the timeout used when calling functions in the program from a +breakpoint or watchpoint condition to @var{seconds}, which should be +an integer greater than zero, or the special value @code{unlimited}, +which indicates no timeout should be used. The default for this +setting is @code{30} seconds. + +This setting only works for targets that support asynchronous +execution (@pxref{Background Execution}), for any other target the +setting is treated as @code{unlimited}. + +If a function called from a breakpoint or watchpoint condition times +out, then @value{GDBN} will stop at the point where the timeout +occurred. The breakpoint condition evaluation will be abandoned. + +@item show indirect-call-timeout +@kindex show indirect-call-timeout +@cindex timeout for called functions +Show the timeout used when calling functions in the program from a +breakpoint or watchpoint condition. +@end table + @subsection Calling functions with no debug info @cindex no debug info functions diff --git a/gdb/infcall.c b/gdb/infcall.c index 8a48909bc2c..9afca4f5bc6 100644 --- a/gdb/infcall.c +++ b/gdb/infcall.c @@ -95,6 +95,53 @@ show_may_call_functions_p (struct ui_file *file, int from_tty, value); } +/* A timeout (in seconds) for direct inferior calls. A direct inferior + call is one the user triggers from the prompt, e.g. with a 'call' or + 'print' command. Compare with the definition of indirect calls below. */ + +static unsigned int direct_call_timeout = UINT_MAX; + +/* Implement 'show direct-call-timeout'. */ + +static void +show_direct_call_timeout (struct ui_file *file, int from_tty, + struct cmd_list_element *c, const char *value) +{ + if (target_has_execution () && !target_can_async_p ()) + gdb_printf (file, _("Current target does not support async mode, timeout " + "for direct inferior calls is \"unlimited\".\n")); + else if (direct_call_timeout == UINT_MAX) + gdb_printf (file, _("Timeout for direct inferior function calls " + "is \"unlimited\".\n")); + else + gdb_printf (file, _("Timeout for direct inferior function calls " + "is \"%s seconds\".\n"), value); +} + +/* A timeout (in seconds) for indirect inferior calls. An indirect inferior + call is one that originates from within GDB, for example, when + evaluating an expression for a conditional breakpoint. Compare with + the definition of direct calls above. */ + +static unsigned int indirect_call_timeout = 30; + +/* Implement 'show indirect-call-timeout'. */ + +static void +show_indirect_call_timeout (struct ui_file *file, int from_tty, + struct cmd_list_element *c, const char *value) +{ + if (target_has_execution () && !target_can_async_p ()) + gdb_printf (file, _("Current target does not support async mode, timeout " + "for indirect inferior calls is \"unlimited\".\n")); + else if (indirect_call_timeout == UINT_MAX) + gdb_printf (file, _("Timeout for indirect inferior function calls " + "is \"unlimited\".\n")); + else + gdb_printf (file, _("Timeout for indirect inferior function calls " + "is \"%s seconds\".\n"), value); +} + /* How you should pass arguments to a function depends on whether it was defined in K&R style or prototype style. If you define a function using the K&R syntax that takes a `float' argument, then @@ -589,6 +636,85 @@ call_thread_fsm::should_notify_stop () return true; } +/* A class to control creation of a timer that will interrupt a thread + during an inferior call. */ +struct infcall_timer_controller +{ + /* Setup an event-loop timer that will interrupt PTID if the inferior + call takes too long. DIRECT_CALL_P is true when this inferior call is + a result of the user using a 'print' or 'call' command, and false when + this inferior call is a result of e.g. a conditional breakpoint + expression, this is used to select which timeout to use. */ + infcall_timer_controller (ptid_t ptid, bool direct_call_p) + : m_ptid (ptid) + { + unsigned int timeout + = direct_call_p ? direct_call_timeout : indirect_call_timeout; + if (timeout < UINT_MAX && target_can_async_p ()) + { + int ms = timeout * 1000; + int id = create_timer (ms, infcall_timer_controller::timed_out, this); + m_timer_id.emplace (id); + infcall_debug_printf ("Setting up infcall timeout timer for " + "ptid %s: %d milliseconds", + m_ptid.to_string ().c_str (), ms); + } + } + + /* Destructor. Ensure that the timer is removed from the event loop. */ + ~infcall_timer_controller () + { + /* If the timer has already triggered, then it will have already been + deleted from the event loop. If the timer has not triggered, then + delete it now. */ + if (m_timer_id.has_value () && !m_triggered) + delete_timer (*m_timer_id); + + /* Just for clarity, discard the timer id now. */ + m_timer_id.reset (); + } + + /* Return true if there was a timer in place, and the timer triggered, + otherwise, return false. */ + bool triggered_p () + { + gdb_assert (!m_triggered || m_timer_id.has_value ()); + return m_triggered; + } + +private: + /* The thread we should interrupt. */ + ptid_t m_ptid; + + /* Set true when the timer is triggered. */ + bool m_triggered = false; + + /* Given a value when a timer is in place. */ + gdb::optional m_timer_id; + + /* Callback for the timer, forwards to ::trigger below. */ + static void + timed_out (gdb_client_data context) + { + infcall_timer_controller *ctrl + = static_cast (context); + ctrl->trigger (); + } + + /* Called when the timer goes off. Stop thread m_ptid. */ + void + trigger () + { + m_triggered = true; + + scoped_disable_commit_resumed disable_commit_resumed ("infcall timeout"); + + infcall_debug_printf ("Stopping thread %s", + m_ptid.to_string ().c_str ()); + target_stop (m_ptid); + } +}; + /* Subroutine of call_function_by_hand to simplify it. Start up the inferior and wait for it to stop. Return the exception if there's an error, or an exception with @@ -599,13 +725,15 @@ call_thread_fsm::should_notify_stop () static struct gdb_exception run_inferior_call (std::unique_ptr sm, - struct thread_info *call_thread, CORE_ADDR real_pc) + struct thread_info *call_thread, CORE_ADDR real_pc, + bool *timed_out_p) { INFCALL_SCOPED_DEBUG_ENTER_EXIT; struct gdb_exception caught_error; ptid_t call_thread_ptid = call_thread->ptid; int was_running = call_thread->state == THREAD_RUNNING; + *timed_out_p = false; infcall_debug_printf ("call function at %s in thread %s, was_running = %d", core_addr_to_string (real_pc), @@ -650,11 +778,23 @@ run_inferior_call (std::unique_ptr sm, infrun_debug_show_threads ("non-exited threads after proceed for inferior-call", all_non_exited_threads ()); + /* Setup a timer (if possible, and if the settings allow) to prevent + the inferior call running forever. */ + bool direct_call_p = !call_thread->control.in_cond_eval; + infcall_timer_controller infcall_timer (inferior_ptid, direct_call_p); + /* Inferior function calls are always synchronous, even if the target supports asynchronous execution. */ wait_sync_command_done (); - infcall_debug_printf ("inferior call completed successfully"); + /* If the timer triggered then the inferior call failed. */ + if (infcall_timer.triggered_p ()) + { + infcall_debug_printf ("inferior call timed out"); + *timed_out_p = true; + } + else + infcall_debug_printf ("inferior call completed successfully"); } catch (gdb_exception &e) { @@ -1311,6 +1451,10 @@ call_function_by_hand_dummy (struct value *function, scoped_restore restore_stopped_by_random_signal = make_scoped_restore (&stopped_by_random_signal, 0); + /* Set to true by the call to run_inferior_call below if the inferior + call is artificially interrupted by GDB due to taking too long. */ + bool timed_out_p = false; + /* - SNIP - SNIP - SNIP - SNIP - SNIP - SNIP - SNIP - SNIP - SNIP - If you're looking to implement asynchronous dummy-frames, then just below is the place to chop this function in two.. */ @@ -1337,7 +1481,8 @@ call_function_by_hand_dummy (struct value *function, struct_addr); { std::unique_ptr sm_up (sm); - e = run_inferior_call (std::move (sm_up), call_thread.get (), real_pc); + e = run_inferior_call (std::move (sm_up), call_thread.get (), real_pc, + &timed_out_p); } if (e.reason < 0) @@ -1489,7 +1634,10 @@ When the function is done executing, GDB will silently stop."), std::string name = get_function_name (funaddr, name_buf, sizeof (name_buf)); - if (stopped_by_random_signal) + /* If the inferior call timed out then it will have been interrupted + by a signal, but we want to report this differently to the user, + which is done later in this function. */ + if (stopped_by_random_signal && !timed_out_p) { /* We stopped inside the FUNCTION because of a random signal. Further execution of the FUNCTION is not @@ -1533,6 +1681,36 @@ GDB remains in the frame where the signal was received.\n\ To change this behavior use \"set unwindonsignal on\".\n\ Evaluation of the expression containing the function\n\ (%s) will be abandoned.\n\ +When the function is done executing, GDB will silently stop."), + name.c_str ()); + } + } + + if (timed_out_p) + { + /* A timeout results in a signal being sent to the inferior. */ + gdb_assert (stopped_by_random_signal); + + /* Indentation is weird here. A later patch is going to move the + following block into an if/else, so I'm leaving the indentation + here to minimise the later patch. + + Also, the error message used below refers to 'set + unwind-on-timeout' which doesn't exist yet. This will be added + in a later commit, I'm leaving this in for now to minimise the + churn caused by the commit that adds unwind-on-timeout. */ + { + /* The user wants to stay in the frame where we stopped + (default). Discard inferior status, we're not at the same + point we started at. */ + discard_infcall_control_state (inf_status.release ()); + + error (_("\ +The program being debugged timed out while in a function called from GDB.\n\ +GDB remains in the frame where the timeout occurred.\n\ +To change this behavior use \"set unwind-on-timeout on\".\n\ +Evaluation of the expression containing the function\n\ +(%s) will be abandoned.\n\ When the function is done executing, GDB will silently stop."), name.c_str ()); } @@ -1646,6 +1824,30 @@ The default is to unwind the frame."), show_unwind_on_terminating_exception_p, &setlist, &showlist); + add_setshow_uinteger_cmd ("direct-call-timeout", no_class, + &direct_call_timeout, _("\ +Set the timeout, for direct calls to inferior function calls."), _("\ +Show the timeout, for direct calls to inferior function calls."), _("\ +If running on a target that supports, and is running in, async mode\n\ +then this timeout is used for any inferior function calls triggered\n\ +directly from the prompt, i.e. from a 'call' or 'print' command. The\n\ +timeout is specified in seconds."), + nullptr, + show_direct_call_timeout, + &setlist, &showlist); + + add_setshow_uinteger_cmd ("indirect-call-timeout", no_class, + &indirect_call_timeout, _("\ +Set the timeout, for indirect calls to inferior function calls."), _("\ +Show the timeout, for indirect calls to inferior function calls."), _("\ +If running on a target that supports, and is running in, async mode\n\ +then this timeout is used for any inferior function calls triggered\n\ +indirectly, i.e. being made as part of a breakpoint, or watchpoint,\n\ +condition expression. The timeout is specified in seconds."), + nullptr, + show_indirect_call_timeout, + &setlist, &showlist); + add_setshow_boolean_cmd ("infcall", class_maintenance, &debug_infcall, _("Set inferior call debugging."), diff --git a/gdb/testsuite/gdb.base/help.exp b/gdb/testsuite/gdb.base/help.exp index 87919a819ab..504bf90cc15 100644 --- a/gdb/testsuite/gdb.base/help.exp +++ b/gdb/testsuite/gdb.base/help.exp @@ -121,7 +121,7 @@ gdb_test "help info bogus-gdb-command" "Undefined info command: \"bogus-gdb-comm gdb_test "help gotcha" "Undefined command: \"gotcha\"\. Try \"help\"\." # Test apropos regex. -gdb_test "apropos \\\(print\[\^\[ bsiedf\\\".-\]\\\)" "handle -- Specify how to handle signals\." +gdb_test "apropos \\\(print\[\^\[ bsiedf\\\"'.-\]\\\)" "handle -- Specify how to handle signals\." # Test apropos >1 word string. gdb_test "apropos handle signal" "handle -- Specify how to handle signals\." # Test apropos apropos. diff --git a/gdb/testsuite/gdb.base/infcall-timeout.c b/gdb/testsuite/gdb.base/infcall-timeout.c new file mode 100644 index 00000000000..895e8a36d59 --- /dev/null +++ b/gdb/testsuite/gdb.base/infcall-timeout.c @@ -0,0 +1,36 @@ +/* Copyright 2022 Free Software Foundation, Inc. + + This file is part of GDB. + + 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 + +/* This function is called from GDB. */ +int +function_that_never_returns () +{ + while (1) + sleep (1); + + return 0; +} + +int +main () +{ + alarm (300); + + return 0; +} diff --git a/gdb/testsuite/gdb.base/infcall-timeout.exp b/gdb/testsuite/gdb.base/infcall-timeout.exp new file mode 100644 index 00000000000..a5b0111ed04 --- /dev/null +++ b/gdb/testsuite/gdb.base/infcall-timeout.exp @@ -0,0 +1,82 @@ +# 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 . + +# Test GDB's direct-call-timeout setting, that is, ensure that if an +# inferior function call, invoked from e.g. a 'print' command, takes +# too long, then GDB can interrupt it, and return control to the user. + +standard_testfile + +if { [build_executable "failed to prepare" ${binfile} "${srcfile}" \ + {debug}] == -1 } { + return +} + +# Start GDB according to TARGET_ASYNC and TARGET_NON_STOP, then adjust +# the direct-call-timeout, and make an inferior function call that +# will never return. GDB should eventually timeout and stop the +# inferior. +proc_with_prefix run_test { target_async target_non_stop } { + save_vars { ::GDBFLAGS } { + append ::GDBFLAGS \ + " -ex \"maint set target-non-stop $target_non_stop\"" + append ::GDBFLAGS \ + " -ex \"maintenance set target-async ${target_async}\"" + + clean_restart ${::binfile} + } + + if {![runto_main]} { + fail "run to main" + return + } + + gdb_test_no_output "set direct-call-timeout 5" + + # When non-stop mode is off we get slightly different output from GDB. + if { [gdb_is_remote_or_extended_remote_target] && $target_non_stop == "off" } { + set stopped_line_pattern "Program received signal SIGINT, Interrupt\\." + } else { + set stopped_line_pattern "Program stopped\\." + } + + gdb_test "print function_that_never_returns ()" \ + [multi_line \ + $stopped_line_pattern \ + ".*" \ + "The program being debugged timed out while in a function called from GDB\\." \ + "GDB remains in the frame where the timeout occurred\\." \ + "To change this behavior use \"set unwind-on-timeout on\"\\." \ + "Evaluation of the expression containing the function" \ + "\\(function_that_never_returns\\) will be abandoned\\." \ + "When the function is done executing, GDB will silently stop\\."] + + gdb_test "bt" ".* function_that_never_returns .*.*" +} + +foreach_with_prefix target_async { "on" "off" } { + + if { $target_async == "off" } { + # GDB can't timeout while waiting for a thread if the target + # runs with async-mode turned off; once the target is running + # GDB is effectively blocked until the target stops for some + # reason. + continue + } + + foreach_with_prefix target_non_stop { "on" "off" } { + run_test $target_async $target_non_stop + } +} diff --git a/gdb/testsuite/gdb.threads/infcall-from-bp-cond-timeout.c b/gdb/testsuite/gdb.threads/infcall-from-bp-cond-timeout.c new file mode 100644 index 00000000000..3bd91d7377d --- /dev/null +++ b/gdb/testsuite/gdb.threads/infcall-from-bp-cond-timeout.c @@ -0,0 +1,169 @@ +/* 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 +#include +#include +#include +#include +#include + +#define NUM_THREADS 5 + +/* Semaphores, used to track when threads have started, and to control + when the threads finish. */ +sem_t startup_semaphore; +sem_t finish_semaphore; +sem_t thread_1_semaphore; +sem_t thread_2_semaphore; + +/* Mutex to control when the first worker thread hit a breakpoint + location. */ +pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; + +/* Global variable to poke, just so threads have something to do. */ +volatile int global_var = 0; + +int +condition_func () +{ + /* Let thread 2 run. */ + if (sem_post (&thread_2_semaphore) != 0) + abort (); + + /* Wait for thread 2 to complete its actions. */ + if (sem_wait (&thread_1_semaphore) != 0) + abort (); + + return 1; +} + +void +do_segfault () +{ + volatile int *p = 0; + *p = 0; /* Segfault here. */ +} + +void * +worker_func (void *arg) +{ + int tid = *((int *) arg); + + /* Let the main thread know that this worker has started. */ + if (sem_post (&startup_semaphore) != 0) + abort (); + + switch (tid) + { + case 0: + /* Wait for MUTEX to become available, then pass through the + conditional breakpoint location. */ + if (pthread_mutex_lock (&mutex) != 0) + abort (); + global_var = 99; /* Conditional breakpoint here. */ + if (pthread_mutex_unlock (&mutex) != 0) + abort (); + break; + + case 1: + if (sem_wait (&thread_2_semaphore) != 0) + abort (); + do_segfault (); + if (sem_post (&thread_1_semaphore) != 0) + abort (); + + /* Fall through. */ + default: + /* Wait until we are allowed to finish. */ + if (sem_wait (&finish_semaphore) != 0) + abort (); + break; + } +} + +void +stop_marker () +{ + global_var = 99; /* Stop marker. */ +} + +/* The main program entry point. */ + +int +main () +{ + pthread_t threads[NUM_THREADS]; + int args[NUM_THREADS]; + void *retval; + + /* An alarm, just in case the thread deadlocks. */ + alarm (300); + + /* Semaphore initialization. */ + if (sem_init (&startup_semaphore, 0, 0) != 0) + abort (); + if (sem_init (&finish_semaphore, 0, 0) != 0) + abort (); + if (sem_init (&thread_1_semaphore, 0, 0) != 0) + abort (); + if (sem_init (&thread_2_semaphore, 0, 0) != 0) + abort (); + + /* Lock MUTEX, this prevents the first worker thread from rushing ahead. */ + if (pthread_mutex_lock (&mutex) != 0) + abort (); + + /* Worker thread creation. */ + for (int i = 0; i < NUM_THREADS; i++) + { + args[i] = i; + pthread_create (&threads[i], NULL, worker_func, &args[i]); + } + + /* Wait for every thread to start. */ + for (int i = 0; i < NUM_THREADS; i++) + { + if (sem_wait (&startup_semaphore) != 0) + abort (); + } + + /* Unlock the first thread so it can proceed. */ + if (pthread_mutex_unlock (&mutex) != 0) + abort (); + + /* Wait for the first thread only. */ + pthread_join (threads[0], &retval); + + /* Now post FINISH_SEMAPHORE to allow all the other threads to finish. */ + for (int i = 1; i < NUM_THREADS; i++) + sem_post (&finish_semaphore); + + /* Now wait for the remaining threads to complete. */ + for (int i = 1; i < NUM_THREADS; i++) + pthread_join (threads[i], &retval); + + /* Semaphore cleanup. */ + sem_destroy (&finish_semaphore); + sem_destroy (&startup_semaphore); + sem_destroy (&thread_1_semaphore); + sem_destroy (&thread_2_semaphore); + + stop_marker (); + + return 0; +} diff --git a/gdb/testsuite/gdb.threads/infcall-from-bp-cond-timeout.exp b/gdb/testsuite/gdb.threads/infcall-from-bp-cond-timeout.exp new file mode 100644 index 00000000000..3341ff33f19 --- /dev/null +++ b/gdb/testsuite/gdb.threads/infcall-from-bp-cond-timeout.exp @@ -0,0 +1,156 @@ +# Copyright 2020 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 inferior calls executed from a breakpoint condition in +# a multi-threaded program. +# +# This test has the inferior function call timeout, and checks how GDB +# handles this situation. + +standard_testfile + +if { [build_executable "failed to prepare" ${binfile} "${srcfile}" \ + {debug pthreads}] } { + return +} + +set cond_bp_line [gdb_get_line_number "Conditional breakpoint here"] +set final_bp_line [gdb_get_line_number "Stop marker"] +set segfault_line [gdb_get_line_number "Segfault here"] + +# Setup GDB based on TARGET_ASYNC and TARGET_NON_STOP. Setup some +# breakpoints in the inferior, one of which has an inferior call +# within its condition. +# +# Continue GDB, the breakpoint with inferior call will be hit, but the +# inferior call will never return. We expect GDB to timeout. +# +# The reason that the inferior call never completes is that a second +# thread, on which the inferior call relies, either hits a breakpoint +# (when OTHER_THREAD_BP is true), or crashes (when OTHER_THREAD_BP is +# false). +proc run_test { target_async target_non_stop other_thread_bp } { + save_vars { ::GDBFLAGS } { + append ::GDBFLAGS " -ex \"maint set target-non-stop $target_non_stop\"" + append ::GDBFLAGS " -ex \"maintenance set target-async ${target_async}\"" + + clean_restart ${::binfile} + } + + if {![runto_main]} { + fail "run to main" + return + } + + # The default timeout for indirect inferior calls (e.g. inferior + # calls for conditional breakpoint expressions) is pretty high. + # We don't want the test to take too long, so reduce this. + # + # However, the test relies on a second thread hitting some event + # (either a breakpoint or signal) before this timeout expires. + # + # There is a chance that on a really slow system this might not + # happen, in which case the test might fail. + # + # However, we still allocate 5 seconds, which feels like it should + # be enough time in most cases, but maybe we need to do something + # smarter here? Possibly we could have some initial run where the + # inferior doesn't timeout, but does do the same interaction + # between threads, we could time that, and use that as the basis + # for this timeout. For now though, we just hope 5 seconds is + # enough. + gdb_test_no_output "set indirect-call-timeout 5" + + gdb_breakpoint \ + "${::srcfile}:${::cond_bp_line} if (condition_func ())" + set bp_num [get_integer_valueof "\$bpnum" "*UNKNOWN*" \ + "get number for conditional breakpoint"] + + gdb_breakpoint "${::srcfile}:${::final_bp_line}" + set final_bp_num [get_integer_valueof "\$bpnum" "*UNKNOWN*" \ + "get number for final breakpoint"] + + # The thread performing an inferior call relies on a second + # thread. The second thread will segfault unless it hits a + # breakpoint first. In either case the initial thread will not + # complete its inferior call. + if { $other_thread_bp } { + gdb_breakpoint "${::srcfile}:${::segfault_line}" + set segfault_bp_num [get_integer_valueof "\$bpnum" "*UNKNOWN*" \ + "get number for segfault breakpoint"] + } + + # When non-stop mode is off we get slightly different output from GDB. + if { [gdb_is_remote_or_extended_remote_target] && $target_non_stop == "off" } { + set stopped_line_pattern "Thread ${::decimal} \"\[^\r\n\"\]+\" received signal SIGINT, Interrupt\\." + } else { + set stopped_line_pattern "Thread ${::decimal} \"\[^\r\n\"\]+\" stopped\\." + } + + gdb_test "continue" \ + [multi_line \ + $stopped_line_pattern \ + ".*" \ + "Error in testing condition for breakpoint ${bp_num}:" \ + "The program being debugged timed out while in a function called from GDB\\." \ + "GDB remains in the frame where the timeout occurred\\." \ + "To change this behavior use \"set unwind-on-timeout on\"\\." \ + "Evaluation of the expression containing the function" \ + "\\(condition_func\\) will be abandoned\\." \ + "When the function is done executing, GDB will silently stop\\."] \ + "expected timeout waiting for inferior call to complete" + + # Remember that other thread that either crashed (with a segfault) + # or hit a breakpoint? Now that the inferior call has timed out, + # if we try to resume then we should see the pending event from + # that other thread. + if { $other_thread_bp } { + gdb_test "continue" \ + [multi_line \ + "Continuing\\." \ + ".*" \ + "" \ + "Thread ${::decimal} \"\[^\"\r\n\]+\" hit Breakpoint ${segfault_bp_num}, do_segfault \[^\r\n\]+:${::segfault_line}" \ + "${::decimal}\\s+\[^\r\n\]+Segfault here\[^\r\n\]+"] \ + "hit the segfault breakpoint" + } else { + gdb_test "continue" \ + [multi_line \ + "Continuing\\." \ + ".*" \ + "Thread ${::decimal} \"infcall-from-bp\" received signal SIGSEGV, Segmentation fault\\." \ + "\\\[Switching to Thread \[^\r\n\]+\\\]" \ + "${::hex} in do_segfault \\(\\) at \[^\r\n\]+:${::segfault_line}" \ + "${::decimal}\\s+\[^\r\n\]+Segfault here\[^\r\n\]+"] \ + "hit the segfault" + } +} + +foreach_with_prefix target_async {"on" "off" } { + + if { $target_async == "off" } { + # GDB can't timeout while waiting for a thread if the target + # runs with async-mode turned off; once the target is running + # GDB is effectively blocked until the target stops for some + # reason. + continue + } + + foreach_with_prefix target_non_stop {"off" "on"} { + foreach_with_prefix other_thread_bp { true false } { + run_test $target_async $target_non_stop $other_thread_bp + } + } +} From patchwork Wed Jan 18 16:18:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 63357 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0CE493858C62 for ; Wed, 18 Jan 2023 16:21:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0CE493858C62 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1674058877; bh=mp6tKE2xuHtRpqoeLvrY1EQy0IftAEggYKRvHDyxbkg=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=QsKi7TLtalH7lY06QxthcvpldXPXoDHjl2Tj6wKd34Y3VLCCXPbBoraHv9raN56aB MOTuWrhwN+5ie6kTReuhLW9JhnPfz9UYSwAaeRsEZqZNXjtryp8UXYtO/XDQsIYZ6c O9qFCdBu7fH5O/kmfcjvNswn6Y+IQ8NWOTKO3xMU= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 2E6893858428 for ; Wed, 18 Jan 2023 16:18:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2E6893858428 Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-575-SgPm2-sFPFSRvZ0Rm96POg-1; Wed, 18 Jan 2023 11:18:38 -0500 X-MC-Unique: SgPm2-sFPFSRvZ0Rm96POg-1 Received: by mail-qv1-f70.google.com with SMTP id nk14-20020a056214350e00b0053472f03fedso7797322qvb.17 for ; Wed, 18 Jan 2023 08:18:38 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mp6tKE2xuHtRpqoeLvrY1EQy0IftAEggYKRvHDyxbkg=; b=lpZTRlbbWmuuAgaDN8YXS6aUrEy9YVix4Y/vNpiMB/Dma/SPeiUHrVCWuTvhbiBG4u jM/LY8opY28Uctn7QES5ZCRD/XyYxJaCRZmqDUnIWtr6g2fiTfHB7JK7b5uoLLTNL4ub lDrGlQfE51OYWCKzhLeFZS2/3oviG2Fe2RoDqagpt0wh4aKjDl+c7P6J4xMZIrLLXWqB nY052sQGlCHAIxsmDkECxrfKWFj/WaGeLjmJeYxA2WE741EVKB+IS0Zi+/7Fe5tDqVeS TEqurBIoONAufdV3deHGKNxgxpnvOy04ozXQNofYAb9370tzBmM9u+KzUhSS6PdWoXYq 8yjA== X-Gm-Message-State: AFqh2krb/U1j08DVM8pwRpdeRzUQew2D+r+cmHUrpcd7FwHQRXY8DyLO dNRhFjkfK2d+PN7vnDEb5gN/U+x2A9WB1NpSgzCSee2ZQcNwNcFUAZiy4F1IuFEIKR5cQWVcw8M eCkcckuDueXvKbmvp5+GqHLFwVeh8Gv9Uev41v3OsmMY/IUuzmJWAwikx9PpsN0fgVJlT80aZwA == X-Received: by 2002:a05:6214:37c9:b0:534:e068:322e with SMTP id nj9-20020a05621437c900b00534e068322emr11824956qvb.51.1674058717952; Wed, 18 Jan 2023 08:18:37 -0800 (PST) X-Google-Smtp-Source: AMrXdXv9jOcdjIG+v4iUdM1A1QAiI72EzVDuJOcQGfM+l8VEINODFivOGpOf1hv/Z8Ej/dCgXqUdIQ== X-Received: by 2002:a05:6214:37c9:b0:534:e068:322e with SMTP id nj9-20020a05621437c900b00534e068322emr11824917qvb.51.1674058717588; Wed, 18 Jan 2023 08:18:37 -0800 (PST) Received: from localhost (95.72.115.87.dyn.plus.net. [87.115.72.95]) by smtp.gmail.com with ESMTPSA id u6-20020a05620a0c4600b007054feab4aesm22432763qki.27.2023.01.18.08.18.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jan 2023 08:18:37 -0800 (PST) To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCHv2 11/13] gdb/remote: avoid SIGINT after calling remote_target::stop Date: Wed, 18 Jan 2023 16:18:07 +0000 Message-Id: <167045998eadfcb2015eb0b786e9aab56633b0ab.1674058360.git.aburgess@redhat.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Andrew Burgess via Gdb-patches From: Andrew Burgess Reply-To: Andrew Burgess Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" Currently, if the remote target is not running in non-stop mode, then, when GDB calls remote_target::stop, we end up sending an interrupt packet \x03 to the remote target. If the user interrupts the inferior from the GDB prompt (e.g. by typing Ctrl-c), then GDB calls remote_target::interrupt, which also ends up sending the interrupt packet. The problem here is that both of these mechanisms end up sending the interrupt packet, which means, when the target stops with a SIGINT, and this is reported back to GDB, we have no choice but to report this to the user as a SIGINT stop event. Now maybe this is the correct thing to do, after all the target has been stopped with SIGINT. However, this leads to an unfortunate change in behaviour. When running in non-stop mode, and remote_target::stop is called, the target will be stopped with a vCont packet, and this stop is then reported back to GDB as GDB_SIGNAL_0, this will cause GDB to print a message like: Program stopped. Or: Thread NN "binary name" stopped. In contrast, when non-stop mode is off, we get messages like: Program received SIGINT, Segmentation fault. Or: Thread NN "binary name" received SIGINT, Segmentation fault. In this commit I propose a mechanism where we can track that a stop has been requested for a particular thread through remote_target::stop, then, when the stop arrives, we can convert the SIGINT to a GDB_SIGNAL_0. With this done GDB will now display the "stopped" based messages rather than the "received SIGINT" messages. Two of the tests added in the previous commit exposed this issue. In the previous commit the tests looked for either of the above patterns. In this commit I've updated these tests to only look for the "stopped" based messages. --- gdb/remote.c | 17 +++++++++++++++++ gdb/testsuite/gdb.base/infcall-timeout.exp | 9 +-------- .../infcall-from-bp-cond-timeout.exp | 9 +-------- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/gdb/remote.c b/gdb/remote.c index 218bca30d04..61781a24820 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -1139,6 +1139,10 @@ struct remote_thread_info : public private_thread_info std::string name; int core = -1; + /* Only used when not in non-stop mode. Set to true when a stop is + requested for the thread. */ + bool stop_requested = false; + /* Thread handle, perhaps a pthread_t or thread_t value, stored as a sequence of bytes. */ gdb::byte_vector thread_handle; @@ -7114,6 +7118,12 @@ remote_target::stop (ptid_t ptid) /* We don't currently have a way to transparently pause the remote target in all-stop mode. Interrupt it instead. */ remote_interrupt_as (); + + /* Record that this thread's stop is a result of GDB asking for the + stop, rather than the user asking for an interrupt. We can use + this information to adjust the waitstatus when it arrives. */ + remote_thread_info *remote_thr = get_remote_thread_info (this, ptid); + remote_thr->stop_requested = true; } } @@ -8097,9 +8107,16 @@ remote_target::process_stop_reply (struct stop_reply *stop_reply, /* If the target works in non-stop mode, a stop-reply indicates that only this thread stopped. */ remote_thr->set_not_resumed (); + gdb_assert (!remote_thr->stop_requested); } else { + if (status->kind () == TARGET_WAITKIND_STOPPED + && status->sig () == GDB_SIGNAL_INT + && remote_thr->stop_requested) + status->set_stopped (GDB_SIGNAL_0); + remote_thr->stop_requested = false; + /* If the target works in all-stop mode, a stop-reply indicates that all the target's threads stopped. */ for (thread_info *tp : all_non_exited_threads (this)) diff --git a/gdb/testsuite/gdb.base/infcall-timeout.exp b/gdb/testsuite/gdb.base/infcall-timeout.exp index a5b0111ed04..bd6b2bfac3e 100644 --- a/gdb/testsuite/gdb.base/infcall-timeout.exp +++ b/gdb/testsuite/gdb.base/infcall-timeout.exp @@ -45,16 +45,9 @@ proc_with_prefix run_test { target_async target_non_stop } { gdb_test_no_output "set direct-call-timeout 5" - # When non-stop mode is off we get slightly different output from GDB. - if { [gdb_is_remote_or_extended_remote_target] && $target_non_stop == "off" } { - set stopped_line_pattern "Program received signal SIGINT, Interrupt\\." - } else { - set stopped_line_pattern "Program stopped\\." - } - gdb_test "print function_that_never_returns ()" \ [multi_line \ - $stopped_line_pattern \ + "Program stopped\\." \ ".*" \ "The program being debugged timed out while in a function called from GDB\\." \ "GDB remains in the frame where the timeout occurred\\." \ diff --git a/gdb/testsuite/gdb.threads/infcall-from-bp-cond-timeout.exp b/gdb/testsuite/gdb.threads/infcall-from-bp-cond-timeout.exp index 3341ff33f19..9ba38e6896a 100644 --- a/gdb/testsuite/gdb.threads/infcall-from-bp-cond-timeout.exp +++ b/gdb/testsuite/gdb.threads/infcall-from-bp-cond-timeout.exp @@ -92,16 +92,9 @@ proc run_test { target_async target_non_stop other_thread_bp } { "get number for segfault breakpoint"] } - # When non-stop mode is off we get slightly different output from GDB. - if { [gdb_is_remote_or_extended_remote_target] && $target_non_stop == "off" } { - set stopped_line_pattern "Thread ${::decimal} \"\[^\r\n\"\]+\" received signal SIGINT, Interrupt\\." - } else { - set stopped_line_pattern "Thread ${::decimal} \"\[^\r\n\"\]+\" stopped\\." - } - gdb_test "continue" \ [multi_line \ - $stopped_line_pattern \ + "Thread ${::decimal} \"\[^\r\n\"\]+\" stopped\\." \ ".*" \ "Error in testing condition for breakpoint ${bp_num}:" \ "The program being debugged timed out while in a function called from GDB\\." \ From patchwork Wed Jan 18 16:18:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 63353 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E4C1A38493D8 for ; Wed, 18 Jan 2023 16:19:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E4C1A38493D8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1674058796; bh=n7SVXPwMyHAjtQvoW/Zp88CWi0lLb7wYMJ6UA8AhtNQ=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=yiJrBvKDSWt8g7hZ4wkQrTTKTJuDfeMKPm5IPMTkpHnFqMHpnlt3qB7SszN5Kex3W CpRhyo3BrpoDm4SizLFN/P616xWJpTkBNNQB1J5IDPLmsZgJBA/2DlshLZZdH3Ii62 lmJ0HnkY9UoBaycjlP/RrC8hBSjAHzFTdgQ8+6u8= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 4BD16385842E for ; Wed, 18 Jan 2023 16:18:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4BD16385842E Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-80-SWAs52n5OHigcEid5wEYnQ-1; Wed, 18 Jan 2023 11:18:41 -0500 X-MC-Unique: SWAs52n5OHigcEid5wEYnQ-1 Received: by mail-qk1-f199.google.com with SMTP id bi3-20020a05620a318300b00702545f73d5so25059673qkb.8 for ; Wed, 18 Jan 2023 08:18:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=n7SVXPwMyHAjtQvoW/Zp88CWi0lLb7wYMJ6UA8AhtNQ=; b=zmjrBFdO+EjAEuM/L3JyC9OsDLE8/7/yD7DFRsSWx/oKD9OGr3v8irCinqwy955rEH AlsScy/AQDDOV/o+MleYv4X5+3fxX/gO9I1EC2+m0Ugu/Zw12J0zW3/1/gRrHju2iDEz eLotKXDXzL5CgaeJp8h8AhoICoFHAmEJQ2TBipKXgcWBD4svMAGXi/3KT/1IW5cWDlnE PZOSwqRq4XtLrdtk1L0kyXrePALPePtoGGXp6Q7GvpPYfwcTn3jdUP9j4UXkNjv+osBN 4a1YBVeR48pgC1f70bq0r6tBKrB7pIimwy+LNO0L8Zav/UWmhPAMb/xZsP63R0OqoGcS Z/Rg== X-Gm-Message-State: AFqh2kq9SpWbzKlrdAMcHO96GjK+MqaM/4DOm8fKHaVftRpWJRP3EAe3 nihSaGWeInjxABQvV5AjDq10Tm8TMtD7pOGNIULeFI/vADqsN7+LyctVtpl3XwN4Hg9nUYNqyLp RnQP/o5hO+Dunb9uBMgdrZIqYhQ1fJ1Mqq5WSMAUwVapU6uZpTUhooe+jk+LVBmWrZ/5neQBwnA == X-Received: by 2002:a05:622a:598b:b0:3b6:30e1:f480 with SMTP id gb11-20020a05622a598b00b003b630e1f480mr10178272qtb.32.1674058720340; Wed, 18 Jan 2023 08:18:40 -0800 (PST) X-Google-Smtp-Source: AMrXdXuqsSpBL4QFDacqEM/eekaKo0WLKuDzVVALA4yt0EPEEEHi80OKLqWfu+xhqyfrx2EDiU3MCg== X-Received: by 2002:a05:622a:598b:b0:3b6:30e1:f480 with SMTP id gb11-20020a05622a598b00b003b630e1f480mr10178229qtb.32.1674058719751; Wed, 18 Jan 2023 08:18:39 -0800 (PST) Received: from localhost (95.72.115.87.dyn.plus.net. [87.115.72.95]) by smtp.gmail.com with ESMTPSA id o24-20020ac85558000000b003b646a99aa6sm1429889qtr.77.2023.01.18.08.18.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jan 2023 08:18:39 -0800 (PST) To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCHv2 12/13] gdb: introduce unwind-on-timeout setting Date: Wed, 18 Jan 2023 16:18:08 +0000 Message-Id: <0a8172f909c477fc7bab48c99df5860c887b8024.1674058360.git.aburgess@redhat.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Andrew Burgess via Gdb-patches From: Andrew Burgess Reply-To: Andrew Burgess Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" Now that inferior function calls can timeout (see the recent introduction of direct-call-timeout and indirect-call-timeout), this commit adds a new setting unwind-on-timeout. This new setting is just like the existing unwindonsignal and unwind-on-terminating-exception, but the new setting will cause GDB to unwind the stack if an inferior function call times out. The existing inferior function call timeout tests have been updated to cover the new setting. --- gdb/NEWS | 9 +++ gdb/doc/gdb.texinfo | 33 +++++++--- gdb/infcall.c | 62 ++++++++++++++++--- gdb/testsuite/gdb.base/infcall-timeout.exp | 49 +++++++++++---- .../infcall-from-bp-cond-timeout.exp | 55 +++++++++++----- 5 files changed, 164 insertions(+), 44 deletions(-) diff --git a/gdb/NEWS b/gdb/NEWS index 2689569a8f3..511a750407a 100644 --- a/gdb/NEWS +++ b/gdb/NEWS @@ -35,6 +35,15 @@ show indirect-call-timeout ignored, GDB will wait indefinitely for an inferior function to complete, unless interrupted by the user using Ctrl-C. +set unwind-on-timeout on|off +show unwind-on-timeout + These commands control whether GDB should unwind the stack when a + timeout occurs during an inferior function call. The default is + off, in which case the inferior will remain in the frame where the + timeout occurred. When on GDB will unwind the stack remocing the + dummy frame that was added for the inferior call, and restoring the + inferior state to how it was before the inferior call started. + * MI changes ** mi now reports 'no-history' as a stop reason when hitting the end of the diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index 9eb8b1db00e..aa88221677e 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -5719,10 +5719,10 @@ the called function, or the called function may receive a signal (e.g.@ a @code{SIGSEGV}) as a result of some undefined behaviour, if this happens then @value{GDBN} will stop. Depending on the settings -@code{unwindonsignal} and @code{unwind-on-terminating-exception} -(@pxref{Calling,,Calling Program Functions}) @value{GDBN} may unwind -the stack back to the breakpoint location, or may leave the program at -the frame where the stop occurred. +@code{unwindonsignal}, @code{unwind-on-terminating-exception}, and +@code{unwind-on-timeout} (@pxref{Calling,,Calling Program Functions}) +@value{GDBN} may unwind the stack back to the breakpoint location, or +may leave the program at the frame where the stop occurred. Breakpoint conditions can also be evaluated on the target's side if the target supports it. Instead of evaluating the conditions locally, @@ -20718,6 +20718,21 @@ Show the current setting of stack unwinding in the functions called by @value{GDBN}. +@item set unwind-on-timeout +@kindex set unwind-on-timeout +@cindex unwind stack in called functions when timing out +@cindex call dummy stack unwinding on timeout. +Set unwinding of the stack if a function called from @value{GDBN} +times out. If set to @code{off} (the default), @value{GDBN} stops in +the frame where the timeout occurred. If set to @code{on}, +@value{GDBN} unwinds the stack it created for the call and restores +the context to what it was before the call. + +@item show unwind-on-timeout +@kindex show unwind-on-timeout +Show whether @value{GDBN} will unwind the stack if a function called +from @value{GDBN} times out. + @item set may-call-functions @kindex set may-call-functions @cindex disabling calling functions in the program @@ -20748,11 +20763,11 @@ call by typing the interrupt character (often @kbd{Ctrl-c}). If a called function is interrupted for any reason, and the stack is -not unwound (due to @code{set unwind-on-terminating-exception on} or -@code{set unwindonsignal on}), then the dummy-frame, created by -@value{GDBN} to facilitate the call to the program function, will be -visible in the backtrace, for example frame @code{#3} in the following -backtrace: +not unwound (due to @code{set unwind-on-terminating-exception on}, +@code{set unwind-on-timeout}, or @code{set unwindonsignal on}), then +the dummy-frame, created by @value{GDBN} to facilitate the call to the +program function, will be visible in the backtrace, for example frame +@code{#3} in the following backtrace: @smallexample (@value{GDBP}) backtrace diff --git a/gdb/infcall.c b/gdb/infcall.c index 9afca4f5bc6..272e3cccf87 100644 --- a/gdb/infcall.c +++ b/gdb/infcall.c @@ -217,6 +217,27 @@ show_unwind_on_terminating_exception_p (struct ui_file *file, int from_tty, value); } +/* This boolean tells what gdb should do if a signal is received while + in a function called from gdb (call dummy). If set, gdb unwinds + the stack and restore the context to what as it was before the + call. + + The default is to stop in the frame where the signal was received. */ + +static bool unwind_on_timeout_p = false; + +/* Implement 'show unwind-on-timeout'. */ + +static void +show_unwind_on_timeout_p (struct ui_file *file, int from_tty, + struct cmd_list_element *c, const char *value) +{ + gdb_printf (file, + _("Unwinding of stack if a timeout occurs " + "while in a call dummy is %s.\n"), + value); +} + /* Perform the standard coercions that are specified for arguments to be passed to C, Ada or Fortran functions. @@ -1691,14 +1712,27 @@ When the function is done executing, GDB will silently stop."), /* A timeout results in a signal being sent to the inferior. */ gdb_assert (stopped_by_random_signal); - /* Indentation is weird here. A later patch is going to move the - following block into an if/else, so I'm leaving the indentation - here to minimise the later patch. + if (unwind_on_timeout_p) + { + /* The user wants the context restored. */ + + /* We must get back to the frame we were before the + dummy call. */ + dummy_frame_pop (dummy_id, call_thread.get ()); + + /* We also need to restore inferior status to that before the + dummy call. */ + restore_infcall_control_state (inf_status.release ()); - Also, the error message used below refers to 'set - unwind-on-timeout' which doesn't exist yet. This will be added - in a later commit, I'm leaving this in for now to minimise the - churn caused by the commit that adds unwind-on-timeout. */ + error (_("\ +The program being debugged timed out while in a function called from GDB.\n\ +GDB has restored the context to what it was before the call.\n\ +To change this behavior use \"set unwind-on-timeout off\".\n\ +Evaluation of the expression containing the function\n\ +(%s) will be abandoned."), + name.c_str ()); + } + else { /* The user wants to stay in the frame where we stopped (default). Discard inferior status, we're not at the same @@ -1824,6 +1858,20 @@ The default is to unwind the frame."), show_unwind_on_terminating_exception_p, &setlist, &showlist); + add_setshow_boolean_cmd ("unwind-on-timeout", no_class, + &unwind_on_timeout_p, _("\ +Set unwinding of stack if a timeout occurs while in a call dummy."), _("\ +Show unwinding of stack if a timeout occurs while in a call dummy."), + _("\ +The unwind on timeout flag lets the user determine what gdb should do if\n\ +gdb times out while in a function called from gdb. If set, gdb unwinds\n\ +the stack and restores the context to what it was before the call. If\n\ +unset, gdb leaves the inferior in the frame where the timeout occurred.\n\ +The default is to stop in the frame where the timeout occurred."), + NULL, + show_unwind_on_timeout_p, + &setlist, &showlist); + add_setshow_uinteger_cmd ("direct-call-timeout", no_class, &direct_call_timeout, _("\ Set the timeout, for direct calls to inferior function calls."), _("\ diff --git a/gdb/testsuite/gdb.base/infcall-timeout.exp b/gdb/testsuite/gdb.base/infcall-timeout.exp index bd6b2bfac3e..a4d9fd6ee61 100644 --- a/gdb/testsuite/gdb.base/infcall-timeout.exp +++ b/gdb/testsuite/gdb.base/infcall-timeout.exp @@ -28,7 +28,11 @@ if { [build_executable "failed to prepare" ${binfile} "${srcfile}" \ # the direct-call-timeout, and make an inferior function call that # will never return. GDB should eventually timeout and stop the # inferior. -proc_with_prefix run_test { target_async target_non_stop } { +# +# When UNWIND is "off" the inferior wil be left in the frame where the +# timeout occurs, otherwise, when UNWIND is "on", GDB should unwind +# back to the frame where the inferior call was made. +proc_with_prefix run_test { target_async target_non_stop unwind } { save_vars { ::GDBFLAGS } { append ::GDBFLAGS \ " -ex \"maint set target-non-stop $target_non_stop\"" @@ -44,19 +48,36 @@ proc_with_prefix run_test { target_async target_non_stop } { } gdb_test_no_output "set direct-call-timeout 5" + gdb_test_no_output "set unwind-on-timeout $unwind" + + if { $unwind } { + gdb_test "print function_that_never_returns ()" \ + [multi_line \ + "Program stopped\\." \ + ".*" \ + "The program being debugged timed out while in a function called from GDB\\." \ + "GDB has restored the context to what it was before the call\\." \ + "To change this behavior use \"set unwind-on-timeout off\"\\." \ + "Evaluation of the expression containing the function" \ + "\\(function_that_never_returns\\) will be abandoned\\."] - gdb_test "print function_that_never_returns ()" \ - [multi_line \ - "Program stopped\\." \ - ".*" \ - "The program being debugged timed out while in a function called from GDB\\." \ - "GDB remains in the frame where the timeout occurred\\." \ - "To change this behavior use \"set unwind-on-timeout on\"\\." \ - "Evaluation of the expression containing the function" \ - "\\(function_that_never_returns\\) will be abandoned\\." \ - "When the function is done executing, GDB will silently stop\\."] + gdb_test "bt" \ + "#0\\s+main \\(\\).*" + } else { + gdb_test "print function_that_never_returns ()" \ + [multi_line \ + "Program stopped\\." \ + ".*" \ + "The program being debugged timed out while in a function called from GDB\\." \ + "GDB remains in the frame where the timeout occurred\\." \ + "To change this behavior use \"set unwind-on-timeout on\"\\." \ + "Evaluation of the expression containing the function" \ + "\\(function_that_never_returns\\) will be abandoned\\." \ + "When the function is done executing, GDB will silently stop\\."] - gdb_test "bt" ".* function_that_never_returns .*.*" + gdb_test "bt" \ + ".* function_that_never_returns .*.*" + } } foreach_with_prefix target_async { "on" "off" } { @@ -70,6 +91,8 @@ foreach_with_prefix target_async { "on" "off" } { } foreach_with_prefix target_non_stop { "on" "off" } { - run_test $target_async $target_non_stop + foreach_with_prefix unwind { "on" "off" } { + run_test $target_async $target_non_stop $unwind + } } } diff --git a/gdb/testsuite/gdb.threads/infcall-from-bp-cond-timeout.exp b/gdb/testsuite/gdb.threads/infcall-from-bp-cond-timeout.exp index 9ba38e6896a..847a850673d 100644 --- a/gdb/testsuite/gdb.threads/infcall-from-bp-cond-timeout.exp +++ b/gdb/testsuite/gdb.threads/infcall-from-bp-cond-timeout.exp @@ -41,7 +41,12 @@ set segfault_line [gdb_get_line_number "Segfault here"] # thread, on which the inferior call relies, either hits a breakpoint # (when OTHER_THREAD_BP is true), or crashes (when OTHER_THREAD_BP is # false). -proc run_test { target_async target_non_stop other_thread_bp } { +# +# When UNWIND is "on" GDB will unwind the thread which performed the +# inferior function call back to the state where the inferior call was +# made (when the inferior call times out). Otherwise, when UNWIND is +# "off", the inferior is left in the frame where the timeout occurred. +proc run_test { target_async target_non_stop other_thread_bp unwind } { save_vars { ::GDBFLAGS } { append ::GDBFLAGS " -ex \"maint set target-non-stop $target_non_stop\"" append ::GDBFLAGS " -ex \"maintenance set target-async ${target_async}\"" @@ -72,6 +77,7 @@ proc run_test { target_async target_non_stop other_thread_bp } { # for this timeout. For now though, we just hope 5 seconds is # enough. gdb_test_no_output "set indirect-call-timeout 5" + gdb_test_no_output "set unwind-on-timeout $unwind" gdb_breakpoint \ "${::srcfile}:${::cond_bp_line} if (condition_func ())" @@ -92,18 +98,35 @@ proc run_test { target_async target_non_stop other_thread_bp } { "get number for segfault breakpoint"] } - gdb_test "continue" \ - [multi_line \ - "Thread ${::decimal} \"\[^\r\n\"\]+\" stopped\\." \ - ".*" \ - "Error in testing condition for breakpoint ${bp_num}:" \ - "The program being debugged timed out while in a function called from GDB\\." \ - "GDB remains in the frame where the timeout occurred\\." \ - "To change this behavior use \"set unwind-on-timeout on\"\\." \ - "Evaluation of the expression containing the function" \ - "\\(condition_func\\) will be abandoned\\." \ - "When the function is done executing, GDB will silently stop\\."] \ - "expected timeout waiting for inferior call to complete" + if { $unwind } { + gdb_test "continue" \ + [multi_line \ + "Thread ${::decimal} \"\[^\r\n\"\]+\" stopped\\." \ + ".*" \ + "Error in testing condition for breakpoint ${bp_num}:" \ + "The program being debugged timed out while in a function called from GDB\\." \ + "GDB has restored the context to what it was before the call\\." \ + "To change this behavior use \"set unwind-on-timeout off\"\\." \ + "Evaluation of the expression containing the function" \ + "\\(condition_func\\) will be abandoned\\." \ + "" \ + "Thread ${::decimal}\[^\r\n\]*hit Breakpoint ${bp_num}, \[^\r\n\]+" \ + "\[^\r\n\]+ Conditional breakpoint here\\. \[^\r\n\]+"] \ + "expected timeout waiting for inferior call to complete" + } else { + gdb_test "continue" \ + [multi_line \ + "Thread ${::decimal} \"\[^\r\n\"\]+\" stopped\\." \ + ".*" \ + "Error in testing condition for breakpoint ${bp_num}:" \ + "The program being debugged timed out while in a function called from GDB\\." \ + "GDB remains in the frame where the timeout occurred\\." \ + "To change this behavior use \"set unwind-on-timeout on\"\\." \ + "Evaluation of the expression containing the function" \ + "\\(condition_func\\) will be abandoned\\." \ + "When the function is done executing, GDB will silently stop\\."] \ + "expected timeout waiting for inferior call to complete" + } # Remember that other thread that either crashed (with a segfault) # or hit a breakpoint? Now that the inferior call has timed out, @@ -142,8 +165,10 @@ foreach_with_prefix target_async {"on" "off" } { } foreach_with_prefix target_non_stop {"off" "on"} { - foreach_with_prefix other_thread_bp { true false } { - run_test $target_async $target_non_stop $other_thread_bp + foreach_with_prefix unwind {"off" "on"} { + foreach_with_prefix other_thread_bp { true false } { + run_test $target_async $target_non_stop $other_thread_bp $unwind + } } } } From patchwork Wed Jan 18 16:18:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 63358 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 43B323858281 for ; Wed, 18 Jan 2023 16:21:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 43B323858281 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1674058907; bh=ZPmOzjcNEVSxhHE05R0neBxvtZzwlHIDtqg6XyWthp8=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=EJVAJEsqLppsiXPBSv3maoYG7izVP97bf1Q/YEmn0JuIIwY24nmVf2pmdzv//xBct SwfBbAnfZcEb9l8zlUjdmPlv6rUQYoQtr7Gv+9ruaHZNDyya77+GHSWubggDyzPLsr S4FdBI8fEmUVKjiF0gdCX0AUdytEN9RhO56fg5Tg= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 0409D385B508 for ; Wed, 18 Jan 2023 16:18:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0409D385B508 Received: from mail-yb1-f198.google.com (mail-yb1-f198.google.com [209.85.219.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-121-7bJgKgjYPj2V6nUpzg_zXg-1; Wed, 18 Jan 2023 11:18:43 -0500 X-MC-Unique: 7bJgKgjYPj2V6nUpzg_zXg-1 Received: by mail-yb1-f198.google.com with SMTP id x83-20020a25e056000000b007eda066c56eso6803187ybg.17 for ; Wed, 18 Jan 2023 08:18:43 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZPmOzjcNEVSxhHE05R0neBxvtZzwlHIDtqg6XyWthp8=; b=JxDGXMFouhfZ/xDFny7dXE6QHH6F6oMxFEnL6yd0ZHEoDabuHFSI9y09h3k4PeZlNh BLl54KGgsFR/N8y2EPCyxZ4sGL8r3L1PVsSwU12kOcuybfFj4mlb9fJVGE2Iym0yzRIe TaRmfgdJh/ybyRw96VctMDdx35BLPmgp6n8HES3L6z5UBVFmjcfJv7jdqOctmAy5eK7c vQFOHVufE2hjmvZ3NICifkpdl0djsYz4fFuiR0o0MZR4E7Dn4O7b8Ra7AOXAMmeDI51K H/I+j1E8An6fX1IPOjzDxlQNbV7d0Pu0nB70/Cr3q1YsbpYhYI+YZxJjsHTtIT54pGj1 gWFQ== X-Gm-Message-State: AFqh2kozfyE3T2twDvIhM5/7njiClJg0DFII+J66uHGFKZEUDmRyUUMz b1bd6aFK2XiCTDxX/gPoQTdIth7TU2vRRmcpm+smRsp0lWGSSsVSJi+v9bG38rDcPNuybAOuSfC Cu2cdPkQkNAnygCIRuOIqP1TgR9w07t3G1VaAi47Nv6ScSYxXjHX8yp+EEq/0BpKTh7CF1mavfQ == X-Received: by 2002:a25:880c:0:b0:7c4:eeef:35d0 with SMTP id c12-20020a25880c000000b007c4eeef35d0mr6191000ybl.35.1674058722385; Wed, 18 Jan 2023 08:18:42 -0800 (PST) X-Google-Smtp-Source: AMrXdXvgTfsd0xDqEjqQP7Cw7uugBwB6pPupqV7kkaUyEMEAcvrcy1rPJ6kPeBJaPOEcXf5Wo05oRA== X-Received: by 2002:a25:880c:0:b0:7c4:eeef:35d0 with SMTP id c12-20020a25880c000000b007c4eeef35d0mr6190957ybl.35.1674058721764; Wed, 18 Jan 2023 08:18:41 -0800 (PST) Received: from localhost (95.72.115.87.dyn.plus.net. [87.115.72.95]) by smtp.gmail.com with ESMTPSA id s1-20020a05620a29c100b00704c6263924sm5825104qkp.13.2023.01.18.08.18.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jan 2023 08:18:41 -0800 (PST) To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCHv2 13/13] gdb: rename unwindonsignal to unwind-on-signal Date: Wed, 18 Jan 2023 16:18:09 +0000 Message-Id: X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Andrew Burgess via Gdb-patches From: Andrew Burgess Reply-To: Andrew Burgess Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" We now have unwind-on-timeout and unwind-on-terminating-exception, and then the odd one out unwindonsignal. I'm not a great fan of these squashed together command names, so in this commit I propose renaming this to unwind-on-signal. Obviously I've added the hidden alias unwindonsignal so any existing GDB scripts will keep working. There's one test that I've extended to test the alias works, but in most of the other test scripts I've changed over to use the new name. The docs are updated to reference the new name. --- gdb/NEWS | 11 ++++++ gdb/doc/gdb.texinfo | 16 ++++++--- gdb/infcall.c | 21 ++++++----- gdb/testsuite/gdb.base/callfuncs.exp | 4 +-- gdb/testsuite/gdb.base/infcall-failure.exp | 4 +-- gdb/testsuite/gdb.base/unwindonsignal.exp | 36 +++++++++++++------ gdb/testsuite/gdb.compile/compile-cplus.exp | 2 +- gdb/testsuite/gdb.compile/compile.exp | 2 +- gdb/testsuite/gdb.cp/gdb2495.exp | 16 ++++----- gdb/testsuite/gdb.fortran/function-calls.exp | 2 +- gdb/testsuite/gdb.mi/mi-syn-frame.exp | 2 +- .../infcall-from-bp-cond-simple.exp | 2 +- .../gdb.threads/thread-unwindonsignal.exp | 8 ++--- 13 files changed, 83 insertions(+), 43 deletions(-) diff --git a/gdb/NEWS b/gdb/NEWS index 511a750407a..77d85392bcb 100644 --- a/gdb/NEWS +++ b/gdb/NEWS @@ -44,6 +44,17 @@ show unwind-on-timeout dummy frame that was added for the inferior call, and restoring the inferior state to how it was before the inferior call started. +set unwind-on-signal on|off +show unwind-on-signal + These new commands replaces the existing set/show unwindonsignal. The + old command is maintained as an alias. + +* Changed commands + +set unwindonsignal on|off +show unwindonsignal + These commands are now aliases for the new set/show unwind-on-signal. + * MI changes ** mi now reports 'no-history' as a stop reason when hitting the end of the diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index aa88221677e..6f1775c4843 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -20673,7 +20673,7 @@ It is possible for the function you call via the @code{print} or @code{call} command to generate a signal (e.g., if there's a bug in the function, or if you passed it incorrect arguments). What happens -in that case is controlled by the @code{set unwindonsignal} command. +in that case is controlled by the @code{set unwind-on-signal} command. Similarly, with a C@t{++} program it is possible for the function you call via the @code{print} or @code{call} command to generate an @@ -20686,7 +20686,8 @@ @code{set unwind-on-terminating-exception} command. @table @code -@item set unwindonsignal +@item set unwind-on-signal +@kindex set unwind-on-signal @kindex set unwindonsignal @cindex unwind stack in called functions @cindex call dummy stack unwinding @@ -20697,11 +20698,18 @@ default), @value{GDBN} stops in the frame where the signal was received. -@item show unwindonsignal +The command @code{set unwindonsignal} is an alias for this command, +and is maintained for backward compatibility. + +@item show unwind-on-signal +@kindex show unwind-on-signal @kindex show unwindonsignal Show the current setting of stack unwinding in the functions called by @value{GDBN}. +The command @code{show unwindonsignal} is an alias for this command, +and is maintained for backward compatibility. + @item set unwind-on-terminating-exception @kindex set unwind-on-terminating-exception @cindex unwind stack in called functions with unhandled exceptions @@ -20764,7 +20772,7 @@ If a called function is interrupted for any reason, and the stack is not unwound (due to @code{set unwind-on-terminating-exception on}, -@code{set unwind-on-timeout}, or @code{set unwindonsignal on}), then +@code{set unwind-on-timeout}, or @code{set unwind-on-signal on}), then the dummy-frame, created by @value{GDBN} to facilitate the call to the program function, will be visible in the backtrace, for example frame @code{#3} in the following backtrace: diff --git a/gdb/infcall.c b/gdb/infcall.c index 272e3cccf87..f98fe160347 100644 --- a/gdb/infcall.c +++ b/gdb/infcall.c @@ -1681,7 +1681,7 @@ When the function is done executing, GDB will silently stop."), error (_("\ The program being debugged was signaled while in a function called from GDB.\n\ GDB has restored the context to what it was before the call.\n\ -To change this behavior use \"set unwindonsignal off\".\n\ +To change this behavior use \"set unwind-on-signal off\".\n\ Evaluation of the expression containing the function\n\ (%s) will be abandoned."), name.c_str ()); @@ -1699,7 +1699,7 @@ Evaluation of the expression containing the function\n\ error (_("\ The program being debugged was signaled while in a function called from GDB.\n\ GDB remains in the frame where the signal was received.\n\ -To change this behavior use \"set unwindonsignal on\".\n\ +To change this behavior use \"set unwind-on-signal on\".\n\ Evaluation of the expression containing the function\n\ (%s) will be abandoned.\n\ When the function is done executing, GDB will silently stop."), @@ -1831,17 +1831,22 @@ The default is to perform the conversion."), show_coerce_float_to_double_p, &setlist, &showlist); - add_setshow_boolean_cmd ("unwindonsignal", no_class, - &unwind_on_signal_p, _("\ + set_show_commands setshow_unwind_on_signal_cmds + = add_setshow_boolean_cmd ("unwind-on-signal", no_class, + &unwind_on_signal_p, _("\ Set unwinding of stack if a signal is received while in a call dummy."), _("\ Show unwinding of stack if a signal is received while in a call dummy."), _("\ -The unwindonsignal lets the user determine what gdb should do if a signal\n\ +The unwind-on-signal lets the user determine what gdb should do if a signal\n\ is received while in a function called from gdb (call dummy). If set, gdb\n\ unwinds the stack and restore the context to what as it was before the call.\n\ The default is to stop in the frame where the signal was received."), - NULL, - show_unwind_on_signal_p, - &setlist, &showlist); + NULL, + show_unwind_on_signal_p, + &setlist, &showlist); + add_alias_cmd ("unwindonsignal", setshow_unwind_on_signal_cmds.set, + no_class, 1, &setlist); + add_alias_cmd ("unwindonsignal", setshow_unwind_on_signal_cmds.show, + no_class, 1, &showlist); add_setshow_boolean_cmd ("unwind-on-terminating-exception", no_class, &unwind_on_terminating_exception_p, _("\ diff --git a/gdb/testsuite/gdb.base/callfuncs.exp b/gdb/testsuite/gdb.base/callfuncs.exp index df67c772e41..da994789d88 100644 --- a/gdb/testsuite/gdb.base/callfuncs.exp +++ b/gdb/testsuite/gdb.base/callfuncs.exp @@ -49,7 +49,7 @@ proc do_function_calls {prototypes} { # If any of these calls segv we don't want to affect subsequent tests. # E.g., we want to ensure register values are restored. - gdb_test_no_output "set unwindonsignal on" + gdb_test_no_output "set unwind-on-signal on" gdb_test "p t_char_values(0,0)" " = 0" gdb_test "p t_char_values('a','b')" " = 1" @@ -240,7 +240,7 @@ proc do_function_calls {prototypes} { "call inferior func with struct - returns char *" # Restore default value. - gdb_test_no_output "set unwindonsignal off" + gdb_test_no_output "set unwind-on-signal off" } # Procedure to get current content of all registers. diff --git a/gdb/testsuite/gdb.base/infcall-failure.exp b/gdb/testsuite/gdb.base/infcall-failure.exp index 8fa2c407fc5..cf50a3baf0a 100644 --- a/gdb/testsuite/gdb.base/infcall-failure.exp +++ b/gdb/testsuite/gdb.base/infcall-failure.exp @@ -137,7 +137,7 @@ proc_with_prefix run_cond_hits_segfault_test { async_p non_stop_p } { "Error in testing condition for breakpoint ${bp_1_num}:" \ "The program being debugged was signaled while in a function called from GDB\\." \ "GDB remains in the frame where the signal was received\\." \ - "To change this behavior use \"set unwindonsignal on\"\\." \ + "To change this behavior use \"set unwind-on-signal on\"\\." \ "Evaluation of the expression containing the function" \ "\\(func_segfault\\) will be abandoned\\." \ "When the function is done executing, GDB will silently stop\\."] @@ -165,7 +165,7 @@ proc_with_prefix run_call_hits_segfault_test { async_p non_stop_p } { "${::decimal}\\s+\[^\r\n\]+Segfault here\[^\r\n\]+" \ "The program being debugged was signaled while in a function called from GDB\\." \ "GDB remains in the frame where the signal was received\\." \ - "To change this behavior use \"set unwindonsignal on\"\\." \ + "To change this behavior use \"set unwind-on-signal on\"\\." \ "Evaluation of the expression containing the function" \ "\\(func_segfault\\) will be abandoned\\." \ "When the function is done executing, GDB will silently stop\\."] diff --git a/gdb/testsuite/gdb.base/unwindonsignal.exp b/gdb/testsuite/gdb.base/unwindonsignal.exp index 8470634e502..41a4de8b472 100644 --- a/gdb/testsuite/gdb.base/unwindonsignal.exp +++ b/gdb/testsuite/gdb.base/unwindonsignal.exp @@ -40,35 +40,51 @@ gdb_test "break stop_here" "Breakpoint \[0-9\]* at .*" gdb_test "continue" "Continuing.*Breakpoint \[0-9\]*, stop_here.*" \ "continue to breakpoint at stop_here" -# Turn on unwindonsignal. -gdb_test_no_output "set unwindonsignal on" \ - "setting unwindonsignal" +# Turn on unwind-on-signal. +gdb_test_no_output "set unwind-on-signal on" \ + "setting unwind-on-signal" -gdb_test "show unwindonsignal" \ +gdb_test "show unwind-on-signal" \ "Unwinding of stack .* is on." \ - "showing unwindonsignal" + "showing unwind-on-signal" + +# For backward compatibility we maintain a 'unwindonsignal' alias for +# 'unwind-on-signal', check it now. +gdb_test "show unwindonsignal" \ + "Unwinding of stack .* is on\\." \ + "showing unwindonsignal alias" + +gdb_test_no_output "set unwindonsignal off" \ + "setting unwindonsignal alias to off" + +gdb_test "show unwind-on-signal" \ + "Unwinding of stack .* is off\\." \ + "showing unwind-on-signal after setting via alias" + +gdb_test_no_output "set unwindonsignal on" \ + "setting unwindonsignal alias to on" # Call function (causing the program to get a signal), and see if gdb handles # it properly. if {[gdb_test "call gen_signal ()" \ "\[\r\n\]*The program being debugged was signaled.*" \ - "unwindonsignal, inferior function call signaled"] != 0} { + "inferior function call signaled"] != 0} { return 0 } # Verify the stack got unwound. gdb_test "bt" \ "#0 *\[x0-9a-f in\]*stop_here \\(.*\\) at .*#1 *\[x0-9a-f in\]*main \\(.*\\) at .*" \ - "unwindonsignal, stack unwound" + "stack unwound" # Verify the dummy frame got removed from dummy_frame_stack. gdb_test_multiple "maint print dummy-frames" \ - "unwindonsignal, dummy frame removed" { + "unwind-on-signal, dummy frame removed" { -re "\[\r\n\]*.*stack=.*code=.*\[\r\n\]+$gdb_prompt $" { - fail "unwindonsignal, dummy frame removed" + fail $gdb_test_name } -re "\[\r\n\]+$gdb_prompt $" { - pass "unwindonsignal, dummy frame removed" + pass $gdb_test_name } } diff --git a/gdb/testsuite/gdb.compile/compile-cplus.exp b/gdb/testsuite/gdb.compile/compile-cplus.exp index 0b7cb59727a..4960e03408e 100644 --- a/gdb/testsuite/gdb.compile/compile-cplus.exp +++ b/gdb/testsuite/gdb.compile/compile-cplus.exp @@ -129,7 +129,7 @@ gdb_test "return" "\r\n#0 main .*" "return" \ "Make _gdb_expr\\(__gdb_regs\\*\\) return now\\? \\(y or n\\) " "y" gdb_test "info sym $infcall_pc" "\r\nNo symbol matches .*" "info sym not found" -gdb_test_no_output "set unwindonsignal on" +gdb_test_no_output "set unwind-on-signal on" gdb_test "compile code *(volatile int *) 0 = 0;" \ "The program being debugged was signaled while in a function called from GDB\\.\r\nGDB has restored the context to what it was before the call\\.\r\n.*" \ "compile code segfault second" diff --git a/gdb/testsuite/gdb.compile/compile.exp b/gdb/testsuite/gdb.compile/compile.exp index 9fdd36719ae..a9717088c05 100644 --- a/gdb/testsuite/gdb.compile/compile.exp +++ b/gdb/testsuite/gdb.compile/compile.exp @@ -159,7 +159,7 @@ gdb_test "return" "\r\n#0 main .*" "return" \ "Make _gdb_expr return now\\? \\(y or n\\) " "y" gdb_test "info sym $infcall_pc" "\r\nNo symbol matches .*" "info sym not found" -gdb_test_no_output "set unwindonsignal on" +gdb_test_no_output "set unwind-on-signal on" gdb_test "compile code *(volatile int *) 0 = 0;" \ "The program being debugged was signaled while in a function called from GDB\\.\r\nGDB has restored the context to what it was before the call\\.\r\n.*" \ "compile code segfault second" diff --git a/gdb/testsuite/gdb.cp/gdb2495.exp b/gdb/testsuite/gdb.cp/gdb2495.exp index 0cb8bdd0ada..af94d959d83 100644 --- a/gdb/testsuite/gdb.cp/gdb2495.exp +++ b/gdb/testsuite/gdb.cp/gdb2495.exp @@ -104,29 +104,29 @@ if {![runto_main]} { # behaviour; it should not. Test both on and off states. # Turn on unwind on signal behaviour. -gdb_test_no_output "set unwindonsignal on" +gdb_test_no_output "set unwind-on-signal on" # Check that it is turned on. -gdb_test "show unwindonsignal" \ +gdb_test "show unwind-on-signal" \ "signal is received while in a call dummy is on.*" \ "turn on unwind on signal" # Check to see if new behaviour interferes with # normal signal handling in inferior function calls. gdb_test "p exceptions.raise_signal(1)" \ - "To change this behavior use \"set unwindonsignal off\".*" \ - "check for unwindonsignal off message" + "To change this behavior use \"set unwind-on-signal off\".*" \ + "check for unwind-on-signal off message" # And reverse - turn off again. -gdb_test_no_output "set unwindonsignal off" +gdb_test_no_output "set unwind-on-signal off" # Check that it is actually turned off. -gdb_test "show unwindonsignal" \ +gdb_test "show unwind-on-signal" \ "signal is received while in a call dummy is off.*" \ "turn off unwind on signal" # Check to see if new behaviour interferes with # normal signal handling in inferior function calls. gdb_test "p exceptions.raise_signal(1)" \ - "To change this behavior use \"set unwindonsignal on\".*" \ - "check for unwindonsignal on message" + "To change this behavior use \"set unwind-on-signal on\".*" \ + "check for unwind-on-signal on message" diff --git a/gdb/testsuite/gdb.fortran/function-calls.exp b/gdb/testsuite/gdb.fortran/function-calls.exp index f9a1efc241f..c4d1f232576 100644 --- a/gdb/testsuite/gdb.fortran/function-calls.exp +++ b/gdb/testsuite/gdb.fortran/function-calls.exp @@ -44,7 +44,7 @@ if {![runto [gdb_get_line_number "post_init"]]} { } # Use inspired by gdb.base/callfuncs.exp. -gdb_test_no_output "set unwindonsignal on" +gdb_test_no_output "set unwind-on-signal on" # Baseline: function and subroutine call with no arguments. gdb_test "p no_arg()" " = .TRUE." diff --git a/gdb/testsuite/gdb.mi/mi-syn-frame.exp b/gdb/testsuite/gdb.mi/mi-syn-frame.exp index 409fac623a7..f65d57028a5 100644 --- a/gdb/testsuite/gdb.mi/mi-syn-frame.exp +++ b/gdb/testsuite/gdb.mi/mi-syn-frame.exp @@ -97,7 +97,7 @@ mi_gdb_test "409-stack-list-frames 0 0" \ # mi_gdb_test "410-data-evaluate-expression bar()" \ - ".*410\\^error,msg=\"The program being debugged was signaled while in a function called from GDB.\\\\nGDB remains in the frame where the signal was received.\\\\nTo change this behavior use \\\\\"set unwindonsignal on\\\\\".\\\\nEvaluation of the expression containing the function\\\\n\\(bar\\) will be abandoned.\\\\nWhen the function is done executing, GDB will silently stop.\"" \ + ".*410\\^error,msg=\"The program being debugged was signaled while in a function called from GDB.\\\\nGDB remains in the frame where the signal was received.\\\\nTo change this behavior use \\\\\"set unwind-on-signal on\\\\\".\\\\nEvaluation of the expression containing the function\\\\n\\(bar\\) will be abandoned.\\\\nWhen the function is done executing, GDB will silently stop.\"" \ "call inferior function which raises exception" mi_gdb_test "411-stack-list-frames" "411\\^done,stack=\\\[frame=\{level=\"0\",addr=\"$hex\",func=\"bar\",file=\".*mi-syn-frame.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$decimal\",arch=\"$any\"},frame=\{level=\"1\",addr=\"$hex\",func=\"\"\},frame=\{level=\"2\",addr=\"$hex\",func=\"main\",file=\".*mi-syn-frame.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$decimal\",arch=\"$any\"}.*\\\]" "backtrace from inferior function at exception" diff --git a/gdb/testsuite/gdb.threads/infcall-from-bp-cond-simple.exp b/gdb/testsuite/gdb.threads/infcall-from-bp-cond-simple.exp index 8d94d24f9b3..402d8f7de69 100644 --- a/gdb/testsuite/gdb.threads/infcall-from-bp-cond-simple.exp +++ b/gdb/testsuite/gdb.threads/infcall-from-bp-cond-simple.exp @@ -174,7 +174,7 @@ proc_with_prefix run_bp_cond_segfaults { target_async target_non_stop } { "Error in testing condition for breakpoint ${bp_1_num}:" \ "The program being debugged was signaled while in a function called from GDB\\." \ "GDB remains in the frame where the signal was received\\." \ - "To change this behavior use \"set unwindonsignal on\"\\." \ + "To change this behavior use \"set unwind-on-signal on\"\\." \ "Evaluation of the expression containing the function" \ "\\(function_that_segfaults\\) will be abandoned\\." \ "When the function is done executing, GDB will silently stop\\."] diff --git a/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp b/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp index 0b08723fffa..2fa210c506f 100644 --- a/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp +++ b/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp @@ -13,7 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# Test use of unwindonsignal when a hand function call that gets interrupted +# Test use of unwind-on-signal when a hand function call that gets interrupted # by a signal in another thread. set NR_THREADS 4 @@ -52,12 +52,12 @@ gdb_test "continue" \ # We want the main thread (hand_call_with_signal) and # thread 1 (sigabrt_handler) to both run. -# Do turn on unwindonsignal. +# Do turn on unwind-on-signal. # We want to test gdb handling of the current thread changing when # unwindonsignal is in effect. -gdb_test_no_output "set unwindonsignal on" \ +gdb_test_no_output "set unwind-on-signal on" \ "setting unwindonsignal" -gdb_test "show unwindonsignal" \ +gdb_test "show unwind-on-signal" \ "Unwinding of stack .* is on." \ "showing unwindonsignal"