From patchwork Tue Mar 5 15:21:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 86800 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 C07D8385843A for ; Tue, 5 Mar 2024 15:22:27 +0000 (GMT) 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 33C85385840F for ; Tue, 5 Mar 2024 15:21:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 33C85385840F Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 33C85385840F Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709652116; cv=none; b=mO4dYYMXltHYRce249QCnbXhemh/utTRfRJlRHPc2FCVrt+Da08xt6taH3BiluPAu+oPcqoJi8xeJcPpWetz0rbRYuECAl5o0jwkLZ9Q6ffb409xjCyW8TYh06v879E2J1tKBWpgPzGq6JByBrDn1yIbh0s0gmVa0kQ6YwTXVHE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709652116; c=relaxed/simple; bh=yuhcXQP9AtwyM/hIi373kXx2Hx1X14UH4K0Xe473pn0=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=Y5PsU+OYZTl3YBRyNmXPYpLQI29GzXSSI8nV7oYhr1uSSR+g/3+aqj+TtJiUEdI0Bcuwu4jwXwjck6JdOGmz1TFz0L0Vm16Ifmo95uInopFpmQcGn4NF3OQITwYBpTfOwmH12s68RTewhHTd7mEp9bkmsyfK4WqbPoAcvcaQDHo= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709652114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oQHVR4ubD3OO3vRECMaqWaU7vhOWT4J89Fy2R2N4E3k=; b=LeZSz0N+5ipV2uOR8VgSj2Jd0veB2Xy+1Aa6cqztQBiKH+sCivCQqiry+6gXkgUNqlNrYO 86fajBQGuCOQPgh+CQHZVvwGfKaPApzHeGbxFDgTc9ZUcb282HeECTVymWmvZyst8R9ZO0 9avAzg7KpVvNvG19j5vXSBkFKXcXQss= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-190-d4WwdVuzMdGSEfGSS8UOhg-1; Tue, 05 Mar 2024 10:21:53 -0500 X-MC-Unique: d4WwdVuzMdGSEfGSS8UOhg-1 Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-558aafe9bf2so6196602a12.1 for ; Tue, 05 Mar 2024 07:21:53 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709652111; x=1710256911; 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=oQHVR4ubD3OO3vRECMaqWaU7vhOWT4J89Fy2R2N4E3k=; b=vW2C+AzyJYHQ2vVTe9Vql2mTyqpfHADsvj/Rkl6RQG7Wnnv0QsyE7S1VQob8lmhkhU dIQUMtIqzDw/rdq8eG6kTFrQbA6MqqrLbVolS5hMlDRXG2l8IaHY+rII+iU4GgnOlENI NYir63O94Px7TlD31OeyLeUF/HU1iu1SFXFS9YJt60J6BH8zuE9P3f/xgB+TDbsCNymv CZ0IFbg05YN8agSqFx4ir9Fdu/figdeZQbBzUe5IBX6T7QKwSTdAVQHXu/viHcTZ6cAm 1ppHi/F5FJQIdgs6Yh7eNd86YuvzM+2nAoxb0re/L+RXCV8XfU0VLXuiLBFCBJOWDg8k hIcA== X-Gm-Message-State: AOJu0YxrzDfgETQvPWc5qZXerCe5BX67TPjAveqZ4dNYA2UETtRrrV0R fdH47n8JanDkcpwSHW4N/kXNXU6JjwxpPSX5TukozINDDR3Aqb9WHl5/L/6sH87kRan34qkdCUP w21mCtbqqo75RequO4wt6REqmsDULzBEHMtnQiUfpkQaw9BZeG/J2EbGa+UjqicfcbFx79gtYxi YN/KJq7Kw8v168i2Gm3KRInpX7cuRxKsnttSgWVeNO2YU= X-Received: by 2002:a05:6402:2027:b0:565:e4b7:e784 with SMTP id ay7-20020a056402202700b00565e4b7e784mr7105050edb.40.1709652111275; Tue, 05 Mar 2024 07:21:51 -0800 (PST) X-Google-Smtp-Source: AGHT+IGEgdoO44XUsSpp1dcVz0n/XuIwlxolWCTSemX6EbbD7WIqAGkZt7IUe53VPVB83u4NyLLI1Q== X-Received: by 2002:a05:6402:2027:b0:565:e4b7:e784 with SMTP id ay7-20020a056402202700b00565e4b7e784mr7105027edb.40.1709652110659; Tue, 05 Mar 2024 07:21:50 -0800 (PST) Received: from localhost (185.223.159.143.dyn.plus.net. [143.159.223.185]) by smtp.gmail.com with ESMTPSA id r18-20020aa7cb92000000b005653c441a20sm5915992edt.34.2024.03.05.07.21.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Mar 2024 07:21:50 -0800 (PST) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCHv9 01/14] gdb: create_breakpoint: add asserts and additional comments Date: Tue, 5 Mar 2024 15:21:32 +0000 Message-Id: <73a9f42622184c6916d8fb37acc2a0131fee5fb7.1709651994.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=-12.3 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_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org This commit extends the asserts on create_breakpoint (in the header file), and adds some additional assertions into the definition. The new assert confirms that when the thread and inferior information is going to be parsed from the extra_string, then the thread and inferior arguments should be -1. That is, the caller of create_breakpoint should not try to create a thread/inferior specific breakpoint by *both* specifying thread/inferior *and* asking to parse the extra_string, it's one or the other. There should be no user visible changes after this commit. --- gdb/breakpoint.c | 6 ++++++ gdb/breakpoint.h | 16 ++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 102bd7fad41..7ade82663f9 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -9219,6 +9219,12 @@ create_breakpoint (struct gdbarch *gdbarch, gdb_assert (inferior == -1 || inferior > 0); gdb_assert (thread == -1 || inferior == -1); + /* If PARSE_EXTRA is true then the thread and inferior details will be + parsed from the EXTRA_STRING, the THREAD and INFERIOR arguments + should be -1. */ + gdb_assert (!parse_extra || thread == -1); + gdb_assert (!parse_extra || inferior == -1); + gdb_assert (ops != NULL); /* If extra_string isn't useful, set it to NULL. */ diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h index 226e4d06993..2e2fe1d32e5 100644 --- a/gdb/breakpoint.h +++ b/gdb/breakpoint.h @@ -1610,6 +1610,22 @@ enum breakpoint_create_flags the FORCE_CONDITION parameter is ignored and the corresponding argument is parsed from EXTRA_STRING. + The THREAD should be a global thread number, the created breakpoint will + only apply for that thread. If the breakpoint should apply for all + threads then pass -1. However, if PARSE_EXTRA is non-zero then the + THREAD parameter is ignored and an optional thread number will be parsed + from EXTRA_STRING. + + The INFERIOR should be a global inferior number, the created breakpoint + will only apply for that inferior. If the breakpoint should apply for + all inferiors then pass -1. However, if PARSE_EXTRA is non-zero then + the INFERIOR parameter is ignored and an optional inferior number will + be parsed from EXTRA_STRING. + + At most one of THREAD and INFERIOR should be set to a value other than + -1; breakpoints can be thread specific, or inferior specific, but not + both. + If INTERNAL is non-zero, the breakpoint number will be allocated from the internal breakpoint count. From patchwork Tue Mar 5 15:21:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 86802 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 BF63B3858009 for ; Tue, 5 Mar 2024 15:23:08 +0000 (GMT) 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 73A443858287 for ; Tue, 5 Mar 2024 15:21:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 73A443858287 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 73A443858287 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709652119; cv=none; b=CNS5Ha74oABSdQMe/Xavs34I+zgAtFQf6QLPL6vX6BWo8AA7Yybl6wRcbYcScMEJwOmU94aODHEt4hKCTCE5YCQ+YOsNHBNTqKZ1qsWlG+kn4yQoUbsIZ97KKp87FOiqClCehov46P+62DeLytAG1gdM0HJFOpQCVqHTh3OBhLA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709652119; c=relaxed/simple; bh=HVRmoEAusu5AALhwzT1PKqtA65QCkhxheCE4dhsZhww=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=GNorxm1MQYFwFmTr87L0WCjZLpWXE3VpzNCOiKlzehouWA0bwR0FUA57+wzujSzEQywo3vFEAb+Ti3ayfbBUZ8SYcvcDMeQzdTWQh/pXrLLRQkp8fHWFl3vYQ4jN30Krems6kF2ekqg5FbjF5iEp5EAOb7kLTzOXKtK6r1yLpYY= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709652117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OczXC7FXnZ9+/i3arkxxAcmY3KIT/jB8GXM6wvzgi74=; b=ACInYRRQT08TdCpJlqgEqTVC5yD5ncJyEvAsMUeYEbhZj3Z+6mScNmHPvvVyrD/PBnqKcO Eewz2DH9koW2Y1huM9VbwXBxk2jWhUm8KalHzRY07mb/gFgTyP6OjvzVHsx/riGYaBDiFi qSbxSBEfG5uHWvuPsznKscMCeJFU4dI= Received: from mail-lj1-f200.google.com (mail-lj1-f200.google.com [209.85.208.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-510-PagEeG6aPDm6YDQb-vHDpA-1; Tue, 05 Mar 2024 10:21:55 -0500 X-MC-Unique: PagEeG6aPDm6YDQb-vHDpA-1 Received: by mail-lj1-f200.google.com with SMTP id 38308e7fff4ca-2d29fb0dbbcso8156621fa.2 for ; Tue, 05 Mar 2024 07:21:55 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709652114; x=1710256914; 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=OczXC7FXnZ9+/i3arkxxAcmY3KIT/jB8GXM6wvzgi74=; b=YfjFcv04nYKeBlvRMSVPCzcH43AW/5SJlD7xQ+4641eXrShlk1PivL9I/HpqxbtDr5 QFp//7zxkGGF90IZreUda+fsArKAWotwYg/0QPpcESsWC+FLzzp4pkm67YiikmWIAIFm yMoZno6IADJSd8t6Nt3zEr22AHLtn2ruvIojHnVmORX9nJAyMsFLZjqtZ3LgS3uvr7J8 eJ2pL0JL8iSFoVYeFp5Jt0IkVbwnxCES+hpqC/VBVXcBXnllMAmU66UHn2r7jlmtanZP yqadWGp1/Jx2sQCkqDJ6ZxDuNm8naLQ9NhJ6rqWTArpVmKarX7GYrzMHD8CjfkPBSWHG RyGg== X-Gm-Message-State: AOJu0Yy1TfBLSWk8ckWF9+OGgvDfdDaCB0/DzdTHa+ByALzBuVgsIBAL y1dkTd3q/wy31GwKruHTN/d3YgeOtu8cPgP3ySLB3ftQgoOnK9s7gR6OMeQg8elFpk6qzeCf6pq 4h0vBasIq2MEJyXnfwtd+LE9MiSFhSZcWjR1I9pGWRazdXc6waRu4sPWHhaa+ZEYIceLrKqvA3H 5vIlpv6pm/ZlmSEJZ7YFWnhisMA0DHdY9qPVkA9fbgmcY= X-Received: by 2002:a2e:8946:0:b0:2d2:c7ab:6396 with SMTP id b6-20020a2e8946000000b002d2c7ab6396mr1692744ljk.37.1709652113436; Tue, 05 Mar 2024 07:21:53 -0800 (PST) X-Google-Smtp-Source: AGHT+IE0LxW5xc9Jq5NPBQbo4iicICroPYfzMPkw2E2oWAZkQmBINCeHk5toTZ1A6NlqqCyWs3/Ihw== X-Received: by 2002:a2e:8946:0:b0:2d2:c7ab:6396 with SMTP id b6-20020a2e8946000000b002d2c7ab6396mr1692715ljk.37.1709652112689; Tue, 05 Mar 2024 07:21:52 -0800 (PST) Received: from localhost (185.223.159.143.dyn.plus.net. [143.159.223.185]) by smtp.gmail.com with ESMTPSA id y6-20020a056402358600b005645961ad39sm5846126edc.47.2024.03.05.07.21.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Mar 2024 07:21:51 -0800 (PST) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCHv9 02/14] gdb: create_breakpoint: asserts relating to extra_string/parse_extra Date: Tue, 5 Mar 2024 15:21:33 +0000 Message-Id: <9ac1de66c5a14db651f923818b39e9e7544c6778.1709651994.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=-12.3 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_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org The goal of this commit is to better define the API for create_breakpoint especially around the use of extra_string and parse_extra. This will be useful in the next commit when I plan to make some changes to create_breakpoint. This commit makes one possibly breaking change: until this commit it was possible to create thread-specific dprintf breakpoint like this: (gdb) dprintf call_me, thread 1 "%s", "hello" Dprintf 2 at 0x401152: file /tmp/hello.c, line 8. (gdb) info breakpoints Num Type Disp Enb Address What 2 dprintf keep y 0x0000000000401152 in call_me at /tmp/hello.c:8 thread 1 stop only in thread 1 printf "%s", "hello" (gdb) This feature of dprintf was not documented, was not tested, and is slightly different in syntax to how we create thread specific breakpoints and/or watchpoints -- the thread condition appears after the first ','. I believe that this worked at all was simply by luck. We happen to pass the parse_extra flag as true from dprintf_command to create_breakpoint. So in this commit I made the choice change this. We now pass parse_extra as false from dprintf_command to create_breakpoint. With this done it is assumed that the only thing in the extra_string is the dprintf format and arguments. Beyond this change I've updated the comment on create_breakpoint in breakpoint.h, and I've then added some asserts into create_breakpoint as well as moving around some of the error handling. - We now assert on the incoming argument values, - I've moved an error check to sit after the call to find_condition_and_thread_for_sals, this ensures the extra_string was parsed correctly, In dprintf_command: - We now throw an error if there is no format string after the dprintf location. This error was already being thrown, but was being caught later in the process. With this change we catch the missing string earlier, - And, as mentioned earlier, we pass parse_extra as false when calling create_breakpoint, In create_tracepoint_from_upload: - We now throw an error if the parsed location doesn't completely consume the addr_str variable. This error has now effectively moved out of create_breakpoint. --- gdb/breakpoint.c | 41 ++++++++++++++++++++++++++++------------- gdb/breakpoint.h | 44 +++++++++++++++++++++++++++----------------- 2 files changed, 55 insertions(+), 30 deletions(-) diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 7ade82663f9..0482064d057 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -9231,6 +9231,16 @@ create_breakpoint (struct gdbarch *gdbarch, if (extra_string != NULL && *extra_string == '\0') extra_string = NULL; + /* A bp_dprintf must always have an accompanying EXTRA_STRING containing + the dprintf format and arguments -- PARSE_EXTRA should always be false + in this case. + + For all other breakpoint types, EXTRA_STRING should be nullptr unless + PARSE_EXTRA is true. */ + gdb_assert ((type_wanted == bp_dprintf) + ? (extra_string != nullptr && !parse_extra) + : (extra_string == nullptr || parse_extra)); + try { ops->create_sals_from_location_spec (locspec, &canonical); @@ -9294,6 +9304,8 @@ create_breakpoint (struct gdbarch *gdbarch, if (parse_extra) { + gdb_assert (type_wanted != bp_dprintf); + gdb::unique_xmalloc_ptr rest; gdb::unique_xmalloc_ptr cond; @@ -9302,15 +9314,15 @@ create_breakpoint (struct gdbarch *gdbarch, find_condition_and_thread_for_sals (lsal.sals, extra_string, &cond, &thread, &inferior, &task, &rest); + + if (rest.get () != nullptr && *(rest.get ()) != '\0') + error (_("Garbage '%s' at end of command"), rest.get ()); + cond_string_copy = std::move (cond); extra_string_copy = std::move (rest); } else { - if (type_wanted != bp_dprintf - && extra_string != NULL && *extra_string != '\0') - error (_("Garbage '%s' at end of location"), extra_string); - /* Check the validity of the condition. We should error out if the condition is invalid at all of the locations and if it is not forced. In the PARSE_EXTRA case above, this @@ -9521,21 +9533,18 @@ dprintf_command (const char *arg, int from_tty) /* If non-NULL, ARG should have been advanced past the location; the next character must be ','. */ - if (arg != NULL) + if (arg == nullptr || arg[0] != ',' || arg[1] == '\0') + error (_("Format string required")); + else { - if (arg[0] != ',' || arg[1] == '\0') - error (_("Format string required")); - else - { - /* Skip the comma. */ - ++arg; - } + /* Skip the comma. */ + ++arg; } create_breakpoint (get_current_arch (), locspec.get (), NULL, -1, -1, - arg, false, 1 /* parse arg */, + arg, false, 0 /* parse arg */, 0, bp_dprintf, 0 /* Ignore count */, pending_break_support, @@ -14141,6 +14150,12 @@ create_tracepoint_from_upload (struct uploaded_tp *utp) location_spec_up locspec = string_to_location_spec (&addr_str, current_language); + + + gdb_assert (addr_str != nullptr); + if (*addr_str != '\0') + error (_("Garbage '%s' at end of location"), addr_str); + if (!create_breakpoint (get_current_arch (), locspec.get (), utp->cond_string.get (), -1, -1, addr_str, diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h index 2e2fe1d32e5..6da04d5ec00 100644 --- a/gdb/breakpoint.h +++ b/gdb/breakpoint.h @@ -1595,32 +1595,42 @@ enum breakpoint_create_flags functions for setting a breakpoint at LOCSPEC. This function has two major modes of operations, selected by the - PARSE_EXTRA parameter. + PARSE_EXTRA and WANTED_TYPE parameters. - If PARSE_EXTRA is zero, LOCSPEC is just the breakpoint's location - spec, with condition, thread, and extra string specified by the - COND_STRING, THREAD, and EXTRA_STRING parameters. + When WANTED_TYPE is not bp_dprintf the following rules apply: - If PARSE_EXTRA is non-zero, this function will attempt to extract - the condition, thread, and extra string from EXTRA_STRING, ignoring - the similarly named parameters. + If PARSE_EXTRA is zero, LOCSPEC is just the breakpoint's location + spec, with condition, thread, and extra string specified by the + COND_STRING, THREAD, and EXTRA_STRING parameters. - If FORCE_CONDITION is true, the condition is accepted even when it is - invalid at all of the locations. However, if PARSE_EXTRA is non-zero, - the FORCE_CONDITION parameter is ignored and the corresponding argument - is parsed from EXTRA_STRING. + If PARSE_EXTRA is non-zero, this function will attempt to extract the + condition, thread, and extra string from EXTRA_STRING, ignoring the + similarly named parameters. + + When WANTED_TYPE is bp_dprintf the following rules apply: + + PARSE_EXTRA must always be zero, LOCSPEC is just the breakpoint's + location spec, with condition, thread, and extra string (which + contains the dprintf format and arguments) specified by the + COND_STRING, THREAD, and EXTRA_STRING parameters. + + If FORCE_CONDITION is true, the condition (in COND_STRING) is accepted + even when it is invalid at all of the locations. However, if + PARSE_EXTRA is non-zero and WANTED_TYPE is not bp_dprintf, the + FORCE_CONDITION parameter is ignored and the corresponding argument is + parsed from EXTRA_STRING. The THREAD should be a global thread number, the created breakpoint will only apply for that thread. If the breakpoint should apply for all - threads then pass -1. However, if PARSE_EXTRA is non-zero then the - THREAD parameter is ignored and an optional thread number will be parsed - from EXTRA_STRING. + threads then pass -1. However, if PARSE_EXTRA is non-zero and + WANTED_TYPE is not bp_dprintf, then the THREAD parameter is ignored and + an optional thread number will be parsed from EXTRA_STRING. The INFERIOR should be a global inferior number, the created breakpoint will only apply for that inferior. If the breakpoint should apply for - all inferiors then pass -1. However, if PARSE_EXTRA is non-zero then - the INFERIOR parameter is ignored and an optional inferior number will - be parsed from EXTRA_STRING. + all inferiors then pass -1. However, if PARSE_EXTRA is non-zero and + WANTED_TYPE is not bp_dprintf, then the INFERIOR parameter is ignored + and an optional inferior number will be parsed from EXTRA_STRING. At most one of THREAD and INFERIOR should be set to a value other than -1; breakpoints can be thread specific, or inferior specific, but not From patchwork Tue Mar 5 15:21:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 86801 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 C17F038582A5 for ; Tue, 5 Mar 2024 15:22:47 +0000 (GMT) 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 78EB338582A0 for ; Tue, 5 Mar 2024 15:21:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 78EB338582A0 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 78EB338582A0 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709652119; cv=none; b=xWmI2C7ebv9SakdCkfHeUmGkJtso03Hu1YZDB2voNJO9YE/RnQnTGlO8g4+fyi/YXxxyUIBGobiG/WiRtj7Ti4cCzY/T4pi1Czj3Q0aS529WxrvkJnfwAeyvQHTIFMsKKtkI6KP99vCpzzaH9TXakcdPBc8NhqTbNZtej07n/eA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709652119; c=relaxed/simple; bh=KxDyChrRp/VZxzH6Kp6BlpiFsVevvEXSmlPYPX/Tyq4=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=aJH70ujrtykJLBdjBmJeNvhLcMGdFjVtdzUddHRdFX16Yx8+yoa/xaTqscbS0LrWu92fGZZ0dO8uUQjusQxF4JNPWaPpYfGMttsOCfhndGt+9D2krlqSsYLWwzJbXdczePVM7dj14vSEXFVXgEpF94nlTdFhITFXelObyTKTr2U= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709652118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wJYGLkoaSFoYHvKvxPcDIiUE0RfkiitqxVfmalZToiQ=; b=RNDyOPk8AZVniK9xzKTBF7WW3ZvvkBTB1UZKfVDzNlvlr/WTklZrJLruDMF4QZsOZAD5dI o2AerEOGePzMtIfR7/E3LUHGlvy6gjFCH4afqpBfngNMayGk43afY0bs7tswkqqfFUpxuw owInecuGA4/3S285xYCQazHVWWsEZq8= Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-139-jl5KywKDP3qoFNwS3dh0aw-1; Tue, 05 Mar 2024 10:21:56 -0500 X-MC-Unique: jl5KywKDP3qoFNwS3dh0aw-1 Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-55d71ec6ef3so5441540a12.0 for ; Tue, 05 Mar 2024 07:21:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709652114; x=1710256914; 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=wJYGLkoaSFoYHvKvxPcDIiUE0RfkiitqxVfmalZToiQ=; b=jfImYQ3HLKC9WIx/EuQBXafpMMZfOTm9mGNTuSTMBHXW6d5tP+7PEQfwmbJXYlfPB/ 5wVprb3FGHA6Iu6NBKORVwWZMxUHmIkul96aPNZLF/CYjAE2HhH9j3lTbdLl/xKrEw5z MFkgardIMEE+vFhzBw/B233JYSeaMHs9RJRtHwdAsIK3lBr5H/HiTq5WrMPQ2EHj3P9N 5BGwCZth6qE53BX7Z63082z7V0RO0w9Kn8QcqUqoTSJp9hopUqnLz5iWpfq3+0Iuk0xV A2KpkBGypPyUnUAtuECZ1Zd54mpq6/nafH9vg6wyaM2Ji+54xK7/h4SiiXFuTHbmaQYj h/MQ== X-Gm-Message-State: AOJu0YzpU2Ic8+sR4l876YEhrrZS3GAxecdyRdgXIT4vHTLDiUNQEQeB boLBzbLGnzJnjuu/6ON/bVkf0GfmLvQZtu9tiBscQ9AHHhG7/W2DSTB+M59pkq1TsnsmmVECXkE TBABgGPmO4XFcphk+uwABd888tUZhJ+eDZBgSAsEGRpox2BVTitFdHh6srJXUe2mhpxOXIbNKHB 91r/f2yKuy7PhczDwxitMrxeqvRClZHrE9UAf1NX6Vz5w= X-Received: by 2002:a05:6402:222a:b0:566:2a20:fc20 with SMTP id cr10-20020a056402222a00b005662a20fc20mr8897731edb.9.1709652114053; Tue, 05 Mar 2024 07:21:54 -0800 (PST) X-Google-Smtp-Source: AGHT+IHRSBTnbp9n/+g0Xlf7yknwgQmMh1Szv8HmFnBwkb71WWelTAU6Rn/bMSIgvqWXWeoEVVgRmQ== X-Received: by 2002:a05:6402:222a:b0:566:2a20:fc20 with SMTP id cr10-20020a056402222a00b005662a20fc20mr8897714edb.9.1709652113639; Tue, 05 Mar 2024 07:21:53 -0800 (PST) Received: from localhost (185.223.159.143.dyn.plus.net. [143.159.223.185]) by smtp.gmail.com with ESMTPSA id r18-20020aa7cb92000000b005653c441a20sm5916033edt.34.2024.03.05.07.21.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Mar 2024 07:21:53 -0800 (PST) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCHv9 03/14] gdb: change 'if' to gdb_assert in update_dprintf_command_list Date: Tue, 5 Mar 2024 15:21:34 +0000 Message-Id: <1b59bf3286719bd63e4cc9caaf66e977fdf49e64.1709651994.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=-12.3 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, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org I noticed in update_dprintf_command_list that we handle the case where the bp_dprintf style breakpoint doesn't have a format and args string. However, I don't believe such a situation is possible. The obvious approach certainly already catches this case: (gdb) dprintf main Format string required If it is possible to create a dprintf breakpoint without a format and args string then I think we should be catching this case and handling it at creation time, rather than having GDB just ignore the situation later on. And so, I propose that we change the 'if' that ignores the case where the format/args string is empty, and instead assert that we do always have a format/args string. The original code, that handled an empty format/args string has existed since commit e7e0cddfb0d4, which is when dprintf support was added to GDB. If I'm correct and this situation can't ever happen then there should be no user visible changes after this commit. --- gdb/breakpoint.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 0482064d057..a7b516ab26c 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -8528,8 +8528,9 @@ update_dprintf_command_list (struct breakpoint *b) const char *dprintf_args = b->extra_string.get (); gdb::unique_xmalloc_ptr printf_line = nullptr; - if (!dprintf_args) - return; + /* Trying to create a dprintf breakpoint without a format and args + string should be detected at creation time. */ + gdb_assert (dprintf_args != nullptr); dprintf_args = skip_spaces (dprintf_args); From patchwork Tue Mar 5 15:21:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 86804 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 E1D7E38582A0 for ; Tue, 5 Mar 2024 15:23:29 +0000 (GMT) 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 7249B3858C54 for ; Tue, 5 Mar 2024 15:22:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7249B3858C54 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 7249B3858C54 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709652122; cv=none; b=a4DRT7+Y64+ixDd+PhvwyQm+Zy1SEpVAnYsmA6GzJEs6SjZObTejQ0Wp2DFjLCbQ2s70uRq+t8PWFt1/hOYViRNZp/WqCNwNZXkT5r/alg9PLjgM/7CiAwV/8mIRIEFhnh7/GRDXWdkz72JOOCh269Xn4VG0EFcm9KMzQBFYCP8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709652122; c=relaxed/simple; bh=xX7gfp+q9hvQhOrQAgQWEDuPG9t4nDuVZd4bHZnpsBQ=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=GMbBTOZOHFpClXL7E+kA+4csZXUQgI8sDOXCbQouUvdWLGbpIF14urgXY1m3U1uQWpQvTgXJsktQAPcX6amnGmOLGS89xYAbCEY3iZDmxQz0f2DEh9AMX6odDp7Nox5Ds6STiNnaMDnoU5Iq7xSQoitPTKfakdCSHMl/LlGCHag= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709652120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gviLLqmFEPp0wOPb6mrZPYmYc6aU483ORr20Nve4/p4=; b=FzDpUNvgwLyuohfB+RJRBlbHEa74DLKaxx/0dR/MgzaiLPkgSZQFRqfbVOzpjk6No8wLOC kDIV8dBxBGXgZ5q1nME4sXCQk7B3dF6bVEWsvtQy9h6rJrlRMHqbaqoI8afJDVEIofxp2N knbLD94jgY8Fzabgv+P+21aNrzTVynk= Received: from mail-lf1-f71.google.com (mail-lf1-f71.google.com [209.85.167.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-383-q2FdICCyMNGhvlGV5OXb0A-1; Tue, 05 Mar 2024 10:21:58 -0500 X-MC-Unique: q2FdICCyMNGhvlGV5OXb0A-1 Received: by mail-lf1-f71.google.com with SMTP id 2adb3069b0e04-51345bb1c89so2746575e87.1 for ; Tue, 05 Mar 2024 07:21:58 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709652116; x=1710256916; 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=gviLLqmFEPp0wOPb6mrZPYmYc6aU483ORr20Nve4/p4=; b=f1cxxN8/I4Zj6h39aBry+qAyGaUJ84nSuNVIfnYNuhk9rRRzuU7LGzB4XGMX3UwPty xPquBNw4LeNgJRjALz58wtwdjMU5uSypF0Nu+1Cb7Z+hYQNdJc8qe+v9Z6E1sUisTtVp vkMIzHMmk2ekdTQ6K2zFy0M6PG0YRmfuf1G9G4UG2tdw+nZpOeYX2GypgZcNIFUy4yW8 vTj/NglWk8YuSrRaikAzAJ6lq5P6nSFQJMkaOzvW6KVsQ7RU4+Ce/dGX9jqNWCechf61 8DmUi1bfMDMy5IyevaOjsH1Edzasm17mAFtzcD8n7xzIctgKpa1w60XkJus+kMqccCnk fr1w== X-Gm-Message-State: AOJu0Ywi8wQDtzOfxzoDuywUYVHK2xFd9wYIOEFCNz++tszg0+pnqqP+ 4LtGC0kQ+Bh+IoCGhYn8DfM/eQEBKl4XRTekSyLeiTimVuRNHm3r57TPFCg9xx4/Gczf6gBuxG9 AKQK7G2CtJeW23eyr32jSyS8a4zG4tRE1zsVkP8+bE8SlI7qB/lI/jF5VEQXXHT4QcX/hGWjEIM /e6CfBV7lokZyAWUvaGzjEb1qMF/IBmsDgQTR0uM9OZbc= X-Received: by 2002:a2e:9dcb:0:b0:2d3:f0e7:6bcd with SMTP id x11-20020a2e9dcb000000b002d3f0e76bcdmr1569059ljj.40.1709652116648; Tue, 05 Mar 2024 07:21:56 -0800 (PST) X-Google-Smtp-Source: AGHT+IFatV/LK7DIyMuOfUXNlcZjpnXd6wT5P5v1HOqCKbUZQ6XSiQA4qgAyndvd8ScDx5UH/6Dl6Q== X-Received: by 2002:a2e:9dcb:0:b0:2d3:f0e7:6bcd with SMTP id x11-20020a2e9dcb000000b002d3f0e76bcdmr1569045ljj.40.1709652116274; Tue, 05 Mar 2024 07:21:56 -0800 (PST) Received: from localhost (185.223.159.143.dyn.plus.net. [143.159.223.185]) by smtp.gmail.com with ESMTPSA id z6-20020a05640240c600b005670d2c253csm3751395edb.13.2024.03.05.07.21.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Mar 2024 07:21:54 -0800 (PST) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCHv9 04/14] gdb: the extra_string in a dprintf breakpoint is never nullptr Date: Tue, 5 Mar 2024 15:21:35 +0000 Message-Id: <4f415e1a1abea8d9b4e9e8c8837dd7e17097a005.1709651994.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=-12.3 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, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Given the changes in the previous couple of commits, this commit cleans up some of the asserts and 'if' checks related to the extra_string within a dprintf breakpoint. This commit: 1. Adds some asserts to update_dprintf_command_list about the breakpoint type, and that the extra_string is not nullptr, 2. Given that we know extra_string is not nullptr (this is enforced when the breakpoint is created), we can simplify code_breakpoint::code_breakpoint -- it no longer needs to check for the extra_string is nullptr case, 3. In dprintf_breakpoint::re_set we can remove the assert (this will be checked within update_dprintf_command_list, we can also remove the redundant 'if' check. There should be no user visible changes after this commit. --- gdb/breakpoint.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index a7b516ab26c..437dd082fde 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -8525,6 +8525,9 @@ bp_loc_is_permanent (struct bp_location *loc) static void update_dprintf_command_list (struct breakpoint *b) { + gdb_assert (b->type == bp_dprintf); + gdb_assert (b->extra_string != nullptr); + const char *dprintf_args = b->extra_string.get (); gdb::unique_xmalloc_ptr printf_line = nullptr; @@ -8698,12 +8701,7 @@ code_breakpoint::code_breakpoint (struct gdbarch *gdbarch_, /* Dynamic printf requires and uses additional arguments on the command line, otherwise it's an error. */ if (type == bp_dprintf) - { - if (extra_string != nullptr) - update_dprintf_command_list (this); - else - error (_("Format string required")); - } + update_dprintf_command_list (this); else if (extra_string != nullptr) error (_("Garbage '%s' at end of command"), extra_string.get ()); } @@ -12419,9 +12417,6 @@ dprintf_breakpoint::re_set () { re_set_default (); - /* extra_string should never be non-NULL for dprintf. */ - gdb_assert (extra_string != NULL); - /* 1 - connect to target 1, that can run breakpoint commands. 2 - create a dprintf, which resolves fine. 3 - disconnect from target 1 @@ -12432,8 +12427,7 @@ dprintf_breakpoint::re_set () answers for target_can_run_breakpoint_commands(). Given absence of finer grained resetting, we get to do it all the time. */ - if (extra_string != NULL) - update_dprintf_command_list (this); + update_dprintf_command_list (this); } /* Implement the "print_recreate" method for dprintf. */ From patchwork Tue Mar 5 15:21:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 86803 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 A7D1C38582A0 for ; Tue, 5 Mar 2024 15:23:23 +0000 (GMT) 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 91FB938582A2 for ; Tue, 5 Mar 2024 15:22:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 91FB938582A2 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 91FB938582A2 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709652123; cv=none; b=sHO1ocKSCJUhMSlVRU5kyFTPJhIHDJAbB47NwHi7h9drHTB3XK1Ibbfk5lZ58LwAJ+WUSE5mthsOFDRDxAz/8iKbVGK4Mz2xa93Cki/ySkqceO5vDIsBETT3eI/FFMBMUbqYDRNFQLyP00mijceDzotDt+sro20Tf9bAE0iwIoc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709652123; c=relaxed/simple; bh=iD7WX/bVcuO0vw7UkUw9eJD1yomvFEPczG9mkyrV17s=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=QJU2LY7Tqcqtz65HsYh/Xyh0e/88eFT0wyk00DsTBrJZgiPcqZ1m8bGsApkuMd+Je/2ucag0odSmV93Hi7b1BgwAim43CwHU31smYpfU6cy4olXXVf/RzlE/E7bg2PcBRK82PKbiagb0W2/H6kuJLv7gNInjC/gVNUZe2uznZOE= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709652121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZLt+vWxMS2y0vWUboa7D6JrnkSlkbthnM/O629+lvCA=; b=crXbD3ZHJwk9ymmcB1xgb/3ML5CdPJuSxfG2YUfFUrkFC18oxmTYOYhOX9OiRwkxQFtzIX COwb5YIAm1MPvACTEK29X83kRykKV599IUppfO3PTaHTivKJEx7IC8KTIcE4nS/XPlHWsj CYcj7zLELh+fyjH5HZzsEIr39XV5l9Q= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-279-_R0mN8XTNtuA9cWzyP738g-1; Tue, 05 Mar 2024 10:21:59 -0500 X-MC-Unique: _R0mN8XTNtuA9cWzyP738g-1 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-a4585db429bso91208866b.0 for ; Tue, 05 Mar 2024 07:21:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709652117; x=1710256917; 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=ZLt+vWxMS2y0vWUboa7D6JrnkSlkbthnM/O629+lvCA=; b=PRsz9cBaC2nPHXPGkmAZfwkzxdtg1JyPwsbTnd8l11fKWMeSSNBws24CNobKlBK59T ZgKnuYjnuldoqOQuahHVQWnhclr6Z86laEJqyWOo6XKeEAvKYRP2TF5l2nm8sSxoLCUN /TAZvnH8hljnVi4LP6CJ/75r3nhobWp3f6FTcTtY2FF7rd7bwUqRCaI0z6gKNAUnnB/F q1atUOQeDZlCscb3J67xMHfToBnCF9+/2doQFoMxbYpQFQ7+w3F+fPpT671644lvshMr zpYMFL4YX2AGUbOAP4HNEY62dhZxY+C8Tlk7/Qx+gkPeWAuawPZOq4eKi/96O8MntN24 upvw== X-Gm-Message-State: AOJu0YxZ4cfm8DK7+HrhMQ0hS56hOI/5l0X45U6L4KfChPeKAAn8M5JC Qsi7GcB1k0Nqalt0+/ZtGuXJDwoApx5PR88VB0s7pDpc9qGpN4sH7+rKLMqaEKYXOck8QGAjcTd 1txUezwzAb9SQH/RafYIdYaC3Zm4s6InjMYWzor1o+yAzwAMpNd1kVeISy1vio5DquTop3WlkVF 9apIhvxXOPafOk8TSKwby0uGoEzRmY2hDgLzRGAiIZJj8= X-Received: by 2002:a17:906:7f99:b0:a45:a450:ae4 with SMTP id f25-20020a1709067f9900b00a45a4500ae4mr1884101ejr.13.1709652117684; Tue, 05 Mar 2024 07:21:57 -0800 (PST) X-Google-Smtp-Source: AGHT+IHrprczBzpNAk0hHiSgz0WRfTK+nrTpAqs1L4JRVpgJ6T2NfB+p9757MVsdMpLJugESIknwcw== X-Received: by 2002:a17:906:7f99:b0:a45:a450:ae4 with SMTP id f25-20020a1709067f9900b00a45a4500ae4mr1884090ejr.13.1709652117420; Tue, 05 Mar 2024 07:21:57 -0800 (PST) Received: from localhost (185.223.159.143.dyn.plus.net. [143.159.223.185]) by smtp.gmail.com with ESMTPSA id br25-20020a170906d15900b00a44fcdf20d1sm3538790ejb.189.2024.03.05.07.21.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Mar 2024 07:21:56 -0800 (PST) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCHv9 05/14] gdb: build dprintf commands just once in code_breakpoint constructor Date: Tue, 5 Mar 2024 15:21:36 +0000 Message-Id: <3119a0dcb07fbcb9b0232e92af308653005de7fa.1709651994.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=-12.3 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, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org I noticed in code_breakpoint::code_breakpoint that we are calling update_dprintf_command_list once for each breakpoint location, when we really only need to call this once per breakpoint -- the data updated by this function, the breakpoint command list -- is per breakpoint, not per breakpoint location. Calling update_dprintf_command_list multiple times is just wasted effort, there's no per location error checking, we don't even pass the current location to the function. This commit moves the update_dprintf_command_list call outside of the per-location loop. There should be no user visible changes after this commit. --- gdb/breakpoint.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 437dd082fde..c9023a13d6c 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -8697,15 +8697,15 @@ code_breakpoint::code_breakpoint (struct gdbarch *gdbarch_, /* Do not set breakpoint locations conditions yet. As locations are inserted, they get sorted based on their addresses. Let the list stabilize to have reliable location numbers. */ - - /* Dynamic printf requires and uses additional arguments on the - command line, otherwise it's an error. */ - if (type == bp_dprintf) - update_dprintf_command_list (this); - else if (extra_string != nullptr) - error (_("Garbage '%s' at end of command"), extra_string.get ()); } + /* Dynamic printf requires and uses additional arguments on the + command line, otherwise it's an error. */ + if (type == bp_dprintf) + update_dprintf_command_list (this); + else if (extra_string != nullptr) + error (_("Garbage '%s' at end of command"), extra_string.get ()); + /* The order of the locations is now stable. Set the location condition using the location's number. */ int loc_num = 1; From patchwork Tue Mar 5 15:21:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 86805 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 2B2D838582B5 for ; Tue, 5 Mar 2024 15:23:33 +0000 (GMT) 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 B722E38582AA for ; Tue, 5 Mar 2024 15:22:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B722E38582AA Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org B722E38582AA Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709652125; cv=none; b=g/eibr1gfXiABndLzS4HPixrIjVrF6BT3Mi9fXRsXTEOlIsHoA0/yeunwHNuB0Q3zm7gGDbqFbMfMSj7es9XgzFLUTpktHScQ5JmoJutHa+DFIxYFEigPv86EwcCbZNLo+qdSJV23u+8ko0tz/YTbaUrVoh0J4LsIBxzfkQCEDk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709652125; c=relaxed/simple; bh=SHLEteX0aRTogpOsKuq67MhGmNEE1t+SBOIdySCF7H0=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=LKqHL9Pn8J437R3Q6Tk/5JdXktC6zoXBkONjbNL1WuDebKVom+Fv7JysEWS7+PubocBvVAbUhkXrTQZop6W8Y3FlmSyfcBh4+6B2L7w7L1znwHfFLCSTCQdpRwAOZfMsGHRQrlQjW7E0yoil+VS1l3B6Q6X3hl+xqE+XSMNlB20= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709652122; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BCh/Z6wl1CCyaD1JsXboMKfAaxjeeplEoNjNnnQAuOw=; b=Wr0W7/YUQdhMu/q0X9FOrkGvgrMCfB3fOmHjMQCVnNc0yEo9+IXTw23657A0ZnEYjPQ6i4 g1NOLEX2MbBJKnay9zB2xfWsl0PEXtc1LVaBzdXSDGjBeQKty/gqQkuHZMQdDqGLqCzfrF OxYLW7XVLgX1RekQgCW/Fe9Vj6QOilk= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-148-d1rEeRVdPrej0yrj3kEsbA-1; Tue, 05 Mar 2024 10:22:01 -0500 X-MC-Unique: d1rEeRVdPrej0yrj3kEsbA-1 Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-566ae32611eso5497291a12.1 for ; Tue, 05 Mar 2024 07:22:00 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709652119; x=1710256919; 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=BCh/Z6wl1CCyaD1JsXboMKfAaxjeeplEoNjNnnQAuOw=; b=aJ5E97NOnoHh0Dw9J9DYjNaXYgAoFh7dvVzQKq7E3GvmCgU6pJS9v9LSG50j7t6whS zWYNhYTfKmisSFew6PD4J9wqeK88iyDcndZ0WVpeiqLl1h0TlGZ330GV8kWgI7k3QwWg JHBeoceMxsJL1jk10awmJv+gLXBEZuMYbLA8TS0AKmGFR6vx6yjrgeRzDGBvOqOlpt5t hH2CP16Slu8gO956mbogYASFeRn6GrAv85ZrKoiDAJBtdYETwxamsTGUmqRQPwUkAve5 KS7fGeWCdpx9l3kh00ra6xAlL+vfNvZN55fe5jKBjhjTAp2nGFMMjRB2bVczfoNRNbOF uh6A== X-Gm-Message-State: AOJu0YwpDqck4I1DWwOrESlofNTjDfrmghzwtFdI7SWVZCiMTh2RIdha 2lK/aHRfzlWscSJMpwT2exhD6LclWgiFlx7NU/5+2zfUm7L2ZRLLsgYa2TMwPLQPWOMVaEeGOqX QGOUIivbdLAy5utvcPr7AqEw3vDejMp82kg8gxOL1fDUtR1DYMP31HJRsEX7gomIWT+6UgdjfKf yJ2+jLKmGUuMeY8RqeqpbmIht5Ur4HnTK8qE1WR0Se0r8= X-Received: by 2002:a50:85c3:0:b0:566:5cd2:873 with SMTP id q3-20020a5085c3000000b005665cd20873mr3192690edh.4.1709652119470; Tue, 05 Mar 2024 07:21:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IG3Z2BaSze9NRYmgA4rfHGB+l6nmL9kpE0PBn2QoT2kscrk/q61N5XDTZO6gyMxVXZpnvIysA== X-Received: by 2002:a50:85c3:0:b0:566:5cd2:873 with SMTP id q3-20020a5085c3000000b005665cd20873mr3192660edh.4.1709652118863; Tue, 05 Mar 2024 07:21:58 -0800 (PST) Received: from localhost (185.223.159.143.dyn.plus.net. [143.159.223.185]) by smtp.gmail.com with ESMTPSA id em2-20020a056402364200b00567a2564ab5sm455219edb.67.2024.03.05.07.21.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Mar 2024 07:21:58 -0800 (PST) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCHv9 06/14] gdb: don't display inferior list for pending breakpoints Date: Tue, 5 Mar 2024 15:21:37 +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=-12.3 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_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org I noticed that in the 'info breakpoints' output, GDB sometimes prints the inferior list for pending breakpoints, this doesn't seem right to me. A pending breakpoint has no locations (at least, as far as we display things in the 'info breakpoints' output), so including an inferior list seems odd. Here's what I see right now: (gdb) info breakpoint 5 Num Type Disp Enb Address What 5 breakpoint keep y foo inf 1 (gdb) It's the 'inf 1' at the end of the line that I'm objecting too. To trigger this behaviour we need to be in a multi-inferior debug session. The breakpoint must have been non-pending at some point in the past, and so have a location assigned to it. The breakpoint becomes pending again as a result of a shared library being unloaded. When this happens the location itself is marked pending (via bp_location::shlib_disabled). In print_one_breakpoint_location, in order to print the inferior list we check that the breakpoint has a location, and that we have multiple inferiors, but we don't check if the location itself is pending. This commit adds that check, which means the output is now: (gdb) info breakpoint 5 Num Type Disp Enb Address What 5 breakpoint keep y foo (gdb) Which I think makes more sense -- indeed, the format without the inferior list is what we display for a pending breakpoint that has never had any locations assigned, so I think this change in behaviour makes GDB more consistent. --- gdb/breakpoint.c | 2 +- gdb/testsuite/gdb.multi/pending-bp-lib.c | 22 ++++ gdb/testsuite/gdb.multi/pending-bp.c | 66 ++++++++++++ gdb/testsuite/gdb.multi/pending-bp.exp | 126 +++++++++++++++++++++++ 4 files changed, 215 insertions(+), 1 deletion(-) create mode 100644 gdb/testsuite/gdb.multi/pending-bp-lib.c create mode 100644 gdb/testsuite/gdb.multi/pending-bp.c create mode 100644 gdb/testsuite/gdb.multi/pending-bp.exp diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index c9023a13d6c..aae1b932a5d 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -6587,7 +6587,7 @@ print_one_breakpoint_location (struct breakpoint *b, } } - if (loc != NULL && !header_of_multiple) + if (loc != nullptr && !header_of_multiple && !loc->shlib_disabled) { std::vector inf_nums; int mi_only = 1; diff --git a/gdb/testsuite/gdb.multi/pending-bp-lib.c b/gdb/testsuite/gdb.multi/pending-bp-lib.c new file mode 100644 index 00000000000..15d1b9833dd --- /dev/null +++ b/gdb/testsuite/gdb.multi/pending-bp-lib.c @@ -0,0 +1,22 @@ +/* Copyright 2023 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +int global_var = 0; + +void +foo (int arg) +{ + global_var = arg; +} diff --git a/gdb/testsuite/gdb.multi/pending-bp.c b/gdb/testsuite/gdb.multi/pending-bp.c new file mode 100644 index 00000000000..879e0b11ac7 --- /dev/null +++ b/gdb/testsuite/gdb.multi/pending-bp.c @@ -0,0 +1,66 @@ +/* Copyright 2023 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#include +#include + +void +breakpt (void) +{ + /* Nothing. */ +} + +volatile int global_counter = 0; + +volatile int call_count = 1; + +int +main (void) +{ + void *handle; + void (*func)(int); + + /* Some filler work so that we don't initially stop on the breakpt call + below. */ + ++global_counter; + + breakpt (); /* Break before open. */ + + /* Now load the shared library. */ + handle = dlopen (SHLIB_NAME, RTLD_LAZY); + if (handle == NULL) + abort (); + + breakpt (); /* Break after open. */ + + /* Find the function symbol. */ + func = (void (*)(int)) dlsym (handle, "foo"); + + for (; call_count > 0; --call_count) + { + /* Call the library function. */ + func (1); + } + + breakpt (); /* Break before close. */ + + /* Unload the shared library. */ + if (dlclose (handle) != 0) + abort (); + + breakpt (); /* Break after close. */ + + return 0; +} diff --git a/gdb/testsuite/gdb.multi/pending-bp.exp b/gdb/testsuite/gdb.multi/pending-bp.exp new file mode 100644 index 00000000000..478d8d7c037 --- /dev/null +++ b/gdb/testsuite/gdb.multi/pending-bp.exp @@ -0,0 +1,126 @@ +# Copyright 2023 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Tests related to pending breakpoints in a multi-inferior environment. + +require allow_shlib_tests !use_gdb_stub + +standard_testfile + +set libname $testfile-lib +set srcfile_lib $srcdir/$subdir/$libname.c +set binfile_lib [standard_output_file $libname.so] + +if { [gdb_compile_shlib $srcfile_lib $binfile_lib {}] != "" } { + untested "failed to compile shared library 1" + return -1 +} + +set binfile_lib_target [gdb_download_shlib $binfile_lib] + +if { [build_executable "failed to prepare" $testfile $srcfile \ + [list debug \ + additional_flags=-DSHLIB_NAME=\"$binfile_lib_target\" \ + shlib_load]] } { + return -1 +} + +# Start two inferiors, both running the same test binary. The arguments +# INF_1_STOP and INF_2_STOP are source code patterns that are passed to +# gdb_get_line_number to figure out where each inferior should be stopped. +# +# This proc does a clean_restart and leaves inferior 2 selected. Also the +# 'breakpoint pending' flag is enabled, so pending breakpoints can be created +# without GDB prompting the user. +proc do_test_setup { inf_1_stop inf_2_stop } { + clean_restart ${::binfile} + + gdb_locate_shlib $::binfile_lib + + if {![runto_main]} { + return false + } + + gdb_breakpoint [gdb_get_line_number ${inf_1_stop}] temporary + gdb_continue_to_breakpoint "move inferior 1 into position" + + gdb_test "add-inferior -exec ${::binfile}" \ + "Added inferior 2.*" "add inferior 2" + gdb_test "inferior 2" "Switching to inferior 2 .*" "switch to inferior 2" + + if {![runto_main]} { + return false + } + + gdb_breakpoint [gdb_get_line_number ${inf_2_stop}] temporary + gdb_continue_to_breakpoint "move inferior 2 into position" + + gdb_test_no_output "set breakpoint pending on" + + return true +} + +# Check that when a breakpoint is in the pending state, but that breakpoint +# does have some locations (those locations themselves are pending), GDB +# doesn't display the inferior list in the 'info breakpoints' output. +proc_with_prefix test_no_inf_display {} { + do_test_setup "Break before open" "Break before open" + + # Create a breakpoint on 'foo'. As the shared library (that + # contains foo) has not been loaded into any inferior yet, then + # there will be no locations and the breakpoint will be created + # pending. Pass the 'allow-pending' flag so the gdb_breakpoint + # correctly expects the new breakpoint to be pending. + gdb_breakpoint "foo" allow-pending + set bpnum [get_integer_valueof "\$bpnum" "*INVALID*" \ + "get foo breakpoint number"] + + # Check the 'info breakpoints' output; the breakpoint is pending with + # no 'inf X' appearing at the end of the line. + gdb_test "info breakpoint $bpnum" \ + "$bpnum\\s+breakpoint\\s+keep\\s+y\\s+\\s+foo" \ + "check info bp before locations have been created" + + # Now select inferior 1 and allow the inferior to run forward to the + # point where a breakpoint location for foo will have been created. + gdb_test "inferior 1" "Switching to inferior 1 .*" + gdb_breakpoint [gdb_get_line_number "Break after open"] temporary + gdb_continue_to_breakpoint \ + "move inferior 1 until a location has been added" + + # Check the 'info breakpoints' output. Notice we display the inferior + # list at the end of the breakpoint line. + gdb_test "info breakpoint $bpnum" \ + "$bpnum\\s+breakpoint\\s+keep\\s+y\\s+$::hex\\s+\]*>\\s+inf 1" \ + "check info breakpoints while breakpoint is inserted" + + # Continue inferior 1 until the shared library has been unloaded. The + # breakpoint on 'foo' will return to the pending state. We will need to + # 'continue' twice as the first time will hit the 'foo' breakpoint. + gdb_breakpoint [gdb_get_line_number "Break after close"] temporary + gdb_continue_to_breakpoint "hit the breakpoint in foo" + gdb_continue_to_breakpoint "after close library" + + # Check the 'info breakpoints' output, check there is no 'inf 1' at the + # end of the breakpoint line. + gdb_test "info breakpoint $bpnum" \ + [multi_line \ + "$bpnum\\s+breakpoint\\s+keep\\s+y\\s+\\s+foo" \ + "\\s+breakpoint already hit 1 time"] \ + "check info breakpoints while breakpoint is pending" +} + +# Run all the tests. +test_no_inf_display From patchwork Tue Mar 5 15:21:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 86807 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 53CA63858282 for ; Tue, 5 Mar 2024 15:24:13 +0000 (GMT) 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 AA1DE38582B5 for ; Tue, 5 Mar 2024 15:22:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AA1DE38582B5 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org AA1DE38582B5 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709652131; cv=none; b=fOfR9eFRB9DmWtItgwF4wna22Jg1HnoFwGAyOu5iSMt+sou4FQdaNEB/U57zmbbTWPHjljzieuDt2UX0SCi+iAlmRSjoncAgsgp53zLbUNIYQ0lz9SUHRGgqlNMCUadjRARbqJDzt2niE1bXQunvsHB+HPJvuI51lk5ZCn0fEek= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709652131; c=relaxed/simple; bh=MuEY32hUfqxXrPxFgmwNaR07Si8UXwqQmkMYa8LlWE0=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=alu/dntBzITszRVsMEux8FDW1yi40LwnyT6aGIU4BD0vXoNhmhgIPW0k5KhQNwdYN1tsxoWkbrcSMkcS/byZg+4R0djs9iNPu4sSrgZxXwuP/MCj1fbdlX7z6U9hqCdgdRRIoF+a14y4oDZ3MAwNVSuIBj7mTXf7dc6ei3tG83w= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709652125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+d7s2oX3AeLev582oG3v6tLz5GSs1KhEiXjOZEI+wa0=; b=Y2ODJX7/RoH8ZjV9Rg3ER4sZx27wuDMnB3q4Q/TwPDK6qinZJ0EJUuzKTGgrecSHPkv9jn KQ0R5t5EIcJX54gzJA4uPNq2FGa5vu/K1ehZNuBOmT5nTOqz6Djhkb6l25LtguBzm4gsDk yJkZypsiBSvvvjRfB4skewr1YyHm890= Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-564-6sNMw89QObqrKrWSQm2sEA-1; Tue, 05 Mar 2024 10:22:03 -0500 X-MC-Unique: 6sNMw89QObqrKrWSQm2sEA-1 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-a45a7d558feso87799766b.0 for ; Tue, 05 Mar 2024 07:22:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709652120; x=1710256920; 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=+d7s2oX3AeLev582oG3v6tLz5GSs1KhEiXjOZEI+wa0=; b=oXHbHvWOs5iZAqty+Td+MzVR925Uw9rQL37eqL/k/NlEudqCY6BnnEGpuglicaIUDh rU5aAqNwazrlbkkwK4XlL+AMhoznhwctRDsxjkqiyOpNFJGiK776UgNZmzDY9YTr0Fhm A1zX22G/b9niQtC3j0iKKZJcQdIa8Pfcd8D423StNVAr6Ov7S0ixBVntl7mWbMSzyU1T w1z4+79VD5YBjHj2xi0ZX39kNedBe7i/mKyYF2+Vm49gvUyiW7XjGtNcwuJrsk+EI2QH b//4tRLir+ejgIVuCSuda0f9kVwFtRo7jP5GZPbOv4w2Tai6qBgEaR09I3wvQcDmNbFB ZtGg== X-Gm-Message-State: AOJu0YzWliTmZExaza7PVVord+TKU6U/rOASGp8+gnH6/c+BKlva/EK2 Ju6dmyzI14PW7GcybYFFx3tXcE+JqifZA7qp82AgVyiGnVt7YGgFDfC1FC3BwAy/TYoHi5+Mrcf CEdSdyp+YCap+TVbUa5KIixbGWoTXMI82F32s5eOBia8O5q3+9hczy8Hn9pLn8I8vAxNex+HHrQ XEohs/i5l6mISIxgBzQw2xZlOZfq1HKdXJE17uJH9DRig= X-Received: by 2002:a17:906:f751:b0:a45:566a:b652 with SMTP id jp17-20020a170906f75100b00a45566ab652mr3134913ejb.11.1709652120173; Tue, 05 Mar 2024 07:22:00 -0800 (PST) X-Google-Smtp-Source: AGHT+IGQmCIaChvWg0EcPsk+Y0nBbTWJ4wGPliTV++jZk1RDt1s9UrjPnHvWr7Yham9bMvvC3GRwcg== X-Received: by 2002:a17:906:f751:b0:a45:566a:b652 with SMTP id jp17-20020a170906f75100b00a45566ab652mr3134888ejb.11.1709652119767; Tue, 05 Mar 2024 07:21:59 -0800 (PST) Received: from localhost (185.223.159.143.dyn.plus.net. [143.159.223.185]) by smtp.gmail.com with ESMTPSA id x23-20020a170906135700b00a3e4c47bad1sm6113511ejb.8.2024.03.05.07.21.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Mar 2024 07:21:59 -0800 (PST) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCHv9 07/14] gdb: remove breakpoint_re_set_one Date: Tue, 5 Mar 2024 15:21:38 +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=-12.3 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_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org During a later patch I wanted to reset a single breakpoint, so I called breakpoint_re_set_one. However, this is not the right thing to do. If we look at breakpoint_re_set then we see that there's a whole bunch of state that needs to be preserved prior to calling breakpoint_re_set_one, and after calling breakpoint_re_set_one we still need to call update_global_location_list. I could just update the comment on breakpoint_re_set_one to make it clearer how the function should be used -- or more likely to warn that the function should only be used as a helper from breakpoint_re_set. However, breakpoint_re_set_one is only 3 lines long. So I figure it might actually be easier to just fold breakpoint_re_set_one into breakpoint_re_set, then there's no risk of accidentally calling breakpoint_re_set_one when we shouldn't. There should be no user visible changes after this commit. --- gdb/breakpoint.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index aae1b932a5d..5e97d27bbf5 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -13210,17 +13210,6 @@ create_sals_from_location_spec_default (location_spec *locspec, parse_breakpoint_sals (locspec, canonical); } -/* Reset a breakpoint. */ - -static void -breakpoint_re_set_one (breakpoint *b) -{ - input_radix = b->input_radix; - set_language (b->language); - - b->re_set (); -} - /* Re-set breakpoint locations for the current program space. Locations bound to other program spaces are left untouched. */ @@ -13232,12 +13221,11 @@ breakpoint_re_set (void) scoped_restore save_input_radix = make_scoped_restore (&input_radix); scoped_restore_current_pspace_and_thread restore_pspace_thread; - /* breakpoint_re_set_one sets the current_language to the language - of the breakpoint it is resetting (see prepare_re_set_context) - before re-evaluating the breakpoint's location. This change can - unfortunately get undone by accident if the language_mode is set - to auto, and we either switch frames, or more likely in this context, - we select the current frame. + /* To ::re_set each breakpoint we set the current_language to the + language of the breakpoint before re-evaluating the breakpoint's + location. This change can unfortunately get undone by accident if + the language_mode is set to auto, and we either switch frames, or + more likely in this context, we select the current frame. We prevent this by temporarily turning the language_mode to language_mode_manual. We restore it once all breakpoints @@ -13254,7 +13242,9 @@ breakpoint_re_set (void) { try { - breakpoint_re_set_one (&b); + input_radix = b.input_radix; + set_language (b.language); + b.re_set (); } catch (const gdb_exception &ex) { From patchwork Tue Mar 5 15:21:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 86810 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 B5FC138582A4 for ; Tue, 5 Mar 2024 15:24:51 +0000 (GMT) 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 49A693858295 for ; Tue, 5 Mar 2024 15:22:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 49A693858295 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 49A693858295 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709652132; cv=none; b=Ydtb4T6eaGza2Ddm2Q1z9xnX8aWw3vA26KUXtkodzGXuVJ/0Y9NVUHMovfW896lTQoa7zLTt5cmwIK4tp+ZWP9f3J00vnbP3HfkRUJRzLsW/pkflpJ2esfdpznpjQiFScEFd6xiWHdbN6kcQrMHaldvAOcbZXxORlby9lJhSAhw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709652132; c=relaxed/simple; bh=rMDVT4aLVAht2rIHz28iBjVL8SxAv8dTSZsTbOaNc08=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=Is4FcSA7xxg5aGiNM9Pt3dZlsKsVLReg0f1Lwx/gO7npJ4Xyu6XLqREBeZef+BdFpzrNXCzQCJ4uK7DlyA0uKcFmdeOL0mCT04vbZ/33mbqiO+YptJoPXFABjkd9sCwEEhbjYTZDiOMFg9nvXvmJUKa8RpstEswyz1P9Jtri2Dw= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709652127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Meix3qi/b5eOZGN0myvIRI+Org+CLcNrM4/lpre9M6M=; b=Z892lbFknC0lgpF3OXnpL4z8pv938XZwKJqU8E9YylU1UHFTap24Of6aK/YoUOy0ooAlHu o1MwYKrKFw3Vv7/dZ9NZbxeIlwSjrEbxeA5l59NIaRfsuuwIlv9npCIfKROHtm3oRyoLlF 0Fjr4s7sJtoI8DXkytgiuEoBq5tRcnU= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-452-VC1leMUSNIm9zD40g2zUyA-1; Tue, 05 Mar 2024 10:22:05 -0500 X-MC-Unique: VC1leMUSNIm9zD40g2zUyA-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-a450c660cdeso54730966b.3 for ; Tue, 05 Mar 2024 07:22:05 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709652123; x=1710256923; 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=Meix3qi/b5eOZGN0myvIRI+Org+CLcNrM4/lpre9M6M=; b=jDgxgMthdeIn+STetn/euWync+ObxKjEuBzXqvY/9MOgBy7vczhwvkmAriSJniW2Dd zWFO/HZw9wuCmTwR0TH2VkpKCegWg9ZNk1gt8EM/OEslF8tsFLeQXsovd0jJe5ShNpkj wMleZ4ALBVr+fzNiY3eXeK9nlR1AsZil17zSOoUfc0owCJE0zKN0rjVN3vYzsw3yFrQb 8jgXY1K+2aHqZrIojlgm1aFeYUTfY2kbcRBEuKTh4Mz22VfGKuEbdlrhn6+wV5Oo8dEp DFU5GmZQfhM3QFf/FQmq0kiHq1uN+bcRaBJxSrf3Z0Hb5FgERo7HV4kvgskCWusRsew6 WN1g== X-Gm-Message-State: AOJu0Yzgp6toG+vuUr2vGSJSutFyQmT44LtXTRTb/K8vQymkZ1r7rIpZ F3ZFpon3NAX4zHZOOlKb03cQTEi8XXp1WiqzteiF95XUbKxtx5EBBzHfGu3+9Qwzkd9acOmHGAn HVFhI1BaIM7YDk6Ga3dQ6oB3a+z/GON9UTJRycXmpjTCZuICUvUXJJsNWBVeNUkikg7hjPyNwoV QojVPO50eG7yCihJWcFASJFfmKYMNbXKnmicTSfBP7D5g= X-Received: by 2002:a17:906:5585:b0:a45:231:9b4b with SMTP id y5-20020a170906558500b00a4502319b4bmr5348365ejp.20.1709652123391; Tue, 05 Mar 2024 07:22:03 -0800 (PST) X-Google-Smtp-Source: AGHT+IHjkHACerVXInR5KHI9TPwQtkZCX+7lo1+VuKZ+nDfS+TVkucfme2MsE2cQQt51O/eohewamQ== X-Received: by 2002:a17:906:5585:b0:a45:231:9b4b with SMTP id y5-20020a170906558500b00a4502319b4bmr5348341ejp.20.1709652122910; Tue, 05 Mar 2024 07:22:02 -0800 (PST) Received: from localhost (185.223.159.143.dyn.plus.net. [143.159.223.185]) by smtp.gmail.com with ESMTPSA id l18-20020a1709060e1200b00a459094cf61sm1268905eji.115.2024.03.05.07.22.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Mar 2024 07:22:00 -0800 (PST) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCHv9 08/14] gdb: remove tracepoint_probe_create_sals_from_location_spec Date: Tue, 5 Mar 2024 15:21:39 +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=-12.3 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_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org The tracepoint_probe_create_sals_from_location_spec function just forwards all its arguments to bkpt_probe_create_sals_from_location_spec, and is only used in one place. Lets delete tracepoint_probe_create_sals_from_location_spec and replace it with bkpt_probe_create_sals_from_location_spec. There should be no user visible changes after this commit. --- gdb/breakpoint.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 5e97d27bbf5..bf7c0dc042b 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -283,9 +283,6 @@ static bool strace_marker_p (struct breakpoint *b); static void bkpt_probe_create_sals_from_location_spec (location_spec *locspec, struct linespec_result *canonical); -static void tracepoint_probe_create_sals_from_location_spec - (location_spec *locspec, - struct linespec_result *canonical); const struct breakpoint_ops code_breakpoint_ops = { @@ -300,10 +297,11 @@ static const struct breakpoint_ops bkpt_probe_breakpoint_ops = create_breakpoints_sal, }; -/* Tracepoints set on probes. */ +/* Tracepoints set on probes. We use the same methods as for breakpoints + on probes. */ static const struct breakpoint_ops tracepoint_probe_breakpoint_ops = { - tracepoint_probe_create_sals_from_location_spec, + bkpt_probe_create_sals_from_location_spec, create_breakpoints_sal, }; @@ -12401,17 +12399,6 @@ tracepoint::print_recreate (struct ui_file *fp) const gdb_printf (fp, " passcount %d\n", pass_count); } -/* Virtual table for tracepoints on static probes. */ - -static void -tracepoint_probe_create_sals_from_location_spec - (location_spec *locspec, - struct linespec_result *canonical) -{ - /* We use the same method for breakpoint on probes. */ - bkpt_probe_create_sals_from_location_spec (locspec, canonical); -} - void dprintf_breakpoint::re_set () { From patchwork Tue Mar 5 15:21:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 86808 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 ED23E3858009 for ; Tue, 5 Mar 2024 15:24:14 +0000 (GMT) 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 4ECB1385840A for ; Tue, 5 Mar 2024 15:22:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4ECB1385840A Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 4ECB1385840A Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709652132; cv=none; b=BzhMOxCTbSI9VTiSNfq7izF7rhC6Ou0VHkVNMs1lEifAWSpccfDRYihzVlfn2m1B+3N/Okmy13GLa2JoV6ba0wkKh66FWJtDDkRyK5b5CPr6wwQIBKl81Y8qijFPYW9cruO+wvAO/hrlYunn+CBY8PC9zuDAMp+EPp8VVuyzYVw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709652132; c=relaxed/simple; bh=rt9Dlq8Y3h4d8EEVTuwk7cJI8muv4eGPFDjlzWrUKLk=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=ox6B9AuGGffXmqB3J4PIV9xAxhqgB1mpqwg4NP4fR5ZC/6ppuT0nESCdeUlJrs8Jboqtnjoy1/Tq9uCimbpPx0KYx7EolSI8rQDAy9TbQfniU2quyip44gsycF5+nXfRWlEzPGqdaZJBfbsQd0Bwumv4OmMdlxKtgALfz0xtFdU= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709652129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RnSlRXCdwR+ec5vI374SnVd7vkgEt1elSlXiWfxbkDk=; b=FKgWxmCxSflLNE/170FyltcPxbpyJ2bo9eFKNtG8dMDUp0r/Ul+skDqhXn2rE4EHxAcXdc rah5kiA9n8SoOJioPV/DSECaBH1U1D0NVejKSthZ88d/lHENLO6Iayk2lw9R83FbKXADm0 Ll4FANK2trThaZmk17IVFbygn+U4mtQ= Received: from mail-lj1-f200.google.com (mail-lj1-f200.google.com [209.85.208.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-652-qgLZp9_NO7Gpa4-yzc_zNg-1; Tue, 05 Mar 2024 10:22:07 -0500 X-MC-Unique: qgLZp9_NO7Gpa4-yzc_zNg-1 Received: by mail-lj1-f200.google.com with SMTP id 38308e7fff4ca-2d32d9a312eso34502701fa.2 for ; Tue, 05 Mar 2024 07:22:07 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709652125; x=1710256925; 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=RnSlRXCdwR+ec5vI374SnVd7vkgEt1elSlXiWfxbkDk=; b=c/QjJ8neKHf9PNsXiO4scitN4MTvSqLiaCT8eT5y/By6bYKAknojfG5tHhlAGllv4I OJMS0mEmorFDoKomt+XqoH2LXg+bxiQGZUXltmkhso0okGXWbK2b7Y8oyZ5sWnEJ5a02 VQc2tEnlrm8CpG0v7BANKIZWEPEj2vuLALjR87gQcw57lA42WubhC7bWXXAwczmR4ykV xjebupJVebMK8UW7qvkaeEmClEfzLGMFrH4ziGNYaL4FEYBd409wLyByrm+KTRQ14bSr dzT3LBcu1/otCKg7QWEBG25ZPpFfymjHWOHi24NQuzlbEyzOrxVFd9aQiFsl2JthxDzM sEwg== X-Gm-Message-State: AOJu0YxMAEmoKIGSm3g7vdoh2jX4of4908fGnOD564hCOAsbmxkczF+/ LEMfYc5hAa5ZYfINHL+ti6lnDybsl0AbXWMYSeLalg+/AvX1eN8tHVVtjzJNgAZGrXX8PIrTanc wesAhTpHM2ei1OmUANXzY+/iZXrV3grpTOroJiJ1eIQAvqq0XtQLnIRGUQjzchxBQcGxVWvCW5Y dR3qAEWNRefEe2WLu0ZeOo7i1cZf5fiyBzXco6QpHrd+U= X-Received: by 2002:a2e:a609:0:b0:2d2:9fc2:9bb8 with SMTP id v9-20020a2ea609000000b002d29fc29bb8mr1359284ljp.25.1709652125483; Tue, 05 Mar 2024 07:22:05 -0800 (PST) X-Google-Smtp-Source: AGHT+IGD75DyTXQElpXEGrfEhMoZjkEe7PrU9Rhg+EdL56l4/JnEHyDxI4aAmPLYYYJX5nIBTlo1lQ== X-Received: by 2002:a2e:a609:0:b0:2d2:9fc2:9bb8 with SMTP id v9-20020a2ea609000000b002d29fc29bb8mr1359252ljp.25.1709652124811; Tue, 05 Mar 2024 07:22:04 -0800 (PST) Received: from localhost (185.223.159.143.dyn.plus.net. [143.159.223.185]) by smtp.gmail.com with ESMTPSA id o14-20020aa7c7ce000000b0056742460f68sm2650858eds.66.2024.03.05.07.22.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Mar 2024 07:22:03 -0800 (PST) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCHv9 09/14] gdb: make breakpoint_debug_printf global Date: Tue, 5 Mar 2024 15:21:40 +0000 Message-Id: <2693fa8935ac65555501ad3f3d6bb1f2e6d29f9e.1709651994.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=-12.3 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_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org This commit makes breakpoint_debug_printf available outside of breakpoint.c. In a later commit I'll want to use this macro from another file. This is just a refactor, there should be no user visible changes after this commit. --- gdb/breakpoint.c | 9 ++------- gdb/breakpoint.h | 8 ++++++++ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index bf7c0dc042b..d940786e6d3 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -574,13 +574,8 @@ show_always_inserted_mode (struct ui_file *file, int from_tty, value); } -/* True if breakpoint debug output is enabled. */ -static bool debug_breakpoint = false; - -/* Print a "breakpoint" debug statement. */ -#define breakpoint_debug_printf(fmt, ...) \ - debug_prefixed_printf_cond (debug_breakpoint, "breakpoint", fmt, \ - ##__VA_ARGS__) +/* See breakpoint.h. */ +bool debug_breakpoint = false; /* "show debug breakpoint" implementation. */ static void diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h index 6da04d5ec00..24aeaf926ec 100644 --- a/gdb/breakpoint.h +++ b/gdb/breakpoint.h @@ -48,6 +48,14 @@ struct linespec_result; struct linespec_sals; struct inferior; +/* True if breakpoint debug output is enabled. */ +extern bool debug_breakpoint; + +/* Print a "breakpoint" debug statement. */ +#define breakpoint_debug_printf(fmt, ...) \ + debug_prefixed_printf_cond (debug_breakpoint, "breakpoint", fmt, \ + ##__VA_ARGS__) + /* Enum for exception-handling support in 'catch throw', 'catch rethrow', 'catch catch' and the MI equivalent. */ From patchwork Tue Mar 5 15:21:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 86806 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 7119338582AD for ; Tue, 5 Mar 2024 15:24:10 +0000 (GMT) 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 5493D3858281 for ; Tue, 5 Mar 2024 15:22:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5493D3858281 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 5493D3858281 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709652132; cv=none; b=YFwDDZ71cC6533XHS2l4omTndQANpjjfeUI7IU9RwgpK/9NcHRgQek/X+nMI1QB+LRQ5hXMvWtmLYpahHxtQ5wVwMNaupqdDsl9Oa4rla+2OII66eNzeSBrxyt/d02oo9OEcpTOG+Vqh8E60acSSXBJDlDZ9/HA4HWaHhuB5vdA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709652132; c=relaxed/simple; bh=kCtIQjYOvaN9Ldf0PrTb3F8N/TZPT0vgCnsnW7DHdWQ=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=B5IEZEZouMNPdQMlARHChWf5ZuuTKnlICTUuTl0PI58AcWFOfQ8Ojil4N0BTgFXJXeAPPxdU5QvTYMO8aheMRJGEME4JwN+UJtitQ6+Al9Pf/9DR08xFQu/4jXGQREP5gEt/2RRlMbDM0ZG22wcShUKJaOgFrbg8ie7tCzkyuQA= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709652129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LgKtFOpjUVEPGsjxTEdDvisJj2JfoHfouWzF2LNmNQI=; b=h8ULruZnIvt9e7A7Vgm+dT0fzg8fC+l46s7i5V86HMuHvRfpIfH2eU2BulYNwIx9xTcePN 5F7CCt4cS8PpX8B16JduZu5qR9jgGj+h5T5bQnvr0GJNRFl9Sr8BleeO8snqHsXAHEKFJr NysOQyvkH7+sozchSwDumjpmkjh52xI= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-654-tUHH4_XHNIeIpjCFaFAyMw-1; Tue, 05 Mar 2024 10:22:07 -0500 X-MC-Unique: tUHH4_XHNIeIpjCFaFAyMw-1 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-a450265c7b6so56437766b.0 for ; Tue, 05 Mar 2024 07:22:07 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709652126; x=1710256926; 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=LgKtFOpjUVEPGsjxTEdDvisJj2JfoHfouWzF2LNmNQI=; b=DlJrgZhNEJ7NCnWA68S5fxoAtQ9WAG2NxVpimMqofI8Yb4kUgRgyH2BKQQF60VH+zy cIT/LU+4oJV1FZqtkX6qN0DGMeR+UPi5XEcvg4mFKB7/JF12xW/8R3pX3uanoBacy9EH tiBOgvZfF0lmA0Sjw6HMNefVVFjUBl0uASpMvfMLG6p4kuu03T40tGUyYHWTIfXIHSw1 dou6lhN6a1rbWt/g2G6wTfF6OmEldfgFbhMgLJ73c1t5Kg5Ahc1xPYjS2gm9ywjk888t WeoK+TAOrOZB8IZqoNrIMOgkz9YNaA62mxxDjWonA+zbeXJcIoiTv0a1CmBgv9pQyeGg bDDQ== X-Gm-Message-State: AOJu0Yygx2Ty45TIgMmQR45nJjSimsqwkK5Uaf8a4lX75sl/NQ2w/5Hs NKxct81/nolubOcH66Jx4dxuWYo0XQ4VCC225NoKPMTAq5H4acGS695T0G5F815Ht+Zv9wxYsOx 4aE7x455gryckUFyYIU/vAr8ZF0XYLiBB8SP6FSZDVArZFXS76lQssfOSNVaA8eUwNuKFg/al7W Ol2ZR/vez4uIs7fCg+lNbeQC70ydY3lTeGOjmOV8XlJ/s= X-Received: by 2002:a17:906:f91a:b0:a44:752:ad4e with SMTP id lc26-20020a170906f91a00b00a440752ad4emr9143360ejb.75.1709652126015; Tue, 05 Mar 2024 07:22:06 -0800 (PST) X-Google-Smtp-Source: AGHT+IETeNSY6d7YpmzjtWMpqjnUQIpKZfQvpJX68T1B2poRZWlT5Kwd9UWuxB9uAdv4Hy4Jr+pIMg== X-Received: by 2002:a17:906:f91a:b0:a44:752:ad4e with SMTP id lc26-20020a170906f91a00b00a440752ad4emr9143349ejb.75.1709652125724; Tue, 05 Mar 2024 07:22:05 -0800 (PST) Received: from localhost (185.223.159.143.dyn.plus.net. [143.159.223.185]) by smtp.gmail.com with ESMTPSA id bj9-20020a170906b04900b00a4547925e3asm2468456ejb.141.2024.03.05.07.22.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Mar 2024 07:22:05 -0800 (PST) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCHv9 10/14] gdb: add another overload of startswith Date: Tue, 5 Mar 2024 15:21:41 +0000 Message-Id: <7ba7f1b02b8cea22c1efaa559b893746423b0fa1.1709651994.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=-12.3 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_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org We already have one overload of the startswith function that takes a std::string_view for both arguments. A later patch in this series is going to be improved by having an overload that takes one argument as a std::string_view and the other argument as a plain 'char *'. This commit adds the new overload, but doesn't make use of it (yet). There should be no user visible changes after this commit. --- gdbsupport/common-utils.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gdbsupport/common-utils.h b/gdbsupport/common-utils.h index 23cd40c0207..2fb22916409 100644 --- a/gdbsupport/common-utils.h +++ b/gdbsupport/common-utils.h @@ -100,6 +100,16 @@ startswith (std::string_view string, std::string_view pattern) && strncmp (string.data (), pattern.data (), pattern.length ()) == 0); } +/* Version of startswith that takes a string_view for only one of its + arguments. Return true if STR starts with PREFIX, otherwise return + false. */ + +static inline bool +startswith (const char *str, const std::string_view &prefix) +{ + return strncmp (str, prefix.data (), prefix.length ()) == 0; +} + /* Return true if the strings are equal. */ static inline bool From patchwork Tue Mar 5 15:21:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 86811 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 F1B9A38582A3 for ; Tue, 5 Mar 2024 15:24:55 +0000 (GMT) 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 549903858285 for ; Tue, 5 Mar 2024 15:22:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 549903858285 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 549903858285 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709652133; cv=none; b=bYf/hBuPNCsoo73yhLR1BI8asjgFKj4JXHOM2Qa5n+7BKKW0FIlhOqhpQYZREyXmdSJkBE2smmwuSCP4v/s1fd0UNbi0DUEH36pWfISRSHe4HUsYYTR1fYUo4kzYxzfotu/Pt7qxT/LtdjhqLH4B9GoHM5dvqGtlCQNFTVoA17Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709652133; c=relaxed/simple; bh=OMk66Gw3V7xFfCutPcUz7hQ9ixjd/B4oSAkX+9BUe4g=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=cSYgKXmzoYknZ/ch4EM55pyqoNj/lHj3W3AOqWja85xSeMVGAn3onT6eXFQVKk+2yl9CwOluHeorDw0AcRrVc+nK7FjAqv11VwmxMTIb3uhNg0H23L0OowrMCLqktDbxh0YgpR3/51U39b8Y6jRCQjr1KCRdtiuTGgu9Y5P+K1g= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709652130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7Z5hLcfo6AlfqyxATz7ARN/0ggMmV/d4CfqVwXydPF8=; b=ScwjrF/qfwpeh4gTqrokFdeSQA+SehtgQCNXOfseG+O2JG39fz2LU9SoHTWy3Kpwt9drN0 t/Z9My15LoSzY1YiQbOmUYaVxPut/87Beqzs7ocrv4cgee61SF71i4V18FBJRunuxIIDwd MFDV8H1ZGaGXZhMw+dkdhlBeP7FnpUk= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-509-gTCTmAlgMw2AemoHrMb5vQ-1; Tue, 05 Mar 2024 10:22:09 -0500 X-MC-Unique: gTCTmAlgMw2AemoHrMb5vQ-1 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-a4489805a2dso195021666b.2 for ; Tue, 05 Mar 2024 07:22:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709652127; x=1710256927; 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=7Z5hLcfo6AlfqyxATz7ARN/0ggMmV/d4CfqVwXydPF8=; b=A5G+oGN4CNv3JGvm+3lBpmGviRglu5YE4bm1uJZOSADFONsK8w9Bl2v6JFLLYQ/iUQ Tk5XTV81UtlnJOLHxDQOV7CPiXOXAca6Aae5r6k79HmKMthcGC8qOmfJ9wZdqOxlrhBx RkLHcHjGc7D8vyyQRft6ar3DLaHd+fCYsmls+OKtyUbscvQ2+7GITw4WvSn74O9O5aQx Gha9wSDxHjvziDnjzHLdpzbvFYMvDlCCkxb7/Utn1cgyV6bObwWFFG19FD0Njt7fO70G hnTljOWTybTEqsVPevDJXqhmkAGM7mZfX8c1g7nf/r/g7CVZ+Dxaf4N8AUY/D2h8QcJw 4drQ== X-Gm-Message-State: AOJu0Yyd0sVfz1/ap81QWDTduE3R3JUc6tt/bd7itaKX0PY8qa7xOWLE R7x1/GM2jF6GoqbQqg5uXUPRrEK0YT6zCaMG7hOJhpN7fv4ATjkIFpg3lbiK1bjTLGIC0PobFY0 q3h6zX396doJ6q7gQIX0tKFcl6vt/IqESj+nzfw+C+NN9GqpeCD9GRWr5h5Ss0B7VcwATL0hPMi XyGKPLPPWkbC534xJuaLwFCT3qsNVvGy2+2ZgThkr9b98= X-Received: by 2002:a17:906:eb17:b0:a45:9b1:f4a9 with SMTP id mb23-20020a170906eb1700b00a4509b1f4a9mr5329563ejb.20.1709652127622; Tue, 05 Mar 2024 07:22:07 -0800 (PST) X-Google-Smtp-Source: AGHT+IGiutQADu6GYxwCV1X0ennsvnBTExBF6wjUJMjWIGUlHnwyHTcDkmUcCz3MLGxI03VLrtMegg== X-Received: by 2002:a17:906:eb17:b0:a45:9b1:f4a9 with SMTP id mb23-20020a170906eb1700b00a4509b1f4a9mr5329546ejb.20.1709652127308; Tue, 05 Mar 2024 07:22:07 -0800 (PST) Received: from localhost (185.223.159.143.dyn.plus.net. [143.159.223.185]) by smtp.gmail.com with ESMTPSA id am20-20020a170906569400b00a459d922903sm1030327ejc.207.2024.03.05.07.22.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Mar 2024 07:22:06 -0800 (PST) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCHv9 11/14] gdb: create new is_thread_id helper function Date: Tue, 5 Mar 2024 15:21:42 +0000 Message-Id: <949fcb519598b2c884d15158d3490f805f51262f.1709651994.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=-12.3 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, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org This is a refactoring commit that splits the existing parse_thread_id function into two parts, and then adds a new is_thread_id function. The core of parse_thread_id is split into parse_thread_id_1, which is responsible for actually parsing a thread-id. Then parse_thread_id is responsible for taking a parsed thread-id and validating that it references an actually existing inferior thread. The new is_thread_id function also uses parse_thread_id_1, but doesn't actually check that the inferior thread exists, instead, this new function simply checks that a string looks like a thread-id. This commit does not add a use for is_thread_id, this will be added in the next commit. This is a refactoring commit, there should be no user visible changes after this commit. --- gdb/tid-parse.c | 82 +++++++++++++++++++++++++++++++++++++------------ gdb/tid-parse.h | 8 +++++ 2 files changed, 70 insertions(+), 20 deletions(-) diff --git a/gdb/tid-parse.c b/gdb/tid-parse.c index aa1480d7cf0..7f85b94eba4 100644 --- a/gdb/tid-parse.c +++ b/gdb/tid-parse.c @@ -48,40 +48,43 @@ get_positive_number_trailer (const char **pp, int trailer, const char *string) return num; } -/* See tid-parse.h. */ +/* Parse TIDSTR as a per-inferior thread ID, in either INF_NUM.THR_NUM + or THR_NUM form, and return a pair, the first item of the pair is + INF_NUM and the second item is THR_NUM. -struct thread_info * -parse_thread_id (const char *tidstr, const char **end) + If TIDSTR does not include an INF_NUM component, then the first item in + the pair will be 0 (which is an invalid inferior number), this indicates + that TIDSTR references the current inferior. + + This function does not validate the INF_NUM and THR_NUM are actually + valid numbers, that is, they might reference inferiors or threads that + don't actually exist; this function just splits the string into its + component parts. + + If there is an error parsing TIDSTR then this function will raise an + exception. */ + +static std::pair +parse_thread_id_1 (const char *tidstr, const char **end) { const char *number = tidstr; const char *dot, *p1; - struct inferior *inf; - int thr_num; - int explicit_inf_id = 0; + int thr_num, inf_num; dot = strchr (number, '.'); if (dot != NULL) { /* Parse number to the left of the dot. */ - int inf_num; - p1 = number; inf_num = get_positive_number_trailer (&p1, '.', number); if (inf_num == 0) invalid_thread_id_error (number); - - inf = find_inferior_id (inf_num); - if (inf == NULL) - error (_("No inferior number '%d'"), inf_num); - - explicit_inf_id = 1; p1 = dot + 1; } else { - inf = current_inferior (); - + inf_num = 0; p1 = number; } @@ -89,6 +92,32 @@ parse_thread_id (const char *tidstr, const char **end) if (thr_num == 0) invalid_thread_id_error (number); + if (end != nullptr) + *end = p1; + + return { inf_num, thr_num }; +} + +/* See tid-parse.h. */ + +struct thread_info * +parse_thread_id (const char *tidstr, const char **end) +{ + const auto [inf_num, thr_num] = parse_thread_id_1 (tidstr, end); + + inferior *inf; + bool explicit_inf_id = false; + + if (inf_num != 0) + { + inf = find_inferior_id (inf_num); + if (inf == nullptr) + error (_("No inferior number '%d'"), inf_num); + explicit_inf_id = true; + } + else + inf = current_inferior (); + thread_info *tp = nullptr; for (thread_info *it : inf->threads ()) if (it->per_inf_num == thr_num) @@ -97,7 +126,7 @@ parse_thread_id (const char *tidstr, const char **end) break; } - if (tp == NULL) + if (tp == nullptr) { if (show_inferior_qualified_tids () || explicit_inf_id) error (_("Unknown thread %d.%d."), inf->num, thr_num); @@ -105,14 +134,27 @@ parse_thread_id (const char *tidstr, const char **end) error (_("Unknown thread %d."), thr_num); } - if (end != NULL) - *end = p1; - return tp; } /* See tid-parse.h. */ +bool +is_thread_id (const char *tidstr, const char **end) +{ + try + { + (void) parse_thread_id_1 (tidstr, end); + return true; + } + catch (const gdb_exception_error &) + { + return false; + } +} + +/* See tid-parse.h. */ + tid_range_parser::tid_range_parser (const char *tidlist, int default_inferior) { diff --git a/gdb/tid-parse.h b/gdb/tid-parse.h index b7bd920f48a..bba5ae5118c 100644 --- a/gdb/tid-parse.h +++ b/gdb/tid-parse.h @@ -36,6 +36,14 @@ extern void ATTRIBUTE_NORETURN invalid_thread_id_error (const char *string); thrown. */ struct thread_info *parse_thread_id (const char *tidstr, const char **end); +/* Return true if TIDSTR is pointing to a string that looks like a + thread-id. This doesn't mean that TIDSTR identifies a valid thread, but + the string does at least look like a valid thread-id. If END is not + NULL, parse_thread_id stores the address of the first character after + the thread-id into *END. */ + +bool is_thread_id (const char *tidstr, const char **end); + /* Parse a thread ID or a thread range list. A range will be of the form From patchwork Tue Mar 5 15:21:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 86813 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 33072385840E for ; Tue, 5 Mar 2024 15:25:40 +0000 (GMT) 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 40E263858437 for ; Tue, 5 Mar 2024 15:22:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 40E263858437 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 40E263858437 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709652144; cv=none; b=tnAmtllcf/x62qvYQE6GuSzUiB4dr6PzvrtcNTK+hwK65aQ1PZ+TkbBwEBiWJ6+fpsvfsbo6rt6GoRWHtQuX9tXnL69zWJrKQjpZqI5YOpKvdyv4xoOOkygi/YnaYSp0IUHn4BhheqQoSU3Butru4+xeMRVQJrKo5+t8DztZuPw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709652144; c=relaxed/simple; bh=OZ6/nEnqKYAI4b2gS6bZW/GDEMgmdy2cqjBf9aRRa3Y=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=oXqZ3k7ydyvlztzUvOVdBmkheHXBEy5+nE6d5jN4DBWVZwawQhecmm0P/97uG9rBo7M5j/YSURUNmNd9QBAIYVdw+jNXyU8XZUKyOin57YIVBTvG/WXLH48NEcgXPIGb0fJ835rxlQOZ4aG3wtZn+Vl082b4RBPWRm3E7Nn6zVA= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709652136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SSSVo/YDx3BuYyM6X5xQfC8f+vL7oCihrHzKYpnuBrs=; b=GHHMWHv1FcNg13f9YfEx+Kw1Q2ad/TO9Q2fF+bYdvCAkq7CRwi8AYE6/uhLmOBBExTFO+K xvpEE0mt/s6X6Bywbhpq7ScfnmO8E25o9QquAZ3UwNcgP9qPnKECTLkMMlm57NbskFdbKc yGSYi3YLCQIFxCKmoOh8PpZ9z1kXDy4= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-310-6GU_I1QxN_-zdC3lZzo8SA-1; Tue, 05 Mar 2024 10:22:14 -0500 X-MC-Unique: 6GU_I1QxN_-zdC3lZzo8SA-1 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-a45ac612a4dso55093866b.0 for ; Tue, 05 Mar 2024 07:22:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709652133; x=1710256933; 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=SSSVo/YDx3BuYyM6X5xQfC8f+vL7oCihrHzKYpnuBrs=; b=PsFnP5n8tMMMYYm7yHyJvRQxPEejeBahGrjUxhpcNXf3zrjuww2nfFw8oTujDGngp1 SzWLbu5byizrAll8OuXG5HVUJIuwiTCdljFn1zaHcOeLuDpsXxS1Y4gzf+77htj5+0VG qQ8F89WokurWEp9ciNq0VdJtVn6vHgnhEozNrN0HJCSWGRoImy1LUds/JToOyikO5uE6 k7ok2yFTD6GBajp9PVKs40JjT6ptHDOVnagm2nX6/VdCdotOz2SHwS8idgnIZtYO9u4y 3hkngFvbAZ/epcGLXKldC/YWmliBecajnOTEEei9ULKMCHQOPj34qpGvHm9OwJ4ljncl Ap0Q== X-Gm-Message-State: AOJu0YyCJx5k5iWWEwFYS4w3Ysxjo68p38AKX1pPB+pRUgcS2DF5LB0Y tWe/NCKCSCq0M1xXZrqGi77WnXzd57TVbHCOrej81VKCBRt3jIHopSgpqSgHBXEJA+mYMiSJMnZ KVNLbMR7lccpliW2SUQ/Gvlgs/d4YNS0NaV9KO/GO0JUcAg3P4Y/1YDLjo4DBCjIa6lVtVp4A0h 4qo7ifSSXXE3kM61SLIrLmzR1pOBRlnR8FrdzAHQtf0P8= X-Received: by 2002:a17:906:1d54:b0:a44:b96:2809 with SMTP id o20-20020a1709061d5400b00a440b962809mr3146873ejh.24.1709652131134; Tue, 05 Mar 2024 07:22:11 -0800 (PST) X-Google-Smtp-Source: AGHT+IEQXdCKz9WSOYLTS3BYEIPqu3F3sYeszQQ8QeltVFInT1RLOTxWE2orDuHjUqDiSftkRK7/gg== X-Received: by 2002:a17:906:1d54:b0:a44:b96:2809 with SMTP id o20-20020a1709061d5400b00a440b962809mr3146770ejh.24.1709652128990; Tue, 05 Mar 2024 07:22:08 -0800 (PST) Received: from localhost (185.223.159.143.dyn.plus.net. [143.159.223.185]) by smtp.gmail.com with ESMTPSA id ef11-20020a17090697cb00b00a44bc99cd89sm4450739ejb.42.2024.03.05.07.22.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Mar 2024 07:22:08 -0800 (PST) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess , Eli Zaretskii Subject: [PATCHv9 12/14] gdb: parse pending breakpoint thread/task immediately Date: Tue, 5 Mar 2024 15:21:43 +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=-12.3 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_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org The initial motivation for this commit was to allow thread or inferior specific breakpoints to only be inserted within the appropriate inferior's program-space. The benefit of this is that inferiors for which the breakpoint does not apply will no longer need to stop, and then resume, for such breakpoints. This commit does not make this change, but is a refactor to allow this to happen in a later commit. The problem we currently have is that when a thread-specific (or inferior-specific) breakpoint is created, the thread (or inferior) number is only parsed by calling find_condition_and_thread_for_sals. This function is only called for non-pending breakpoints, and requires that we know the locations at which the breakpoint will be placed (for expression checking in case the breakpoint is also conditional). A consequence of this is that by the time we figure out the breakpoint is thread-specific we have already looked up locations in all program spaces. This feels wasteful -- if we knew the thread-id earlier then we could reduce the work GDB does by only looking up locations within the program space for which the breakpoint applies. Another consequence of how find_condition_and_thread_for_sals is called is that pending breakpoints don't currently know they are thread-specific, nor even that they are conditional! Additionally, by delaying parsing the thread-id, pending breakpoints can be created for non-existent threads, this is different to how non-pending breakpoints are handled, so I can do this: $ gdb -q ./gdb/testsuite/outputs/gdb.multi/pending-bp/pending-bp Reading symbols from ./gdb/testsuite/outputs/gdb.multi/pending-bp/pending-bp... (gdb) break foo thread 99 Function "foo" not defined. Make breakpoint pending on future shared library load? (y or [n]) y Breakpoint 1 (foo thread 99) pending. (gdb) r Starting program: /tmp/gdb/testsuite/outputs/gdb.multi/pending-bp/pending-bp [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib64/libthread_db.so.1". Error in re-setting breakpoint 1: Unknown thread 99. [Inferior 1 (process 3329749) exited normally] (gdb) GDB only checked the validity of 'thread 99' at the point the 'foo' location became non-pending. In contrast, if I try this: $ gdb -q ./gdb/testsuite/outputs/gdb.multi/pending-bp/pending-bp Reading symbols from ./gdb/testsuite/outputs/gdb.multi/pending-bp/pending-bp... (gdb) break main thread 99 Unknown thread 99. (gdb) GDB immediately checks if 'thread 99' exists. I think inconsistencies like this are confusing, and should be fixed if possible. In this commit the create_breakpoint function is updated so that the extra_string, which contains the thread, inferior, task, and/or condition information, is parsed immediately, even for pending breakpoints. Obviously, the condition still can't be validated until the breakpoint becomes non-pending, but the thread, inferior, and task information can be pulled from the extra-string, and can be validated early on, even for pending breakpoints. The -force-condition flag is also parsed as part of this early parsing change. There are a couple of benefits to doing this: 1. Printing of breakpoints is more consistent now. Consider creating a conditional breakpoint before this commit: (gdb) set breakpoint pending on (gdb) break pendingfunc if (0) Function "pendingfunc" not defined. Breakpoint 1 (pendingfunc if (0)) pending. (gdb) break main if (0) Breakpoint 2 at 0x401198: file /tmp/hello.c, line 18. (gdb) info breakpoints Num Type Disp Enb Address What 1 breakpoint keep y pendingfunc if (0) 2 breakpoint keep y 0x0000000000401198 in main at /tmp/hello.c:18 stop only if (0) (gdb) And after this commit: (gdb) set breakpoint pending on (gdb) break pendingfunc if (0) Function "pendingfunc" not defined. Breakpoint 1 (pendingfunc) pending. (gdb) break main if (0) Breakpoint 2 at 0x401198: file /home/andrew/tmp/hello.c, line 18. (gdb) info breakpoints Num Type Disp Enb Address What 1 breakpoint keep y pendingfunc stop only if (0) 2 breakpoint keep y 0x0000000000401198 in main at /home/andrew/tmp/hello.c:18 stop only if (0) (gdb) Notice that the display of the condition is now the same for the pending and non-pending breakpoints. The same is true for the thread, inferior, or task information in thread, inferior, or task specific breakpoints; this information is displayed on its own line rather than being part of the 'What' field. 2. We can check that the thread exists as soon as the pending breakpoint is created. Currently there is a weird difference between pending and non-pending breakpoints when creating a thread-specific breakpoint. A pending thread-specific breakpoint only checks its thread when it becomes non-pending, at which point the thread the breakpoint was intended for might have exited. Here's the behaviour before this commit: (gdb) set breakpoint pending on (gdb) break foo thread 2 Function "foo" not defined. Breakpoint 2 (foo thread 2) pending. (gdb) c Continuing. [Thread 0x7ffff7c56700 (LWP 2948835) exited] Error in re-setting breakpoint 2: Unknown thread 2. [Inferior 1 (process 2948832) exited normally] (gdb) Notice the 'Error in re-setting breakpoint 2: Unknown thread 2.' line, this was triggered when GDB tried to make the breakpoint non-pending, and GDB discovers that the thread no longer exists. Compare that to the behaviour after this commit: (gdb) set breakpoint pending on (gdb) break foo thread 2 Function "foo" not defined. Breakpoint 2 (foo) pending. (gdb) c Continuing. [Thread 0x7ffff7c56700 (LWP 2949243) exited] Thread-specific breakpoint 2 deleted - thread 2 no longer in the thread list. [Inferior 1 (process 2949240) exited normally] (gdb) Now the behaviour for pending breakpoints is identical to non-pending breakpoints, the thread specific breakpoint is removed as soon as the thread the breakpoint is associated with exits. There is an additional change; when the pending breakpoint is created prior to this patch we see this line: Breakpoint 2 (foo thread 2) pending. While after this patch we get this line: Breakpoint 2 (foo) pending. Notice that 'thread 2' has disappeared. This might look like a regression, but I don't think it is. That we said 'thread 2' before was just a consequence of the lazy parsing of the breakpoint specification, while with this patch GDB understands, and has parsed away the 'thread 2' bit of the spec. If folk think the old information was useful then this would be trivial to add back in code_breakpoint::say_where. As a result of this commit the breakpoints 'extra_string' field is now only used by bp_dprintf type breakpoints to hold the printf format and arguments. This string should always be empty for other breakpoint types. This allows some cleanup in print_breakpoint_location. In code_breakpoint::code_breakpoint I've changed an error case into an assert. This is because the error is now handled earlier in create_breakpoint. As a result we know that by this point, the extra_string will always be nullptr for anything other than a bp_dprintf style breakpoint. The find_condition_and_thread_for_sals function is now no longer needed, this was previously doing the delayed splitting of the extra string into thread, task, and condition, but this is now all done in create_breakpoint, so find_condition_and_thread_for_sals can be deleted, and the code that calls this in code_breakpoint::location_spec_to_sals can be removed. With this update this code would only ever be reached for bp_dprintf style breakpoints, and in these cases the extra_string should not contain anything other than format and args. The most interesting changes are all in create_breakpoint and in the new file break-cond-parse.c. We have a new block of code early on in create_breakpoint that is responsible for splitting the extra_string into its component parts by calling create_breakpoint_parse_arg_string a function in the new break-cond-parse.c file. This means that some of the later code can be simplified a little. The new break-cond-parse.c file implements the splitting up the extra_string and finding all the parts, as well as some self-tests for the new function. Finally, now we know all the breakpoint details, these can be stored within the breakpoint object if we end up creating a deferred breakpoint. Additionally, if we are creating a deferred bp_dprintf we can parse the extra_string to build the printf command. The implementation here aims to maintain backwards compatibility as much as possible, this means that: 1. We support abbreviations of 'thread', 'task', and 'inferior' in some places on the breakpoint line. The handling of abbreviations has (before this patch) been a little weird, so this works: (gdb) break *main th 1 And creates a breakpoint at '*main' for thread 1 only, while this does not work: (gdb) break main th 1 In this case GDB will try to find the symbol 'main th 1'. This weirdness exists before and after this patch. 2. The handling of '-force-condition' is odd, if this flag appears immediately after a condition then it will be treated as part of the condition, e.g.: (gdb) break main if 0 -force-condition No symbol "force" in current context. But we are fine with these alternatives: (gdb) break main if 0 thread 1 -force-condition (gdb) break main -force-condition if 0 Again, this is just a quirk of how the breakpoint line used to be parsed, but I've maintained this for backward compatibility. During review it was suggested that -force-condition should become an actual breakpoint flag (i.e. only valid after the 'break' command but before the function name), and I don't think that would be a terrible idea, however, that's not currently a trivial change, and I think should be done as a separate piece of work. For now, this patch just maintains the current behaviour. The implementation works by first splitting the breakpoint condition string (everything after the location specification) into a list of tokens, each token has a type and a value. (e.g. we have a THREAD token where the value is the thread-id string). The list of tokens is validated, and in some cases, tokens are merged. Then the values are extracted from the remaining token list. Consider this breakpoint command: (gdb) break main thread 1 if argc == 2 The condition string passed to create_breakpoint_parse_arg_string is going to be 'thread 1 if argc == 2', which is then split into the tokens: { THREAD: "1" } { CONDITION: "argc == 2" } The thread-id (1) and the condition string 'argc == 2' are extracted from these tokens and returns back to create_breakpoint. Now consider this breakpoint command: (gdb) break some_function if ( some_var == thread ) Here the user wants a breakpoint if 'some_var' is equal to the variable 'thread'. However, when this is initially parsed we will find these tokens: { CONDITION: "( some_var == " } { THREAD: ")" } This is a consequence of how we have to try and figure out the contents of the 'if' condition without actually parsing the expression; parsing the expression requires that we know the location in order to lookup the variables by name, and this can't be done for pending breakpoints (their location isn't known yet), and one of the points of this work is that we extract things like thread-id for pending breakpoints. And so, it is in this case that token merging takes place. We check if the value of a token appearing immediately after the CONDITION token looks valid. In this case, does ')' look like a valid thread-id. Clearly, in this case ')' does not, and so me merge the THREAD token into the condition token, giving: { CONDITION: "( some_var == thread )" } Which is what we want. I'm sure that we might still be able to come up with some edge cases where the parser makes the wrong choice. I think long term the best way to work around these would be to move the thread, inferior, task, and -force-condition flags to be "real" command options for the break command. I am looking into doing this, but can't guarantee if/when that work would be completed, so this patch should be reviewed assume that the work will never arrive (though I hope it will). Reviewed-By: Eli Zaretskii --- gdb/Makefile.in | 2 + gdb/NEWS | 4 + gdb/break-cond-parse.c | 701 ++++++++++++++++++ gdb/break-cond-parse.h | 52 ++ gdb/breakpoint.c | 372 ++-------- gdb/testsuite/gdb.ada/tasks.exp | 6 +- gdb/testsuite/gdb.base/condbreak.exp | 57 +- gdb/testsuite/gdb.base/pending.exp | 23 +- gdb/testsuite/gdb.linespec/explicit.exp | 4 +- gdb/testsuite/gdb.linespec/keywords.exp | 8 +- gdb/testsuite/gdb.mi/mi-dprintf-pending.exp | 3 +- .../gdb.multi/inferior-specific-bp.exp | 4 +- .../gdb.threads/del-pending-thread-bp-lib.c | 22 + .../gdb.threads/del-pending-thread-bp.c | 85 +++ .../gdb.threads/del-pending-thread-bp.exp | 108 +++ 15 files changed, 1145 insertions(+), 306 deletions(-) create mode 100644 gdb/break-cond-parse.c create mode 100644 gdb/break-cond-parse.h create mode 100644 gdb/testsuite/gdb.threads/del-pending-thread-bp-lib.c create mode 100644 gdb/testsuite/gdb.threads/del-pending-thread-bp.c create mode 100644 gdb/testsuite/gdb.threads/del-pending-thread-bp.exp diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 0e0f19c40c9..73dc2ca6637 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1028,6 +1028,7 @@ COMMON_SFILES = \ break-catch-sig.c \ break-catch-syscall.c \ break-catch-throw.c \ + break-cond-parse.c \ breakpoint.c \ bt-utils.c \ btrace.c \ @@ -1296,6 +1297,7 @@ HFILES_NO_SRCDIR = \ bfd-target.h \ bfin-tdep.h \ block.h \ + break-cond-parse.h \ breakpoint.h \ bsd-kvm.h \ bsd-uthread.h \ diff --git a/gdb/NEWS b/gdb/NEWS index 2638b3e0d9c..c170385a50e 100644 --- a/gdb/NEWS +++ b/gdb/NEWS @@ -13,6 +13,10 @@ the background, resulting in faster startup. This can be controlled using "maint set dwarf synchronous". +* For breakpoints that are created in the 'pending' state, any + 'thread' or 'task' keywords are parsed at the time the breakpoint is + created, rather than at the time the breakpoint becomes non-pending. + * Changed commands disassemble diff --git a/gdb/break-cond-parse.c b/gdb/break-cond-parse.c new file mode 100644 index 00000000000..eff738f2a7c --- /dev/null +++ b/gdb/break-cond-parse.c @@ -0,0 +1,701 @@ +/* Copyright (C) 2023 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 "defs.h" +#include "gdbsupport/gdb_assert.h" +#include "gdbsupport/selftest.h" +#include "test-target.h" +#include "scoped-mock-context.h" +#include "break-cond-parse.h" +#include "tid-parse.h" +#include "ada-lang.h" + +/* When parsing tokens from a string, which direction are we parsing? + + Given the following string and pointer 'ptr': + + ABC DEF GHI JKL + ^ + ptr + + Parsing 'forward' will return the token 'GHI' and update 'ptr' to point + between GHI and JKL. Parsing 'backward' will return the token 'DEF' and + update 'ptr' to point between ABC and DEF. +*/ + +enum class parse_direction +{ + /* Parse the next token forwards. */ + forward, + + /* Parse the previous token backwards. */ + backward +}; + +/* Find the next token in DIRECTION from *CURR. */ + +static std::string_view +find_next_token (const char **curr, parse_direction direction) +{ + const char *tok_start, *tok_end; + + gdb_assert (**curr != '\0'); + + if (direction == parse_direction::forward) + { + *curr = skip_spaces (*curr); + tok_start = *curr; + *curr = skip_to_space (*curr); + tok_end = *curr - 1; + } + else + { + gdb_assert (direction == parse_direction::backward); + + while (isspace (**curr)) + --(*curr); + + tok_end = *curr; + + while (!isspace (**curr)) + --(*curr); + + tok_start = (*curr) + 1; + } + + return std::string_view (tok_start, tok_end - tok_start + 1); +} + +/* A class that represents a complete parsed token. Each token has a type + and a std::string_view into the original breakpoint condition string. */ + +struct token +{ + /* The types a token might take. */ + enum class type + { + /* These are the token types for the 'if', 'thread', 'inferior', and + 'task' keywords. The m_content for these token types is the value + passed to the keyword, not the keyword itself. */ + CONDITION, + THREAD, + INFERIOR, + TASK, + + /* This is the token used when we find unknown content, the m_content + for this token is the rest of the input string. */ + REST, + + /* This is the token for the -force-condition token, the m_content for + this token contains the keyword itself. */ + FORCE + }; + + token (enum type type, std::string_view content) + : m_type (type), + m_content (std::move (content)) + { + /* Nothing. */ + } + + /* Return a string representing this token. Only used for debug. */ + std::string to_string () const + { + switch (m_type) + { + case type::CONDITION: + return string_printf ("{ CONDITION: \"%s\" }", + std::string (m_content).c_str ()); + case type::THREAD: + return string_printf ("{ THREAD: \"%s\" }", + std::string (m_content).c_str ()); + case type::INFERIOR: + return string_printf ("{ INFERIOR: \"%s\" }", + std::string (m_content).c_str ()); + case type::TASK: + return string_printf ("{ TASK: \"%s\" }", + std::string (m_content).c_str ()); + case type::REST: + return string_printf ("{ REST: \"%s\" }", + std::string (m_content).c_str ()); + case type::FORCE: + return string_printf ("{ FORCE }"); + default: + return "** unknown **"; + } + } + + /* The type of this token. */ + const type &get_type () const + { + return m_type; + } + + /* Return the value of this token. */ + const std::string_view &get_value () const + { + gdb_assert (m_content.size () > 0); + return m_content; + } + + /* Extend this token with the contents of OTHER. This only makes sense + if OTHER is the next token after this one in the original string, + however, enforcing that restriction is left to the caller of this + function. + + When OTHER is a keyword/value token, e.g. 'thread 1', the m_content + for OTHER will only point to the '1'. However, as the m_content is a + std::string_view, then when we merge the m_content of OTHER into this + token we automatically merge in the 'thread' part too, as it + naturally sits between this token and OTHER. */ + + void + extend (const token &other) + { + m_content = std::string_view (this->m_content.data (), + (other.m_content.data () + - this->m_content.data () + + other.m_content.size ())); + } + +private: + /* The type of this token. */ + type m_type; + + /* The important content part of this token. The extend member function + depends on this being a std::string_view. */ + std::string_view m_content; +}; + +/* Split STR, a breakpoint condition string, into a vector of tokens where + each token represents a component of the condition. Tokens are first + parsed from the front of STR until we encounter an 'if' token. At this + point tokens are parsed from the end of STR until we encounter an + unknown token, which we assume is the other end of the 'if' condition. + If when scanning forward we encounter an unknown token then the + remainder of STR is placed into a 'rest' token (the rest of the + string), and no backward scan is performed. */ + +static std::vector +parse_all_tokens (const char *str) +{ + gdb_assert (str != nullptr); + + std::vector forward_results; + std::vector backward_results; + + const char *cond_start = nullptr; + const char *cond_end = nullptr; + parse_direction direction = parse_direction::forward; + std::vector *curr_results = &forward_results; + while (*str != '\0') + { + /* Find the next token. If moving backward and this token starts at + the same location as the condition then we must have found the + other end of the condition string -- we're done. */ + std::string_view t = find_next_token (&str, direction); + if (direction == parse_direction::backward && t.data () <= cond_start) + { + cond_end = &t.back (); + break; + } + + /* We only have a single flag option to check for. All the other + options take a value so require an additional token to be found. + Additionally, we require that this flag be at least '-f', we + don't allow it to be abbreviated to '-'. */ + if (t.length () > 1 && startswith ("-force-condition", t)) + { + curr_results->emplace_back (token::type::FORCE, t); + continue; + } + + /* Maybe the first token was the last token in the string. If this + is the case then we definitely can't try to extract a value + token. This also means that the token T is meaningless. Reset + TOK to point at the start of the unknown content and break out of + the loop. We'll record the unknown part of the string outside of + the scanning loop (below). */ + if (direction == parse_direction::forward && *str == '\0') + { + str = t.data (); + break; + } + + /* As before, find the next token and, if we are scanning backwards, + check that we have not reached the start of the condition string. */ + std::string_view v = find_next_token (&str, direction); + if (direction == parse_direction::backward && v.data () <= cond_start) + { + /* Use token T here as that must also be part of the condition + string. */ + cond_end = &t.back (); + break; + } + + /* When moving backward we will first parse the value token then the + keyword token, so swap them now. */ + if (direction == parse_direction::backward) + std::swap (t, v); + + /* Check for valid option in token T. If we find a valid option then + parse the value from the token V. Except for 'if', that's handled + differently. + + For the 'if' token we need to capture the entire condition + string, so record the start of the condition string and then + start scanning backwards looking for the end of the condition + string. + + The order of these checks is important, at least the check for + 'thread' must occur before the check for 'task'. We accept + abbreviations of these token names, and 't' should resolve to + 'thread', which will only happen if we check 'thread' first. */ + if (direction == parse_direction::forward && startswith ("if", t)) + { + cond_start = v.data (); + str = str + strlen (str); + gdb_assert (*str == '\0'); + --str; + direction = parse_direction::backward; + curr_results = &backward_results; + continue; + } + else if (startswith ("thread", t)) + curr_results->emplace_back (token::type::THREAD, v); + else if (startswith ("inferior", t)) + curr_results->emplace_back (token::type::INFERIOR, v); + else if (startswith ("task", t)) + curr_results->emplace_back (token::type::TASK, v); + else + { + /* An unknown token. If we are scanning forward then reset TOK + to point at the start of the unknown content, we record this + outside of the scanning loop (below). + + If we are scanning backward then unknown content is assumed to + be the other end of the condition string, obviously, this is + just a heuristic, we could be looking at a mistyped command + line, but this will be spotted when the condition is + eventually evaluated. + + Either way, no more scanning is required after this. */ + if (direction == parse_direction::forward) + str = t.data (); + else + { + gdb_assert (direction == parse_direction::backward); + cond_end = &v.back (); + } + break; + } + } + + if (cond_start != nullptr) + { + /* If we found the start of a condition string then we should have + switched to backward scan mode, and found the end of the condition + string. Capture the whole condition string into COND_STRING + now. */ + gdb_assert (direction == parse_direction::backward); + gdb_assert (cond_end != nullptr); + + std::string_view v (cond_start, cond_end - cond_start + 1); + + forward_results.emplace_back (token::type::CONDITION, v); + } + else if (*str != '\0') + { + /* If we didn't have a condition start pointer then we should still + be in forward scanning mode. If we didn't reach the end of the + input string (TOK is not at the null character) then the rest of + the input string is garbage that we didn't understand. + + Record the unknown content into REST. The caller of this function + will report this as an error later on. We could report the error + here, but we prefer to allow the caller to run other checks, and + prioritise other errors before reporting this problem. */ + gdb_assert (direction == parse_direction::forward); + gdb_assert (cond_end == nullptr); + + std::string_view v (str, strlen (str)); + + forward_results.emplace_back (token::type::REST, v); + } + + /* If we have tokens in the BACKWARD_RESULTS vector then this means that + we found an 'if' condition (which will be the last thing in the + FORWARD_RESULTS vector), and then we started a backward scan. + + The last tokens from the input string (those after the 'if' condition) + will be the first tokens added to the BACKWARD_RESULTS vector, so the + last items in the BACKWARD_RESULTS vector are those next to the 'if' + condition. + + Check the tokens in the BACKWARD_RESULTS vector from back to front. + If the tokens look invalid then we assume that they are actually part + of the 'if' condition, and merge the token with the 'if' condition. + If it turns out that this was incorrect and that instead the user just + messed up entering the token value, then this will show as an error + when parsing the 'if' condition. + + Doing this allows us to handle things like: + + break function if ( variable == thread ) + + Where 'thread' is a local variable within 'function'. When parsing + this we will initially see 'thread )' as a thread token with ')' as + the value. However, the following code will spot that ')' is not a + valid thread-id, and so we merge 'thread )' into the 'if' condition + string. + + This code also handles the special treatment for '-force-condition', + which exists for backwards compatibility reasons. Traditionally this + flag, if it occurred immediately after the 'if' condition, would be + treated as part of the 'if' condition. When the breakpoint condition + parsing code was rewritten, this behaviour was retained. */ + gdb_assert (backward_results.empty () + || (forward_results.back ().get_type () + == token::type::CONDITION)); + while (!backward_results.empty ()) + { + token &t = backward_results.back (); + + if (t.get_type () == token::type::FORCE) + forward_results.back ().extend (std::move (t)); + else if (t.get_type () == token::type::THREAD) + { + const char *end; + std::string v (t.get_value ()); + if (is_thread_id (v.c_str (), &end) && *end == '\0') + break; + forward_results.back ().extend (std::move (t)); + } + else if (t.get_type () == token::type::INFERIOR + || t.get_type () == token::type::TASK) + { + /* Place the token's value into a null-terminated string, parse + the string as a number and check that the entire string was + parsed. If this is true then this looks like a valid inferior + or task number, otherwise, assume an invalid id, and merge + this token with the 'if' token. */ + char *end; + std::string v (t.get_value ()); + (void) strtol (v.c_str (), &end, 0); + if (end > v.c_str () && *end == '\0') + break; + forward_results.back ().extend (std::move (t)); + } + else + gdb_assert_not_reached ("unexpected token type"); + + /* If we found an actual valid token above then we will have broken + out of the loop. We only get here if the token was merged with + the 'if' condition, in which case we can discard the last token + and then check the token before that. */ + backward_results.pop_back (); + } + + /* If after the above checks we still have some tokens in the + BACKWARD_RESULTS vector, then these need to be appended to the + FORWARD_RESULTS vector. However, we first reverse the order so that + FORWARD_RESULTS retains the tokens in the order they appeared in the + input string. */ + if (!backward_results.empty ()) + forward_results.insert (forward_results.end (), + backward_results.rbegin (), + backward_results.rend ()); + + return forward_results; +} + +/* Called when the global debug_breakpoint is true. Prints VEC to the + debug output stream. */ + +static void +dump_condition_tokens (const std::vector &vec) +{ + gdb_assert (debug_breakpoint); + + bool first = true; + std::string str = "Tokens: "; + for (const token &t : vec) + { + if (!first) + str += " "; + first = false; + str += t.to_string (); + } + breakpoint_debug_printf ("%s", str.c_str ()); +} + +/* See break-cond-parse.h. */ + +void +create_breakpoint_parse_arg_string + (const char *str, gdb::unique_xmalloc_ptr *cond_string_ptr, + int *thread_ptr, int *inferior_ptr, int *task_ptr, + gdb::unique_xmalloc_ptr *rest_ptr, bool *force_ptr) +{ + /* Set up the defaults. */ + cond_string_ptr->reset (); + rest_ptr->reset (); + *thread_ptr = -1; + *inferior_ptr = -1; + *task_ptr = -1; + *force_ptr = false; + + if (str == nullptr) + return; + + /* Split STR into a series of tokens. */ + std::vector tokens = parse_all_tokens (str); + if (debug_breakpoint) + dump_condition_tokens (tokens); + + /* Temporary variables. Initialised to the default state, then updated + as we parse TOKENS. If all of TOKENS is parsed successfully then the + state from these variables is copied into the output arguments before + the function returns. */ + int thread = -1, inferior = -1, task = -1; + bool force = false; + gdb::unique_xmalloc_ptr cond_string, rest; + + for (const token &t : tokens) + { + switch (t.get_type ()) + { + case token::type::FORCE: + force = true; + break; + case token::type::THREAD: + { + if (thread != -1) + error ("You can specify only one thread."); + if (task != -1 || inferior != -1) + error ("You can specify only one of thread, inferior, or task."); + const char *tmptok; + thread_info *thr + = parse_thread_id (std::string (t.get_value ()).c_str (), + &tmptok); + gdb_assert (*tmptok == '\0'); + thread = thr->global_num; + } + break; + case token::type::INFERIOR: + { + if (inferior != -1) + error ("You can specify only one inferior."); + if (task != -1 || thread != -1) + error ("You can specify only one of thread, inferior, or task."); + char *tmptok; + long inferior_id + = strtol (std::string (t.get_value ()).c_str (), &tmptok, 0); + if (*tmptok != '\0') + error (_("Junk '%s' after inferior keyword."), tmptok); + if (inferior_id > INT_MAX) + error (_("No inferior number '%ld'"), inferior_id); + inferior = static_cast (inferior_id); + struct inferior *inf = find_inferior_id (inferior); + if (inf == nullptr) + error (_("No inferior number '%d'"), inferior); + } + break; + case token::type::TASK: + { + if (task != -1) + error ("You can specify only one task."); + if (inferior != -1 || thread != -1) + error ("You can specify only one of thread, inferior, or task."); + char *tmptok; + long task_id + = strtol (std::string (t.get_value ()).c_str (), &tmptok, 0); + if (*tmptok != '\0') + error (_("Junk '%s' after task keyword."), tmptok); + if (task_id > INT_MAX) + error (_("Unknown task %ld"), task_id); + task = static_cast (task_id); + if (!valid_task_id (task)) + error (_("Unknown task %d."), task); + } + break; + case token::type::CONDITION: + cond_string.reset (savestring (t.get_value ().data (), + t.get_value ().size ())); + break; + case token::type::REST: + rest.reset (savestring (t.get_value ().data (), + t.get_value ().size ())); + break; + } + } + + /* Move results into the output locations. */ + *force_ptr = force; + *thread_ptr = thread; + *inferior_ptr = inferior; + *task_ptr = task; + rest_ptr->reset (rest.release ()); + cond_string_ptr->reset (cond_string.release ()); +} + +#if GDB_SELF_TEST + +namespace selftests { + +/* Run a single test of the create_breakpoint_parse_arg_string function. + INPUT is passed to create_breakpoint_parse_arg_string while all other + arguments are the expected output from + create_breakpoint_parse_arg_string. */ + +static void +test (const char *input, const char *condition, int thread = -1, + int inferior = -1, int task = -1, bool force = false, + const char *rest = nullptr, const char *error_msg = nullptr) +{ + gdb::unique_xmalloc_ptr extracted_condition; + gdb::unique_xmalloc_ptr extracted_rest; + int extracted_thread, extracted_inferior, extracted_task; + bool extracted_force_condition; + std::string exception_msg, error_str; + + if (error_msg != nullptr) + error_str = std::string (error_msg) + "\n"; + + try + { + create_breakpoint_parse_arg_string (input, &extracted_condition, + &extracted_thread, + &extracted_inferior, + &extracted_task, &extracted_rest, + &extracted_force_condition); + } + catch (const gdb_exception_error &ex) + { + string_file buf; + + exception_print (&buf, ex); + exception_msg = buf.release (); + } + + if ((condition == nullptr) != (extracted_condition.get () == nullptr) + || (condition != nullptr + && strcmp (condition, extracted_condition.get ()) != 0) + || (rest == nullptr) != (extracted_rest.get () == nullptr) + || (rest != nullptr && strcmp (rest, extracted_rest.get ()) != 0) + || thread != extracted_thread + || inferior != extracted_inferior + || task != extracted_task + || force != extracted_force_condition + || exception_msg != error_str) + { + if (run_verbose ()) + { + debug_printf ("input: '%s'\n", input); + debug_printf ("condition: '%s'\n", extracted_condition.get ()); + debug_printf ("rest: '%s'\n", extracted_rest.get ()); + debug_printf ("thread: %d\n", extracted_thread); + debug_printf ("inferior: %d\n", extracted_inferior); + debug_printf ("task: %d\n", extracted_task); + debug_printf ("forced: %s\n", + extracted_force_condition ? "true" : "false"); + debug_printf ("exception: '%s'\n", exception_msg.c_str ()); + } + + /* Report the failure. */ + SELF_CHECK (false); + } +} + +/* Wrapper for test function. Pass through the default values for all + parameters, except the last parameter, which indicates that we expect + INPUT to trigger an error. */ + +static void +test_error (const char *input, const char *error_msg) +{ + test (input, nullptr, -1, -1, -1, false, nullptr, error_msg); +} + +/* Test the create_breakpoint_parse_arg_string function. Just wraps + multiple calls to the test function above. */ + +static void +create_breakpoint_parse_arg_string_tests () +{ + gdbarch *arch = current_inferior ()->arch (); + scoped_restore_current_pspace_and_thread restore; + scoped_mock_context mock_target (arch); + + int global_thread_num = mock_target.mock_thread.global_num; + + /* Test parsing valid breakpoint condition strings. */ + test (" if blah ", "blah"); + test (" if blah thread 1", "blah", global_thread_num); + test (" if blah inferior 1", "blah", -1, 1); + test (" if blah thread 1 ", "blah", global_thread_num); + test ("thread 1 woof", nullptr, global_thread_num, -1, -1, false, "woof"); + test ("thread 1 X", nullptr, global_thread_num, -1, -1, false, "X"); + test (" if blah thread 1 -force-condition", "blah", global_thread_num, + -1, -1, true); + test (" -force-condition if blah thread 1", "blah", global_thread_num, + -1, -1, true); + test (" -force-condition if blah thread 1 ", "blah", global_thread_num, + -1, -1, true); + test ("thread 1 -force-condition if blah", "blah", global_thread_num, + -1, -1, true); + test ("if (A::outer::func ())", "(A::outer::func ())"); + test ("if ( foo == thread )", "( foo == thread )"); + test ("if ( foo == thread ) inferior 1", "( foo == thread )", -1, 1); + test ("if ( foo == thread ) thread 1", "( foo == thread )", + global_thread_num); + test ("if foo == thread", "foo == thread"); + test ("if foo == thread 1", "foo ==", global_thread_num); + + /* Test parsing some invalid breakpoint condition strings. */ + test_error ("thread 1 if foo == 123 thread 1", + "You can specify only one thread."); + test_error ("thread 1 if foo == 123 inferior 1", + "You can specify only one of thread, inferior, or task."); + test_error ("thread 1 if foo == 123 task 1", + "You can specify only one of thread, inferior, or task."); + test_error ("inferior 1 if foo == 123 inferior 1", + "You can specify only one inferior."); + test_error ("inferior 1 if foo == 123 thread 1", + "You can specify only one of thread, inferior, or task."); + test_error ("inferior 1 if foo == 123 task 1", + "You can specify only one of thread, inferior, or task."); + test_error ("thread 1.2.3", "Invalid thread ID: 1.2.3"); + test_error ("thread 1/2", "Invalid thread ID: 1/2"); + test_error ("thread 1xxx", "Invalid thread ID: 1xxx"); + test_error ("inferior 1xxx", "Junk 'xxx' after inferior keyword."); + test_error ("task 1xxx", "Junk 'xxx' after task keyword."); +} + +} // namespace selftests +#endif /* GDB_SELF_TEST */ + +void _initialize_break_cond_parse (); +void +_initialize_break_cond_parse () +{ +#if GDB_SELF_TEST + selftests::register_test + ("create_breakpoint_parse_arg_string", + selftests::create_breakpoint_parse_arg_string_tests); +#endif +} diff --git a/gdb/break-cond-parse.h b/gdb/break-cond-parse.h new file mode 100644 index 00000000000..cbee70f4e9e --- /dev/null +++ b/gdb/break-cond-parse.h @@ -0,0 +1,52 @@ +/* Copyright (C) 2023 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 . */ + +#if !defined (BREAK_COND_PARSE_H) +#define BREAK_COND_PARSE_H 1 + +/* Given TOK, a string possibly containing a condition, thread, inferior, + task and force-condition flag, as accepted by the 'break' command, + extract the condition string, thread, inferior, task number, and the + force_condition flag, then set *COND_STRING, *THREAD, *INFERIOR, *TASK, + and *FORCE. + + As TOK is parsed, if an unknown keyword is encountered before the 'if' + keyword then everything starting from the unknown keyword is placed into + *REST. + + Both *COND and *REST are initialized to nullptr. If no 'if' keyword is + found then *COND will be returned as nullptr. If no unknown content is + found then *REST is returned as nullptr. + + If no thread is found, *THREAD is set to -1. If no inferior is found, + *INFERIOR is set to -1. If no task is found, *TASK is set to -1. If + the -force-condition flag is not found then *FORCE is set to false. + + Due to the free-form nature that the string TOK might take (a 'thread' + keyword can appear before or after an 'if' condition) then we end up + having to check for keywords from both the start of TOK and the end of + TOK. + + If TOK is nullptr, or TOK is the empty string, then the output variables + are all given their default values. */ + +extern void create_breakpoint_parse_arg_string + (const char *tok, gdb::unique_xmalloc_ptr *cond_string, + int *thread, int *inferior, int *task, + gdb::unique_xmalloc_ptr *rest, bool *force); + +#endif diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index d940786e6d3..cc853c3251e 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -70,6 +70,7 @@ #include "cli/cli-style.h" #include "cli/cli-decode.h" #include +#include "break-cond-parse.h" /* readline include files */ #include "readline/tilde.h" @@ -6318,20 +6319,7 @@ print_breakpoint_location (const breakpoint *b, const bp_location *loc) uiout->field_stream ("at", stb); } else - { - uiout->field_string ("pending", b->locspec->to_string ()); - /* If extra_string is available, it could be holding a condition - or dprintf arguments. In either case, make sure it is printed, - too, but only for non-MI streams. */ - if (!uiout->is_mi_like_p () && b->extra_string != NULL) - { - if (b->type == bp_dprintf) - uiout->text (","); - else - uiout->text (" "); - uiout->text (b->extra_string.get ()); - } - } + uiout->field_string ("pending", b->locspec->to_string ()); if (loc && is_breakpoint (b) && breakpoint_condition_evaluation_mode () == condition_evaluation_target @@ -8696,8 +8684,8 @@ code_breakpoint::code_breakpoint (struct gdbarch *gdbarch_, command line, otherwise it's an error. */ if (type == bp_dprintf) update_dprintf_command_list (this); - else if (extra_string != nullptr) - error (_("Garbage '%s' at end of command"), extra_string.get ()); + else + gdb_assert (extra_string == nullptr); /* The order of the locations is now stable. Set the location condition using the location's number. */ @@ -8926,197 +8914,6 @@ check_fast_tracepoint_sals (struct gdbarch *gdbarch, } } -/* Given TOK, a string specification of condition and thread, as accepted - by the 'break' command, extract the condition string into *COND_STRING. - If no condition string is found then *COND_STRING is set to nullptr. - - If the breakpoint specification has an associated thread, task, or - inferior, these are extracted into *THREAD, *TASK, and *INFERIOR - respectively, otherwise these arguments are set to -1 (for THREAD and - INFERIOR) or 0 (for TASK). - - PC identifies the context at which the condition should be parsed. */ - -static void -find_condition_and_thread (const char *tok, CORE_ADDR pc, - gdb::unique_xmalloc_ptr *cond_string, - int *thread, int *inferior, int *task, - gdb::unique_xmalloc_ptr *rest) -{ - cond_string->reset (); - *thread = -1; - *inferior = -1; - *task = -1; - rest->reset (); - bool force = false; - - while (tok && *tok) - { - const char *end_tok; - int toklen; - const char *cond_start = NULL; - const char *cond_end = NULL; - - tok = skip_spaces (tok); - - if ((*tok == '"' || *tok == ',') && rest) - { - rest->reset (savestring (tok, strlen (tok))); - break; - } - - end_tok = skip_to_space (tok); - - toklen = end_tok - tok; - - if (toklen >= 1 && strncmp (tok, "if", toklen) == 0) - { - tok = cond_start = end_tok + 1; - try - { - parse_exp_1 (&tok, pc, block_for_pc (pc), 0); - } - catch (const gdb_exception_error &) - { - if (!force) - throw; - else - tok = tok + strlen (tok); - } - cond_end = tok; - cond_string->reset (savestring (cond_start, cond_end - cond_start)); - } - else if (toklen >= 1 && strncmp (tok, "-force-condition", toklen) == 0) - { - tok = tok + toklen; - force = true; - } - else if (toklen >= 1 && strncmp (tok, "thread", toklen) == 0) - { - const char *tmptok; - struct thread_info *thr; - - if (*thread != -1) - error(_("You can specify only one thread.")); - - if (*task != -1) - error (_("You can specify only one of thread or task.")); - - if (*inferior != -1) - error (_("You can specify only one of inferior or thread.")); - - tok = end_tok + 1; - thr = parse_thread_id (tok, &tmptok); - if (tok == tmptok) - error (_("Junk after thread keyword.")); - *thread = thr->global_num; - tok = tmptok; - } - else if (toklen >= 1 && strncmp (tok, "inferior", toklen) == 0) - { - if (*inferior != -1) - error(_("You can specify only one inferior.")); - - if (*task != -1) - error (_("You can specify only one of inferior or task.")); - - if (*thread != -1) - error (_("You can specify only one of inferior or thread.")); - - char *tmptok; - tok = end_tok + 1; - *inferior = strtol (tok, &tmptok, 0); - if (tok == tmptok) - error (_("Junk after inferior keyword.")); - if (!valid_global_inferior_id (*inferior)) - error (_("Unknown inferior number %d."), *inferior); - tok = tmptok; - } - else if (toklen >= 1 && strncmp (tok, "task", toklen) == 0) - { - char *tmptok; - - if (*task != -1) - error(_("You can specify only one task.")); - - if (*thread != -1) - error (_("You can specify only one of thread or task.")); - - if (*inferior != -1) - error (_("You can specify only one of inferior or task.")); - - tok = end_tok + 1; - *task = strtol (tok, &tmptok, 0); - if (tok == tmptok) - error (_("Junk after task keyword.")); - if (!valid_task_id (*task)) - error (_("Unknown task %d."), *task); - tok = tmptok; - } - else if (rest) - { - rest->reset (savestring (tok, strlen (tok))); - break; - } - else - error (_("Junk at end of arguments.")); - } -} - -/* Call 'find_condition_and_thread' for each sal in SALS until a parse - succeeds. The parsed values are written to COND_STRING, THREAD, - TASK, and REST. See the comment of 'find_condition_and_thread' - for the description of these parameters and INPUT. */ - -static void -find_condition_and_thread_for_sals (const std::vector &sals, - const char *input, - gdb::unique_xmalloc_ptr *cond_string, - int *thread, int *inferior, int *task, - gdb::unique_xmalloc_ptr *rest) -{ - int num_failures = 0; - for (auto &sal : sals) - { - gdb::unique_xmalloc_ptr cond; - int thread_id = -1; - int inferior_id = -1; - int task_id = -1; - gdb::unique_xmalloc_ptr remaining; - - /* Here we want to parse 'arg' to separate condition from thread - number. But because parsing happens in a context and the - contexts of sals might be different, try each until there is - success. Finding one successful parse is sufficient for our - goal. When setting the breakpoint we'll re-parse the - condition in the context of each sal. */ - try - { - find_condition_and_thread (input, sal.pc, &cond, &thread_id, - &inferior_id, &task_id, &remaining); - *cond_string = std::move (cond); - /* A value of -1 indicates that these fields are unset. At most - one of these fields should be set (to a value other than -1) - at this point. */ - gdb_assert (((thread_id == -1 ? 1 : 0) - + (task_id == -1 ? 1 : 0) - + (inferior_id == -1 ? 1 : 0)) >= 2); - *thread = thread_id; - *inferior = inferior_id; - *task = task_id; - *rest = std::move (remaining); - break; - } - catch (const gdb_exception_error &e) - { - num_failures++; - /* If no sal remains, do not continue. */ - if (num_failures == sals.size ()) - throw; - } - } -} - /* Decode a static tracepoint marker spec. */ static std::vector @@ -9233,6 +9030,46 @@ create_breakpoint (struct gdbarch *gdbarch, ? (extra_string != nullptr && !parse_extra) : (extra_string == nullptr || parse_extra)); + /* Will hold either copies of the similarly named function argument, or + will hold a modified version of the function argument, depending on + the value of PARSE_EXTRA. */ + gdb::unique_xmalloc_ptr cond_string_copy; + gdb::unique_xmalloc_ptr extra_string_copy; + + if (parse_extra) + { + /* Parse EXTRA_STRING splitting the parts out. */ + create_breakpoint_parse_arg_string (extra_string, &cond_string_copy, + &thread, &inferior, &task, + &extra_string_copy, + &force_condition); + + /* We could check that EXTRA_STRING_COPY is empty at this point -- it + should be, as we only get here for things that are not bp_dprintf, + however, we prefer to give the location spec parser a chance to + run first, this means the user will get errors about invalid + location spec instead of an error about garbage at the end of the + command line. + + We still do the EXTRA_STRING_COPY is empty check, just later in + this function. */ + + gdb_assert (thread == -1 || thread > 0); + gdb_assert (task == -1 || task > 0); + gdb_assert (inferior == -1 || inferior > 0); + } + else + { + if (cond_string != nullptr) + cond_string_copy.reset (xstrdup (cond_string)); + if (extra_string != nullptr) + extra_string_copy.reset (xstrdup (extra_string)); + } + + /* Clear these. Updated values are now held in the *_copy locals. */ + cond_string = nullptr; + extra_string = nullptr; + try { ops->create_sals_from_location_spec (locspec, &canonical); @@ -9268,6 +9105,13 @@ create_breakpoint (struct gdbarch *gdbarch, throw; } + /* Only bp_dprintf breakpoints should have anything in EXTRA_STRING_COPY + by this point. For all other breakpoints this indicates an error. We + could place this check earlier in the function, but we prefer to see + errors from the location spec parser before we see this error message. */ + if (type_wanted != bp_dprintf && extra_string_copy.get () != nullptr) + error (_("Garbage '%s' at end of command"), extra_string_copy.get ()); + if (!pending && canonical.lsals.empty ()) return 0; @@ -9291,63 +9135,31 @@ create_breakpoint (struct gdbarch *gdbarch, breakpoint. */ if (!pending) { - gdb::unique_xmalloc_ptr cond_string_copy; - gdb::unique_xmalloc_ptr extra_string_copy; - - if (parse_extra) + /* Check the validity of the condition. We should error out if the + condition is invalid at all of the locations and if it is not + forced. In the PARSE_EXTRA case above, this check is done when + parsing the EXTRA_STRING. */ + if (cond_string_copy.get () != nullptr && !force_condition) { - gdb_assert (type_wanted != bp_dprintf); - - gdb::unique_xmalloc_ptr rest; - gdb::unique_xmalloc_ptr cond; - + int num_failures = 0; const linespec_sals &lsal = canonical.lsals[0]; - - find_condition_and_thread_for_sals (lsal.sals, extra_string, - &cond, &thread, &inferior, - &task, &rest); - - if (rest.get () != nullptr && *(rest.get ()) != '\0') - error (_("Garbage '%s' at end of command"), rest.get ()); - - cond_string_copy = std::move (cond); - extra_string_copy = std::move (rest); - } - else - { - /* Check the validity of the condition. We should error out - if the condition is invalid at all of the locations and - if it is not forced. In the PARSE_EXTRA case above, this - check is done when parsing the EXTRA_STRING. */ - if (cond_string != nullptr && !force_condition) + for (const auto &sal : lsal.sals) { - int num_failures = 0; - const linespec_sals &lsal = canonical.lsals[0]; - for (const auto &sal : lsal.sals) + const char *cond = cond_string_copy.get (); + try { - const char *cond = cond_string; - try - { - parse_exp_1 (&cond, sal.pc, block_for_pc (sal.pc), 0); - /* One success is sufficient to keep going. */ - break; - } - catch (const gdb_exception_error &) - { - num_failures++; - /* If this is the last sal, error out. */ - if (num_failures == lsal.sals.size ()) - throw; - } + parse_exp_1 (&cond, sal.pc, block_for_pc (sal.pc), 0); + /* One success is sufficient to keep going. */ + break; + } + catch (const gdb_exception_error &) + { + num_failures++; + /* If this is the last sal, error out. */ + if (num_failures == lsal.sals.size ()) + throw; } } - - /* Create a private copy of condition string. */ - if (cond_string) - cond_string_copy.reset (xstrdup (cond_string)); - /* Create a private copy of any extra string. */ - if (extra_string) - extra_string_copy.reset (xstrdup (extra_string)); } ops->create_breakpoints_sal (gdbarch, &canonical, @@ -9364,21 +9176,16 @@ create_breakpoint (struct gdbarch *gdbarch, type_wanted); b->locspec = locspec->clone (); - if (parse_extra) - b->cond_string = NULL; - else - { - /* Create a private copy of condition string. */ - b->cond_string.reset (cond_string != NULL - ? xstrdup (cond_string) - : NULL); - b->thread = thread; - } + /* Create a private copy of the condition string. */ + b->cond_string = std::move (cond_string_copy); + + b->thread = thread; + b->task = task; + b->inferior = inferior; /* Create a private copy of any extra string. */ - b->extra_string.reset (extra_string != NULL - ? xstrdup (extra_string) - : NULL); + b->extra_string = std::move (extra_string_copy); + b->ignore_count = ignore_count; b->disposition = tempflag ? disp_del : disp_donttouch; b->condition_not_parsed = 1; @@ -9387,9 +9194,12 @@ create_breakpoint (struct gdbarch *gdbarch, && type_wanted != bp_hardware_breakpoint) || thread != -1) b->pspace = current_program_space; + if (b->type == bp_dprintf) + update_dprintf_command_list (b.get ()); + install_breakpoint (internal, std::move (b), 0); } - + if (canonical.lsals.size () > 1) { warning (_("Multiple breakpoints were set.\nUse the " @@ -13120,24 +12930,6 @@ code_breakpoint::location_spec_to_sals (location_spec *locspec, { for (auto &sal : sals) resolve_sal_pc (&sal); - if (condition_not_parsed && extra_string != NULL) - { - gdb::unique_xmalloc_ptr local_cond, local_extra; - int local_thread, local_task, local_inferior; - - find_condition_and_thread_for_sals (sals, extra_string.get (), - &local_cond, &local_thread, - &local_inferior, - &local_task, &local_extra); - gdb_assert (cond_string == nullptr); - if (local_cond != nullptr) - cond_string = std::move (local_cond); - thread = local_thread; - task = local_task; - if (local_extra != nullptr) - extra_string = std::move (local_extra); - condition_not_parsed = 0; - } if (type == bp_static_tracepoint) { diff --git a/gdb/testsuite/gdb.ada/tasks.exp b/gdb/testsuite/gdb.ada/tasks.exp index 6e588408c9d..ecbfbd5522f 100644 --- a/gdb/testsuite/gdb.ada/tasks.exp +++ b/gdb/testsuite/gdb.ada/tasks.exp @@ -55,11 +55,11 @@ gdb_test "watch j task 1 task 3" "You can specify only one task\\." # Check that attempting to combine 'task' and 'thread' gives an error. gdb_test "break break_me task 1 thread 1" \ - "You can specify only one of thread or task\\." + "You can specify only one of thread, inferior, or task\\." gdb_test "break break_me thread 1 task 1" \ - "You can specify only one of thread or task\\." + "You can specify only one of thread, inferior, or task\\." gdb_test "break break_me inferior 1 task 1" \ - "You can specify only one of inferior or task\\." + "You can specify only one of thread, inferior, or task\\." gdb_test "watch j task 1 thread 1" \ "You can specify only one of thread or task\\." gdb_test "watch j thread 1 task 1" \ diff --git a/gdb/testsuite/gdb.base/condbreak.exp b/gdb/testsuite/gdb.base/condbreak.exp index 65d19b3e7a9..3b619e47bfc 100644 --- a/gdb/testsuite/gdb.base/condbreak.exp +++ b/gdb/testsuite/gdb.base/condbreak.exp @@ -179,6 +179,10 @@ gdb_test "break -q main if (1==1) thread 999" \ "Unknown thread 999\\." gdb_test "break -q main thread 999 if (1==1)" \ "Unknown thread 999\\." +gdb_test "break -q main if (1==1) thread 999 -force-condition" \ + "Unknown thread 999\\." +gdb_test "break -q main thread 999 if (1==1) -force-condition" \ + "Unknown thread 999\\." # Verify that both if and thread can be distinguished from a breakpoint # address expression. @@ -186,20 +190,71 @@ gdb_test "break *main if (1==1) thread 999" \ "Unknown thread 999\\." gdb_test "break *main thread 999 if (1==1)" \ "Unknown thread 999\\." +gdb_test "break *main if (1==1) thread 999 -force-condition" \ + "Unknown thread 999\\." +gdb_test "break *main thread 999 if (1==1) -force-condition" \ + "Unknown thread 999\\." # Similarly for task. gdb_test "break *main if (1==1) task 999" \ "Unknown task 999\\." gdb_test "break *main task 999 if (1==1)" \ "Unknown task 999\\." +gdb_test "break *main if (1==1) task 999 -force-condition" \ + "Unknown task 999\\." +gdb_test "break *main task 999 if (1==1) -force-condition" \ + "Unknown task 999\\." -# GDB accepts abbreviations for "thread" and "task". +# GDB accepts abbreviations for "thread", "task" and +# "-force-condition", when these keywords appear after +# the breakpoint condition. gdb_test "break *main if (1==1) t 999" \ "Unknown thread 999\\." gdb_test "break *main if (1==1) th 999" \ "Unknown thread 999\\." gdb_test "break *main if (1==1) ta 999" \ "Unknown task 999\\." +gdb_test "break *main if (1==1) t 999 -force" \ + "Unknown thread 999\\." +gdb_test "break *main if (1==1) th 999 -force" \ + "Unknown thread 999\\." +gdb_test "break *main if (1==1) ta 999 -force" \ + "Unknown task 999\\." + +# Check the use of abbreviations before the condition. This works +# because, when the location spec starts with '*' GDB is able to +# figure out that the complete location is '*main'. +gdb_test "break *main t 999 if (1==1)" \ + "Unknown thread 999\\." +gdb_test "break *main th 999 if (1==1)" \ + "Unknown thread 999\\." +gdb_test "break *main ta 999 if (1==1)" \ + "Unknown task 999\\." +gdb_test "break *main t 999 -force if (1==1)" \ + "Unknown thread 999\\." +gdb_test "break *main th 999 -force if (1==1)" \ + "Unknown thread 999\\." +gdb_test "break *main ta 999 -force if (1==1)" \ + "Unknown task 999\\." + +# However, when the location spec doesn't start with '*' GDB relies on +# the linespec parser to spot the keyword which marks the end of the +# linespec, and this parser doesn't check for abbreviations. +gdb_test "with breakpoint pending off -- break main t 999 if (1==1)" \ + "Function \"main t 999\" not defined\\." +gdb_test "with breakpoint pending off -- break main th 999 if (1==1)" \ + "Function \"main th 999\" not defined\\." +gdb_test "with breakpoint pending off -- break main ta 999 if (1==1)" \ + "Function \"main ta 999\" not defined\\." + +# GDB does not treat a "-force-condition" flag that appears +# immediately after the condition as the flag, but instead treats it +# as " - force - condition", that is, subtraction of the symbol +# "force" followed by subtraction of symbol "context". This is really +# just a quirk of how this used to be implemented, and should maybe be +# changed in the future. However, for now GDB retains this behaviour. +gdb_test "break *main if (1==1) -force-condition" \ + "No symbol \"force\" in current context\\." set test "run until breakpoint at marker3" gdb_test_multiple "continue" $test { diff --git a/gdb/testsuite/gdb.base/pending.exp b/gdb/testsuite/gdb.base/pending.exp index 737b0c4e5d0..0cb86377400 100644 --- a/gdb/testsuite/gdb.base/pending.exp +++ b/gdb/testsuite/gdb.base/pending.exp @@ -170,7 +170,8 @@ gdb_test "info break" \ \[\t \]+stop only if k == 1.* \[\t \]+print k.* \[0-9\]+\[\t \]+breakpoint keep y.* in main at .*$srcfile:$mainline.* -\[0-9\]+\[\t \]+breakpoint keep y.*PENDING.*pendshr.c:$bp2_loc if x > 3.*" \ +\[0-9\]+\[\t \]+breakpoint keep y.*PENDING.*pendshr.c:$bp2_loc.* +\\s+stop only if x > 3.*" \ "multiple pending breakpoints" @@ -195,8 +196,10 @@ gdb_test "info break" \ \[\t \]+stop only if k == 1.* \[\t \]+print k.* \[0-9\]+\[\t \]+breakpoint keep y.* in main at .*$srcfile:$mainline.* -\[0-9\]+\[\t \]+breakpoint keep y.*PENDING.*pendshr.c:$bp2_loc if x > 3.* -\[0-9\]+\[\t \]+breakpoint keep y.*PENDING.*pendshr.c:$bp3_loc.*ignore next 2 hits.*" \ +\[0-9\]+\[\t \]+breakpoint keep y.*PENDING.*pendshr.c:$bp2_loc.* +\\s+stop only if x > 3.* +\[0-9\]+\[\t \]+breakpoint keep y.*PENDING.*pendshr.c:$bp3_loc.* +\\s+ignore next 2 hits.*" \ "multiple pending breakpoints 2" # @@ -267,3 +270,17 @@ gdb_test "info break" \ \[0-9\]+\[\t \]+breakpoint keep y.* in main at .*$srcfile:$mainline.* \[0-9\]+\[\t \]+breakpoint keep y.*PENDING.*imaginary.*" \ "verify pending breakpoint after restart" + +# Test GDB's parsing of pending breakpoint thread and condition. + +gdb_test_no_output "set breakpoint pending on" +gdb_test "break foo if (unknown_var && another_unknown_var) thread 1" \ + "Breakpoint $decimal \\(foo\\) pending\\." +set bpnum [get_integer_valueof "\$bpnum" "*INVALID" \ + "get number for foo breakpoint"] +gdb_test "info breakpoints $bpnum" \ + [multi_line \ + "$bpnum\\s+breakpoint\\s+keep\\s+y\\s+\\s+foo" \ + "\\s+stop only if \\(unknown_var && another_unknown_var\\)" \ + "\\s+stop only in thread 1"] \ + "check pending breakpoint on foo" diff --git a/gdb/testsuite/gdb.linespec/explicit.exp b/gdb/testsuite/gdb.linespec/explicit.exp index 625f9cee0fc..9a11182fae7 100644 --- a/gdb/testsuite/gdb.linespec/explicit.exp +++ b/gdb/testsuite/gdb.linespec/explicit.exp @@ -575,7 +575,7 @@ namespace eval $testfile { allow-pending]} { fail "set $tst" } else { - gdb_test "info break" ".*PENDING.*myfunction if foofoofoo == 1.*" $tst + gdb_test "info break" ".*PENDING.*myfunction\r\n\\s+stop only if foofoofoo == 1.*" $tst } gdb_exit @@ -586,7 +586,7 @@ namespace eval $testfile { allow-pending]} { fail "set $tst" } else { - gdb_test "info break" ".*PENDING.*myfunction if arg == 0" $tst + gdb_test "info break" ".*PENDING.*myfunction\r\n\\s+stop only if arg == 0" $tst gdb_load [standard_output_file $exefile] gdb_test "info break" \ diff --git a/gdb/testsuite/gdb.linespec/keywords.exp b/gdb/testsuite/gdb.linespec/keywords.exp index 36a919c8be2..d2596d2b357 100644 --- a/gdb/testsuite/gdb.linespec/keywords.exp +++ b/gdb/testsuite/gdb.linespec/keywords.exp @@ -55,7 +55,7 @@ with_test_prefix "trailing whitespace" { gdb_test "break thread 123" "Unknown thread 123\\." gdb_test "break thread foo" "Invalid thread ID: foo" gdb_test "break task 123" "Unknown task 123\\." -gdb_test "break task foo" "Junk after task keyword\\." +gdb_test "break task foo" "Junk 'foo' after task keyword\\." gdb_breakpoint "thread if 0" "message" # These are also NULL locations, but using a subsequent keyword @@ -63,9 +63,9 @@ gdb_breakpoint "thread if 0" "message" gdb_test "break thread thread" "Invalid thread ID: thread" gdb_test "break thread task" "Invalid thread ID: task" gdb_test "break thread if" "Invalid thread ID: if" -gdb_test "break task task" "Junk after task keyword\\." -gdb_test "break task thread" "Junk after task keyword\\." -gdb_test "break task if" "Junk after task keyword\\." +gdb_test "break task task" "Junk 'task' after task keyword\\." +gdb_test "break task thread" "Junk 'thread' after task keyword\\." +gdb_test "break task if" "Junk 'if' after task keyword\\." # Test locations containing keyword followed by keyword. gdb_test "break thread thread 123" "Unknown thread 123\\." diff --git a/gdb/testsuite/gdb.mi/mi-dprintf-pending.exp b/gdb/testsuite/gdb.mi/mi-dprintf-pending.exp index fd5684bd2b1..4cf6dec4b41 100644 --- a/gdb/testsuite/gdb.mi/mi-dprintf-pending.exp +++ b/gdb/testsuite/gdb.mi/mi-dprintf-pending.exp @@ -50,7 +50,8 @@ set bp_location1 [gdb_get_line_number "set breakpoint 1 here"] # Set pending dprintf via MI. set bp [mi_make_breakpoint_pending -number "1" -type "dprintf" \ -disp "keep" -enabled "y" -pending "pendfunc1" \ - -original-location "pendfunc1"] + -original-location "pendfunc1" \ + -script {\["printf \\\"hello\\\""\]}] mi_gdb_test "-dprintf-insert -f pendfunc1 \"hello\"" \ ".*\\^done,$bp" "mi set dprintf" diff --git a/gdb/testsuite/gdb.multi/inferior-specific-bp.exp b/gdb/testsuite/gdb.multi/inferior-specific-bp.exp index 5cc451b0ecc..46efe6f54bc 100644 --- a/gdb/testsuite/gdb.multi/inferior-specific-bp.exp +++ b/gdb/testsuite/gdb.multi/inferior-specific-bp.exp @@ -51,9 +51,9 @@ if {![runto_main]} { # this should fail. Try with the keywords in both orders just in case the # parser has a bug. gdb_test "break foo thread 1.1 inferior 1" \ - "You can specify only one of inferior or thread\\." + "You can specify only one of thread, inferior, or task\\." gdb_test "break foo inferior 1 thread 1.1" \ - "You can specify only one of inferior or thread\\." + "You can specify only one of thread, inferior, or task\\." # Try to create a breakpoint using the 'inferior' keyword multiple times. gdb_test "break foo inferior 1 inferior 2" \ diff --git a/gdb/testsuite/gdb.threads/del-pending-thread-bp-lib.c b/gdb/testsuite/gdb.threads/del-pending-thread-bp-lib.c new file mode 100644 index 00000000000..15d1b9833dd --- /dev/null +++ b/gdb/testsuite/gdb.threads/del-pending-thread-bp-lib.c @@ -0,0 +1,22 @@ +/* Copyright 2023 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +int global_var = 0; + +void +foo (int arg) +{ + global_var = arg; +} diff --git a/gdb/testsuite/gdb.threads/del-pending-thread-bp.c b/gdb/testsuite/gdb.threads/del-pending-thread-bp.c new file mode 100644 index 00000000000..6fc76dbf08c --- /dev/null +++ b/gdb/testsuite/gdb.threads/del-pending-thread-bp.c @@ -0,0 +1,85 @@ +/* Copyright 2023 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#include +#include +#include + +pthread_barrier_t barrier; + +static void +barrier_wait (pthread_barrier_t *b) +{ + int res = pthread_barrier_wait (b); + if (res != 0 && res != PTHREAD_BARRIER_SERIAL_THREAD) + abort (); +} + +static void * +thread_worker (void *arg) +{ + barrier_wait (&barrier); + return NULL; +} + +void +breakpt (void) +{ + /* Nothing. */ +} + +int +main (void) +{ + void *handle; + void (*func)(int); + pthread_t thread; + + if (pthread_barrier_init (&barrier, NULL, 2) != 0) + abort (); + + if (pthread_create (&thread, NULL, thread_worker, NULL) != 0) + abort (); + + breakpt (); + + /* Allow the worker thread to complete. */ + barrier_wait (&barrier); + + if (pthread_join (thread, NULL) != 0) + abort (); + + breakpt (); + + /* Now load the shared library. */ + handle = dlopen (SHLIB_NAME, RTLD_LAZY); + if (handle == NULL) + abort (); + + /* Find the function symbol. */ + func = (void (*)(int)) dlsym (handle, "foo"); + + /* Call the library function. */ + func (1); + + /* Unload the shared library. */ + if (dlclose (handle) != 0) + abort (); + + breakpt (); + + return 0; +} + diff --git a/gdb/testsuite/gdb.threads/del-pending-thread-bp.exp b/gdb/testsuite/gdb.threads/del-pending-thread-bp.exp new file mode 100644 index 00000000000..b919145ed41 --- /dev/null +++ b/gdb/testsuite/gdb.threads/del-pending-thread-bp.exp @@ -0,0 +1,108 @@ +# Copyright 2023 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# This test checks that pending thread-specific breakpoints are +# correctly deleted when the thread the breakpoint is for goes out of +# scope. +# +# We also check that we can't create a pending thread-specific +# breakpoint for a non-existent thread. + +require allow_shlib_tests + +standard_testfile + +set libname $testfile-lib +set srcfile_lib $srcdir/$subdir/$libname.c +set binfile_lib [standard_output_file $libname.so] + +if { [gdb_compile_shlib $srcfile_lib $binfile_lib {}] != "" } { + untested "failed to compile shared library 1" + return -1 +} + +set binfile_lib_target [gdb_download_shlib $binfile_lib] + +if { [prepare_for_testing "failed to prepare" $testfile $srcfile \ + [list debug \ + additional_flags=-DSHLIB_NAME=\"$binfile_lib_target\" \ + shlib_load pthreads]] } { + return -1 +} + +gdb_locate_shlib $binfile_lib + +if ![runto_main] { + return 0 +} + +# Run until we have two threads. +gdb_breakpoint "breakpt" +gdb_continue_to_breakpoint "first breakpt call" + +# Confirm that we have a thread '2'. +gdb_test "info threads" "\r\n\\s+2\\s+\[^\r\n\]+" + +# Create a pending, thread-specific, breakpoint on 'foo'. +gdb_breakpoint "foo thread 2" allow-pending +set bpnum [get_integer_valueof "\$bpnum" "*INVALID*" \ + "get breakpoint number"] + +# Check we can't create a pending thread-specific breakpoint for a +# non-existent thread. +gdb_test "with breakpoint pending on -- break foo thread 99" \ + "Unknown thread 99\\." + +# Continue to 'breakpt' again. Don't use gdb_continue_to_breakpoint +# as we are looking for the thread exited and breakpoint deleted +# messages. +set output [list "Continuing\\."] + +if {!([target_info exists gdb_protocol] + && ([target_info gdb_protocol] == "remote" + || [target_info gdb_protocol] == "extended-remote"))} { + # Due to bug PR gdb/30129 we don't see the thread exited messages + # for remote targets. When this bit of this test can be cleaned + # up. + lappend output "\\\[Thread \[^\r\n\]+ exited\\\]" +} + +lappend output "Thread-specific breakpoint $bpnum deleted - thread 2 no longer in the thread list\\." \ + "" \ + "Thread 1 \[^\r\n\]+, breakpt \\(\\) at \[^\r\n\]+" \ + "$decimal\\s+\[^\r\n\]+" + +gdb_test "continue" \ + [multi_line {*}$output] \ + "second breakpt call" + +# Confirm breakpoint has been deleted. +gdb_test "info breakpoints $bpnum" \ + "No breakpoint, watchpoint, tracepoint, or catchpoint matching '$bpnum'\\." + +# Continue again. This will pass through 'foo'. We should not stop +# in 'foo', the breakpoint has been deleted. We should next stop in +# breakpt again. +gdb_test "continue" \ + [multi_line \ + "Continuing\\." \ + "" \ + "Thread 1 \[^\r\n\]+ hit Breakpoint $decimal, breakpt \\(\\) at \[^\r\n\]+" \ + "$decimal\\s+\[^\r\n\]+"] \ + "third breakpt call" +gdb_test "bt 1" \ + [multi_line \ + "#0\\s+breakpt \\(\\) at \[^\r\n\]+" \ + "\\(More stack frames follow\\.\\.\\.\\)"] From patchwork Tue Mar 5 15:21:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 86809 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 373433858291 for ; Tue, 5 Mar 2024 15:24:18 +0000 (GMT) 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 029A5385840E for ; Tue, 5 Mar 2024 15:22:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 029A5385840E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 029A5385840E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709652142; cv=none; b=liSD81J+ia7/ou2ZeJroETOkrc2x3mF7iCwxtRA/xDHqzg71e+oeIuSna1me8HuCKSjiAE20ffcVSCdEhsIvorgZczESghvLqtwU9eSdOiqer2Rd3c7GckBoeGfoSpN5IdcFY5Pz5yPUlToUNK/qefF7uGP83GsyIXqVgH1t0N4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709652142; c=relaxed/simple; bh=L254M+mW0usMzWarNV3mFQf07xABTsOx28zhJd/OphI=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=Rsj4NILbUTUGD644kzyPG2YExJG09oseuRPJ941NLmglQmyz8opOU8sig1R35LmocFafchGDqIG4HByncUtruDmZi0WWstsBtmyLBVLeVpnglLracLhhbTsTSzPEJ9FX/s0lXuF1mvH9Ld0lCOKbK7zN0HZ4aB+bgqKIW622SDM= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709652136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8JGlAon5zxdcHBfmXZ3kl/Hfc4f3EkrzGyCR8wAp20Y=; b=ayguMrxE4L0QN7+kP6KTqlnH4yDYvI1M/K//w2p/ElaJSMe348YbCXUUrIukSmifMvLQAX oxN5oBUsr147srRxjsyZxE3qAibAltXN7wvILiaL1rmED+L4Lpll07nJWrOtv0/NZwWnJo m2Va9vD244I9nJgBei6bz7V3XcNXDG0= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-279-PCZr7WCBMEmiE7ZVCuXMdw-1; Tue, 05 Mar 2024 10:22:13 -0500 X-MC-Unique: PCZr7WCBMEmiE7ZVCuXMdw-1 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-a450c660cdeso54738166b.3 for ; Tue, 05 Mar 2024 07:22:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709652131; x=1710256931; 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=8JGlAon5zxdcHBfmXZ3kl/Hfc4f3EkrzGyCR8wAp20Y=; b=XUWFhE+nG+X0vbiBRYJ7HHSdl82nZChZ9UzW1mvnjvyv9PfnlrtKuNILuFsz643b4G mstCUYIV65LZX2jNuQrWQ8pWDqXr8PA0le+TdglOk3U6ddRnQDu5FiuNOnDAWwDwW4tg jzM0SaWYVc5Oy5Do+MtoANzsx7q+FAmzd7cEWX58ZcibUPT/y41gGM9BDeFovuN/MIxv c6w5iKWA5NtG72INH6+86+HPXWboS/4m6dQOVwBTX9Zjd69R73zujaGVZ0yf9dkx6Pcz +sJzmpqdP/eckp/z9ny4tPocYmUu7n0UK1qkrwghprVk70Z82h3yPfbvV89F9+pD6IhX paFw== X-Gm-Message-State: AOJu0YxPxGllbcbgRKqyZV7KHWBzuha8nNL+UZvSG1hMaMKM1NyQtAqP itSSbxBter1+zRNElaO+xo6oXeHAR0cQURY3IPSuheb+JUHpB+4E68ZbhZkR6dvelaphpNyysF1 DMHn7nZe5I+yOXkdXMbxJywhrpuFU7TtRRIWAsHtzImvIs1vLE0sNDmLl53AYDLmqyavrWeYt91 vScGesTS/J7Mcbo2js3HaQcmgr5VEU27szZIhqQG4G1qg= X-Received: by 2002:a17:906:fa87:b0:a44:8ea2:23fa with SMTP id lt7-20020a170906fa8700b00a448ea223famr8914024ejb.46.1709652131037; Tue, 05 Mar 2024 07:22:11 -0800 (PST) X-Google-Smtp-Source: AGHT+IEI+hQBw2p7+W4PgolQ3joJcedwlRpY6YUB0o3FELYAyw/qpcAHe+k42XenIR+j2RAo3PsbJg== X-Received: by 2002:a17:906:fa87:b0:a44:8ea2:23fa with SMTP id lt7-20020a170906fa8700b00a448ea223famr8913991ejb.46.1709652130464; Tue, 05 Mar 2024 07:22:10 -0800 (PST) Received: from localhost (185.223.159.143.dyn.plus.net. [143.159.223.185]) by smtp.gmail.com with ESMTPSA id a15-20020a17090640cf00b00a4354b9893csm6139173ejk.74.2024.03.05.07.22.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Mar 2024 07:22:10 -0800 (PST) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCHv9 13/14] gdb: don't set breakpoint::pspace in create_breakpoint Date: Tue, 5 Mar 2024 15:21:44 +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=-12.3 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, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org I spotted this code within create_breakpoint: if ((type_wanted != bp_breakpoint && type_wanted != bp_hardware_breakpoint) || thread != -1) b->pspace = current_program_space; this code is only executed when creating a pending breakpoint, and sets the breakpoint::pspace member variable. The above code gained the 'thread != -1' clause with this commit: commit cc72b2a2da6d6372cbdb1d14639a5fce84e1a325 Date: Fri Dec 23 17:06:16 2011 +0000 Introduce gdb.FinishBreakpoint in Python While the type_wanted checks were added with this commit: commit f8eba3c61629b3c03ac1f33853eab4d8507adb9c Date: Tue Dec 6 18:54:43 2011 +0000 the "ambiguous linespec" series Before this breakpoint::pspace was set unconditionally. If we look at how breakpoint::pspace is used today, some breakpoint types specifically set this field, either in their constructors, or in a wrapper function that calls the constructor. So, the watchpoint type and its sub-class set this variable, as does the catchpoint type, and all it's sub-classes. However, code_breakpoint doesn't specifically set this field within its constructor, though some sub-classes of code_breakpoint (ada_catchpoint, exception_catchpoint, internal_breakpoint, and momentary_breakpoint) do set this field. When I examine all the places that breakpoint::pspace is used, I believe that in every place where it is expected that this field is set, the breakpoint type will be one that specifically sets this field. Next, I observe two problems with the existing code. First, the above code is only hit for pending breakpoints, there's no equivalent code for non-pending breakpoints. This opens up the possibility of GDB entering non-consistent states; if a breakpoint is first created pending and then later gets a location, the pspace field will be set, while if the breakpoint is immediately non-pending, then the pspace field will never be set. Second, if we look at how breakpoint::pspace is used in the function breakpoint_program_space_exit, we see that when a program space is removed, any breakpoint with breakpoint::pspace set to the removed program space, will be deleted. This makes sense, but does mean we need to ensure breakpoint::pspace is only set for breakpoints that apply to a single program space. So, if I create a pending dprintf breakpoint (type bp_dprintf) then the breakpoint::pspace variable will be set even though the dprintf is not really tied to that one program space. As a result, when the matching program space is removed the dprintf is incorrectly removed. Also, if I create a thread specific breakpoint, then, thanks to the 'thread != -1' clause the wrong program space will be stored in breakpoint::pspace (the current program space is always used, which might not be the program space that corresponds to the selected thread), as a result, the thread specific breakpoint will be deleted when the matching program space is removed. If we look at commit cc72b2a2da6d which added the 'thread != -1' clause, we can see this change was entirely redundant, the breakpoint::pspace is also set in bpfinishpy_init after create_breakpoint has been called. As such, I think we can safely drop the 'thread != -1' clause. For the other problems, I'm proposing to be pretty aggressive - I'd like to drop the breakpoint::pspace assignment completely from create_breakpoint. Having looked at how this variable is used, I believe that it is already set elsewhere in all the cases that it is needed. Maybe this code was needed at one time, but I can't see how it's needed any more. There's tests to expose the issues I've spotted with this code, and there's no regressions in testing. --- gdb/breakpoint.c | 3 - gdb/breakpoint.h | 18 +- .../gdb.multi/pending-bp-del-inferior.c | 28 +++ .../gdb.multi/pending-bp-del-inferior.exp | 216 ++++++++++++++++++ 4 files changed, 259 insertions(+), 6 deletions(-) create mode 100644 gdb/testsuite/gdb.multi/pending-bp-del-inferior.c create mode 100644 gdb/testsuite/gdb.multi/pending-bp-del-inferior.exp diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index cc853c3251e..e1efde66feb 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -9190,9 +9190,6 @@ create_breakpoint (struct gdbarch *gdbarch, b->disposition = tempflag ? disp_del : disp_donttouch; b->condition_not_parsed = 1; b->enable_state = enabled ? bp_enabled : bp_disabled; - if ((type_wanted != bp_breakpoint - && type_wanted != bp_hardware_breakpoint) || thread != -1) - b->pspace = current_program_space; if (b->type == bp_dprintf) update_dprintf_command_list (b.get ()); diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h index 24aeaf926ec..42b49144e79 100644 --- a/gdb/breakpoint.h +++ b/gdb/breakpoint.h @@ -831,9 +831,21 @@ struct breakpoint : public intrusive_list_node equals this. */ struct frame_id frame_id = null_frame_id; - /* The program space used to set the breakpoint. This is only set - for breakpoints which are specific to a program space; for - non-thread-specific ordinary breakpoints this is NULL. */ + /* The program space used to set the breakpoint. This is only set for + breakpoints that are not type bp_breakpoint or bp_hardware_breakpoint. + For thread or inferior specific breakpoints, the breakpoints are + managed via the thread and inferior member variables. */ + + /* If not nullptr then this is the program space for which this + breakpoint was created. All watchpoint and catchpoint sub-types set + this field, but not all of the code_breakpoint sub-types do; + generally, user created breakpoint types don't set this field, though + things might be more consistent if they did. + + When this variable is nullptr then a breakpoint might be associated + with multiple program spaces, though you need to check the thread, + inferior and task variables to see if a breakpoint was created for a + specific thread, inferior, or Ada task respectively. */ program_space *pspace = NULL; /* The location specification we used to set the breakpoint. */ diff --git a/gdb/testsuite/gdb.multi/pending-bp-del-inferior.c b/gdb/testsuite/gdb.multi/pending-bp-del-inferior.c new file mode 100644 index 00000000000..1d030007819 --- /dev/null +++ b/gdb/testsuite/gdb.multi/pending-bp-del-inferior.c @@ -0,0 +1,28 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2023 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +int +foo (void) +{ + return 0; +} + +int +main (void) +{ + return foo (); +} diff --git a/gdb/testsuite/gdb.multi/pending-bp-del-inferior.exp b/gdb/testsuite/gdb.multi/pending-bp-del-inferior.exp new file mode 100644 index 00000000000..5fcd1ef2e39 --- /dev/null +++ b/gdb/testsuite/gdb.multi/pending-bp-del-inferior.exp @@ -0,0 +1,216 @@ +# Copyright 2023 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Setup two inferiors. Select one inferior and create a pending +# thread specific breakpoint in the other inferior. +# +# Delete the selected inferior (the one for which the thread specific +# breakpoint doesn't apply), and check that the breakpoint still exists. +# +# Repeat this process, but this time, create an inferior specific +# breakpoint. + +# The plain remote target can't do multiple inferiors. +require !use_gdb_stub + +standard_testfile + +if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} { + return -1 +} + +# Setup for the tests. Create two inferiors, both running the global +# BINFILE, and proceed to main in both inferiors. Delete all +# breakpoints, and check that we do have two threads. +# +# Return true after a successful setup, otherwise, return false. +proc test_setup {} { + clean_restart $::binfile + + if {![runto_main]} { + return 0 + } + + gdb_test "add-inferior -exec ${::binfile}" "Added inferior 2.*" \ + "add inferior 2" + gdb_test "inferior 2" "Switching to inferior 2 .*" \ + "select inferior 2" + + if {![runto_main]} { + return 0 + } + + delete_breakpoints + + gdb_test "info threads" \ + [multi_line \ + " Id\\s+Target Id\\s+Frame\\s*" \ + " 1\\.1\\s+\[^\r\n\]+" \ + "\\* 2\\.1\\s+\[^\r\n\]+"] \ + "check we have the expected threads" + + return 1 +} + +# Assuming inferior 2 is already selected, kill the current inferior +# (inferior 2), select inferior 1, and then remove inferior 2. +proc kill_and_remove_inferior_2 {} { + gdb_test "kill" "" "kill inferior 2" \ + "Kill the program being debugged.*y or n. $" "y" + + gdb_test "inferior 1" "Switching to inferior 1 .*" \ + "select inferior 1" + + gdb_test_no_output "remove-inferiors 2" +} + +# Setup two inferiors, then create a breakpoint. If BP_PENDING is +# true then the breakpoint will be pending, otherwise, the breakpoint +# will be non-pending. +# +# BP_TYPE is either 'thread' or 'inferior', and indicates if the +# created breakpoint should be thread or inferior specific. +# +# The breakpoint is created while inferior 2 is selected, and the +# thread/inferior restriction always identifies inferior 1. +# +# Then inferior 2 is killed and removed. +# +# Finally, check that the breakpoint still exists and correctly refers +# to inferior 1. +proc do_bp_test { bp_type bp_pending } { + if {![test_setup]} { + return + } + + if { $bp_pending } { + set bp_func "bar" + } else { + set bp_func "foo" + } + + if { $bp_type eq "thread" } { + set bp_restriction "thread 1.1" + } else { + set bp_restriction "inferior 1" + } + + gdb_breakpoint "$bp_func $bp_restriction" allow-pending + set bp_number [get_integer_valueof "\$bpnum" "INVALID" \ + "get b/p number for previous breakpoint"] + + if { $bp_restriction eq "thread 1.1" } { + set bp_after_restriction "thread 1" + } else { + set bp_after_restriction $bp_restriction + } + + if { $bp_pending } { + set bp_pattern_before \ + [multi_line \ + "$bp_number\\s+breakpoint\\s+keep\\s+y\\s+\\s+${bp_func}" \ + "\\s+stop only in [string_to_regexp $bp_restriction]"] + set bp_pattern_after \ + [multi_line \ + "$bp_number\\s+breakpoint\\s+keep\\s+y\\s+\\s+${bp_func}" \ + "\\s+stop only in [string_to_regexp $bp_after_restriction]"] + } else { + set bp_pattern_before \ + [multi_line \ + "$bp_number\\s+breakpoint\\s+keep\\s+y\\s+\\s*" \ + "\\s+stop only in [string_to_regexp $bp_restriction]" \ + "$bp_number\\.1\\s+y\\s+$::hex in $bp_func at \[^\r\n\]+ inf 1" \ + "$bp_number\\.2\\s+y\\s+$::hex in $bp_func at \[^\r\n\]+ inf 2"] + + set bp_pattern_after \ + [multi_line \ + "$bp_number\\s+breakpoint\\s+keep\\s+y\\s+$::hex in $bp_func at \[^\r\n\]+" \ + "\\s+stop only in [string_to_regexp $bp_after_restriction]"] + } + + gdb_test "info breakpoints" $bp_pattern_before \ + "info breakpoints before inferior removal" + + kill_and_remove_inferior_2 + + gdb_test "info breakpoints" $bp_pattern_after \ + "info breakpoints after inferior removal" +} + +# Setup two inferiors, then create a dprintf. If BP_PENDING is +# true then the dprintf will be pending, otherwise, the dprintf +# will be non-pending. +# +# The dprintf is created while inferior 2 is selected. Then inferior +# 2 is killed and removed. +# +# Finally, check that the dprintf still exists. +proc do_dprintf_test { bp_pending } { + if {![test_setup]} { + return + } + + if { $bp_pending } { + set bp_func "bar" + + gdb_test "dprintf $bp_func,\"in $bp_func\"" ".*" \ + "create dprintf breakpoint" \ + "Make dprintf pending on future shared library load\\? \\(y or .n.\\) $" "y" + } else { + set bp_func "foo" + + gdb_test "dprintf $bp_func,\"in $bp_func\"" ".*" \ + "create dprintf breakpoint" + } + + set bp_number [get_integer_valueof "\$bpnum" "INVALID" \ + "get b/p number for previous breakpoint"] + + if { $bp_pending } { + set bp_pattern_before \ + [multi_line \ + "$bp_number\\s+dprintf\\s+keep\\s+y\\s+\\s+${bp_func}" \ + "\\s+printf \"in $bp_func\""] + set bp_pattern_after $bp_pattern_before + } else { + set bp_pattern_before \ + [multi_line \ + "$bp_number\\s+dprintf\\s+keep\\s+y\\s+\\s*" \ + "\\s+printf \"in $bp_func\"" \ + "$bp_number\\.1\\s+y\\s+$::hex in $bp_func at \[^\r\n\]+ inf 1" \ + "$bp_number\\.2\\s+y\\s+$::hex in $bp_func at \[^\r\n\]+ inf 2"] + + set bp_pattern_after \ + [multi_line \ + "$bp_number\\s+dprintf\\s+keep\\s+y\\s+$::hex in $bp_func at \[^\r\n\]+" \ + "\\s+printf \"in $bp_func\""] + } + + gdb_test "info breakpoints" $bp_pattern_before \ + "info breakpoints before inferior removal" + + kill_and_remove_inferior_2 + + gdb_test "info breakpoints" $bp_pattern_after \ + "info breakpoints after inferior removal" +} + +foreach_with_prefix bp_pending { true false } { + foreach_with_prefix bp_type { thread inferior } { + do_bp_test $bp_type $bp_pending + } + + do_dprintf_test $bp_pending +} From patchwork Tue Mar 5 15:21:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 86812 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 45E80385829C for ; Tue, 5 Mar 2024 15:25:30 +0000 (GMT) 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 01D34385843B for ; Tue, 5 Mar 2024 15:22:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 01D34385843B Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 01D34385843B Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709652143; cv=none; b=IKQQuYxHEf6ltp+wOkNCdkL/VCi7FWHCI+gI2O83hVh9KxJqTw76mDjvf8+eiRInryPTUvRlrI4zLRlfraKmpLdMBBwA4p0f3YhG2qdjC1QJ3bJqid2QALAW5JLyE1pmZorRElZunKJISpeTA9NzTnO4Zt5DAAiUQpVJ1sBTsSo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709652143; c=relaxed/simple; bh=UMz2xKSiFbXSLDojsYyySuggAa7+o/hEjecb7IfSEqc=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=keeW1Oh5ymw/tR/+2AKbJbIBoWkN+uAV7BwcbfDevv9Lqa8q7q9+UZH+FkUJPBagVwVJXgOS5wf5W3+Rvhd2yIW1Fzmk/C2ygXOae9F4fGLrCGcUV1bgFjkhlybg9eb137aX6QALerfEiSfEotpyLrPFPzevxyKhEUBmrVpYMbI= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709652137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=73t1SZu6SVaKKAk+iCdqJNDzp0X0eor3/hK4MCta4kU=; b=DhuZ3ISOKMhH+rmgeuZJGwbquhLQyNdguBLAuP8k+7yTrgCKr2iHvk2AqGmA5R9/qqQtLM shmYXcMFgK1VpZTWvHfiuV/WeNuhTTpfRn4gnjaJXuOqfLHOFFP/xuf521KysLS2jLvYIN +mpcOl+3e8KUMYvQRcBZnXz+l+y2YLA= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-643-Sco047L1PfWmuo1ehi5vzQ-1; Tue, 05 Mar 2024 10:22:16 -0500 X-MC-Unique: Sco047L1PfWmuo1ehi5vzQ-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-a457845df7aso98525566b.1 for ; Tue, 05 Mar 2024 07:22:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709652134; x=1710256934; 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=dtTimpah01ObF9sMFkNE2GQ1Gy4YCq+rKy1T02nlkF8=; b=hiequdXdyo9ilOTJNym7KMV9l/Ze6vxiD81oB/+lu/jFol+yWnk++/PIQ4QNvx5YVd IKsNW6rPMH7PbkUvoNHkxv815A7nPYRHbuFEEC5F2HdxfdpI/+F4nbks4qRS9RZQ70xO i1Y6D8+/QUbC4GZWsnigPzMiYfUtjMx/sb6b95yj8ubjbxiBlZ2D0j9ghbemaT4rGVON TU4QF4IdezjHt0hD028wQ4lCjnBZNd0jyjLjxM4fifu2YXjA7XLnjKKdAHTxWlYh3LEH mGa6bYE15zZ96gTjYZbnhrizCHAgeEun8qovWs37X/6H6KJVg3n6Wj/6kAkmdleZIslK 6H6A== X-Gm-Message-State: AOJu0YzRVCS9Mg5SoPMvNH5MoyrV6drS7nckx+aot7XgTOb8SM5rsle0 Eg8K2uwbjHeiRpNa/PYw66Q6/0AYLvGtCZ9j452lhutgbx3nWUmbNOGMmn+TXYzpqUfV8mrdkRt n6/n7Lr0o8hm/MwoMxVVzsF1sa2tf58cAychVPoUY/7BBjUs/ZQa6G4kXbm4gsLcYnkXXHYymi3 iuBlw9gxOdoOqEEHCZfr4dRZQ/cdAi4IrH8fYth3ekSFg= X-Received: by 2002:a17:906:a450:b0:a45:a797:75ab with SMTP id cb16-20020a170906a45000b00a45a79775abmr1591341ejb.3.1709652133709; Tue, 05 Mar 2024 07:22:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IFGjBTOnjn8+fZgL/7GKnroKD69UodbHvgbz/Jk4d26H4GV2PTskVj8F21l2PfT0YPkcrSfYw== X-Received: by 2002:a17:906:a450:b0:a45:a797:75ab with SMTP id cb16-20020a170906a45000b00a45a79775abmr1591303ejb.3.1709652132665; Tue, 05 Mar 2024 07:22:12 -0800 (PST) Received: from localhost (185.223.159.143.dyn.plus.net. [143.159.223.185]) by smtp.gmail.com with ESMTPSA id gc7-20020a170906c8c700b00a450e04d49fsm3225884ejb.101.2024.03.05.07.22.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Mar 2024 07:22:11 -0800 (PST) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess , Eli Zaretskii Subject: [PATCHv9 14/14] gdb: only insert thread-specific breakpoints in the relevant inferior Date: Tue, 5 Mar 2024 15:21:45 +0000 Message-Id: <3a2b295e10626cf03ce54b1d32c9175eba725f0c.1709651994.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.7 required=5.0 tests=BAYES_00, DKIM_INVALID, DKIM_SIGNED, GIT_PATCH_0, KAM_DMARC_NONE, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org This commit updates GDB so that thread or inferior specific breakpoints are only inserted into the program space in which the specific thread or inferior is running. In terms of implementation, getting this basically working is easy enough, now that a breakpoint's thread or inferior field is setup prior to GDB looking for locations, we can easily use this information to find a suitable program_space and pass this to as a filter when creating the sals. Or we could if breakpoint_ops::create_sals_from_location_spec allowed us to pass in a filter program_space. So, this commit extends breakpoint_ops::create_sals_from_location_spec to take a program_space argument, and uses this to filter the set of returned sals. This accounts for about half the change in this patch. The second set of changes starts from breakpoint_set_thread and breakpoint_set_inferior, this is called when the thread or inferior for a breakpoint changes, e.g. from the Python API. Previously this call would never result in the locations of a breakpoint changing, after all, locations were inserted in every program space, and we just use the thread or inferior variable to decide when we should stop. Now though, changing a breakpoint's thread or inferior can mean we need to figure out a new set of breakpoint locations. To support this I've added a new breakpoint_re_set_one function, which is like breakpoint_re_set, but takes a single breakpoint, and just updates the locations for that one breakpoint. We only need to call this function if the program_space in which a breakpoint's thread (or inferior) is running actually changes. If the program_space does change then we call the new breakpoint_re_set_one function passing in the program_space which should be used to filter the new locations (or nullptr to indicate we should set locations in all program spaces). This filter program_space needs to propagate down to all the re_set methods, this accounts for the remaining half of the changes in this patch. There were a couple of existing tests that created thread or inferior specific breakpoints and then checked the 'info breakpoints' output, these needed updating. These were: gdb.mi/user-selected-context-sync.exp gdb.multi/bp-thread-specific.exp gdb.multi/multi-target-continue.exp gdb.multi/multi-target-ping-pong-next.exp gdb.multi/tids.exp gdb.mi/new-ui-bp-deleted.exp gdb.multi/inferior-specific-bp.exp gdb.multi/pending-bp-del-inferior.exp I've also added some additional tests to: gdb.multi/pending-bp.exp I've updated the documentation and added a NEWS entry. Reviewed-By: Eli Zaretskii --- gdb/NEWS | 7 + gdb/ada-lang.c | 6 +- gdb/break-catch-throw.c | 6 +- gdb/breakpoint.c | 280 ++++++++++++++---- gdb/breakpoint.h | 29 +- gdb/testsuite/gdb.mi/new-ui-bp-deleted.exp | 8 +- .../gdb.mi/user-selected-context-sync.exp | 4 +- .../gdb.multi/bp-thread-specific.exp | 7 +- .../gdb.multi/inferior-specific-bp.exp | 12 +- .../gdb.multi/multi-target-continue.exp | 2 +- .../gdb.multi/multi-target-ping-pong-next.exp | 4 +- .../gdb.multi/pending-bp-del-inferior.exp | 6 +- gdb/testsuite/gdb.multi/pending-bp.exp | 206 +++++++++++++ gdb/testsuite/gdb.multi/tids.exp | 6 +- 14 files changed, 484 insertions(+), 99 deletions(-) diff --git a/gdb/NEWS b/gdb/NEWS index c170385a50e..2a888d64e4d 100644 --- a/gdb/NEWS +++ b/gdb/NEWS @@ -17,6 +17,13 @@ 'thread' or 'task' keywords are parsed at the time the breakpoint is created, rather than at the time the breakpoint becomes non-pending. +* Thread-specific breakpoints are only inserted into the program space + in which the thread of interest is running. In most cases program + spaces are unique for each inferior, so this means that + thread-specific breakpoints will usually only be inserted for the + inferior containing the thread of interest. The breakpoint will + be hit no less than before. + * Changed commands disassemble diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 1c26ebf7b30..c88acdf4035 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -12010,11 +12010,11 @@ struct ada_catchpoint : public code_breakpoint enable_state = enabled ? bp_enabled : bp_disabled; language = language_ada; - re_set (); + re_set (pspace); } struct bp_location *allocate_location () override; - void re_set () override; + void re_set (program_space *pspace) override; void check_status (struct bpstat *bs) override; enum print_stop_action print_it (const bpstat *bs) const override; bool print_one (const bp_location **) const override; @@ -12059,7 +12059,7 @@ static struct symtab_and_line ada_exception_sal catchpoint kinds. */ void -ada_catchpoint::re_set () +ada_catchpoint::re_set (program_space *pspace) { std::vector sals; try diff --git a/gdb/break-catch-throw.c b/gdb/break-catch-throw.c index d053bd5fbe0..7191d1b38fa 100644 --- a/gdb/break-catch-throw.c +++ b/gdb/break-catch-throw.c @@ -82,10 +82,10 @@ struct exception_catchpoint : public code_breakpoint _("invalid type-matching regexp"))) { pspace = current_program_space; - re_set (); + re_set (pspace); } - void re_set () override; + void re_set (program_space *pspace) override; enum print_stop_action print_it (const bpstat *bs) const override; bool print_one (const bp_location **) const override; void print_mention () const override; @@ -198,7 +198,7 @@ exception_catchpoint::check_status (struct bpstat *bs) /* Implement the 're_set' method. */ void -exception_catchpoint::re_set () +exception_catchpoint::re_set (program_space *pspace) { std::vector sals; struct program_space *filter_pspace = current_program_space; diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index e1efde66feb..a190f2a78bf 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -91,9 +91,12 @@ static void map_breakpoint_numbers (const char *, gdb::function_view); -static void - create_sals_from_location_spec_default (location_spec *locspec, - linespec_result *canonical); +static void parse_breakpoint_sals (location_spec *locspec, + linespec_result *canonical, + program_space *search_pspace); + +static void breakpoint_re_set_one (breakpoint *b, + program_space *filter_pspace); static void create_breakpoints_sal (struct gdbarch *, struct linespec_result *, @@ -283,11 +286,12 @@ static bool strace_marker_p (struct breakpoint *b); static void bkpt_probe_create_sals_from_location_spec (location_spec *locspec, - struct linespec_result *canonical); + struct linespec_result *canonical, + struct program_space *search_pspace); const struct breakpoint_ops code_breakpoint_ops = { - create_sals_from_location_spec_default, + parse_breakpoint_sals, create_breakpoints_sal, }; @@ -352,7 +356,7 @@ struct internal_breakpoint : public code_breakpoint disposition = disp_donttouch; } - void re_set () override; + void re_set (program_space *pspace) override; void check_status (struct bpstat *bs) override; enum print_stop_action print_it (const bpstat *bs) const override; void print_mention () const override; @@ -389,7 +393,7 @@ struct momentary_breakpoint : public code_breakpoint gdb_assert (inferior == -1); } - void re_set () override; + void re_set (program_space *pspace) override; void check_status (struct bpstat *bs) override; enum print_stop_action print_it (const bpstat *bs) const override; void print_mention () const override; @@ -400,7 +404,7 @@ struct dprintf_breakpoint : public ordinary_breakpoint { using ordinary_breakpoint::ordinary_breakpoint; - void re_set () override; + void re_set (program_space *pspace) override; int breakpoint_hit (const struct bp_location *bl, const address_space *aspace, CORE_ADDR bp_addr, @@ -1549,7 +1553,36 @@ breakpoint_set_thread (struct breakpoint *b, int thread) int old_thread = b->thread; b->thread = thread; if (old_thread != thread) - notify_breakpoint_modified (b); + { + /* If THREAD is in a different program_space than OLD_THREAD, or the + breakpoint has switched to or from being thread-specific, then we + need to re-set the locations of this breakpoint. First, figure + out the program_space for the old and new threads, use a value of + nullptr to indicate the breakpoint is in all program spaces. */ + program_space *old_pspace = nullptr; + if (old_thread != -1) + { + struct thread_info *thr = find_thread_global_id (old_thread); + gdb_assert (thr != nullptr); + old_pspace = thr->inf->pspace; + } + + program_space *new_pspace = nullptr; + if (thread != -1) + { + struct thread_info *thr = find_thread_global_id (thread); + gdb_assert (thr != nullptr); + new_pspace = thr->inf->pspace; + } + + /* If the program space has changed for this breakpoint, then + re-evaluate it's locations. */ + if (old_pspace != new_pspace) + breakpoint_re_set_one (b, new_pspace); + + /* Let others know the breakpoint has changed. */ + notify_breakpoint_modified (b); + } } /* See breakpoint.h. */ @@ -1568,7 +1601,34 @@ breakpoint_set_inferior (struct breakpoint *b, int inferior) int old_inferior = b->inferior; b->inferior = inferior; if (old_inferior != inferior) - notify_breakpoint_modified (b); + { + /* If INFERIOR is in a different program_space than OLD_INFERIOR, or + the breakpoint has switch to or from inferior-specific, then we + need to re-set the locations of this breakpoint. First, figure + out the program_space for the old and new inferiors, use a value + of nullptr to indicate the breakpoint is in all program + spaces. */ + program_space *old_pspace = nullptr; + if (old_inferior != -1) + { + struct inferior *inf = find_inferior_id (old_inferior); + gdb_assert (inf != nullptr); + old_pspace = inf->pspace; + } + + program_space *new_pspace = nullptr; + if (inferior != -1) + { + struct inferior *inf = find_inferior_id (inferior); + gdb_assert (inf != nullptr); + new_pspace = inf->pspace; + } + + if (old_pspace != new_pspace) + breakpoint_re_set_one (b, new_pspace); + + notify_breakpoint_modified (b); + } } /* See breakpoint.h. */ @@ -8799,7 +8859,8 @@ create_breakpoints_sal (struct gdbarch *gdbarch, static void parse_breakpoint_sals (location_spec *locspec, - struct linespec_result *canonical) + struct linespec_result *canonical, + struct program_space *search_pspace) { struct symtab_and_line cursal; @@ -8864,7 +8925,7 @@ parse_breakpoint_sals (location_spec *locspec, && strchr ("+-", spec[0]) != NULL && spec[1] != '[')) { - decode_line_full (locspec, DECODE_LINE_FUNFIRSTLINE, NULL, + decode_line_full (locspec, DECODE_LINE_FUNFIRSTLINE, search_pspace, get_last_displayed_symtab (), get_last_displayed_line (), canonical, NULL, NULL); @@ -8872,7 +8933,7 @@ parse_breakpoint_sals (location_spec *locspec, } } - decode_line_full (locspec, DECODE_LINE_FUNFIRSTLINE, NULL, + decode_line_full (locspec, DECODE_LINE_FUNFIRSTLINE, search_pspace, cursal.symtab, cursal.line, canonical, NULL, NULL); } @@ -8971,6 +9032,39 @@ breakpoint_ops_for_location_spec_type (enum location_spec_type locspec_type, } } +/* Return the program space to use as a filter when searching for locations + of a breakpoint specific to THREAD or INFERIOR. If THREAD and INFERIOR + are both -1, meaning all threads/inferiors, then this function returns + nullptr, indicating no program space filtering should be performed. + Otherwise, this function returns the program space for the inferior that + contains THREAD (when THREAD is not -1), or the program space for + INFERIOR (when INFERIOR is not -1). */ + +static struct program_space * +find_program_space_for_breakpoint (int thread, int inferior) +{ + if (thread != -1) + { + gdb_assert (inferior == -1); + + struct thread_info *thr = find_thread_global_id (thread); + gdb_assert (thr != nullptr); + gdb_assert (thr->inf != nullptr); + return thr->inf->pspace; + } + else if (inferior != -1) + { + gdb_assert (thread == -1); + + struct inferior *inf = find_inferior_id (inferior); + gdb_assert (inf != nullptr); + + return inf->pspace; + } + + return nullptr; +} + /* See breakpoint.h. */ const struct breakpoint_ops * @@ -9072,7 +9166,10 @@ create_breakpoint (struct gdbarch *gdbarch, try { - ops->create_sals_from_location_spec (locspec, &canonical); + struct program_space *search_pspace + = find_program_space_for_breakpoint (thread, inferior); + ops->create_sals_from_location_spec (locspec, &canonical, + search_pspace); } catch (const gdb_exception_error &e) { @@ -9545,7 +9642,7 @@ break_range_command (const char *arg, int from_tty) arg_start = arg; location_spec_up start_locspec = string_to_location_spec (&arg, current_language); - parse_breakpoint_sals (start_locspec.get (), &canonical_start); + parse_breakpoint_sals (start_locspec.get (), &canonical_start, nullptr); if (arg[0] != ',') error (_("Too few arguments.")); @@ -9646,7 +9743,7 @@ watchpoint_exp_is_const (const struct expression *exp) /* Implement the "re_set" method for watchpoints. */ void -watchpoint::re_set () +watchpoint::re_set (struct program_space *pspace) { /* Watchpoint can be either on expression using entirely global variables, or it can be on local variables. @@ -11757,7 +11854,7 @@ breakpoint::print_recreate (struct ui_file *fp) const /* Default breakpoint_ops methods. */ void -code_breakpoint::re_set () +code_breakpoint::re_set (struct program_space *pspace) { /* FIXME: is this still reachable? */ if (breakpoint_location_spec_empty_p (this)) @@ -11767,7 +11864,7 @@ code_breakpoint::re_set () return; } - re_set_default (); + re_set_default (pspace); } int @@ -11973,7 +12070,7 @@ code_breakpoint::decode_location_spec (location_spec *locspec, /* Virtual table for internal breakpoints. */ void -internal_breakpoint::re_set () +internal_breakpoint::re_set (struct program_space *pspace) { switch (type) { @@ -12066,7 +12163,7 @@ internal_breakpoint::print_mention () const /* Virtual table for momentary breakpoints */ void -momentary_breakpoint::re_set () +momentary_breakpoint::re_set (struct program_space *pspace) { /* Keep temporary breakpoints, which can be encountered when we step over a dlopen call and solib_add is resetting the breakpoints. @@ -12107,12 +12204,13 @@ longjmp_breakpoint::~longjmp_breakpoint () static void bkpt_probe_create_sals_from_location_spec (location_spec *locspec, - struct linespec_result *canonical) + struct linespec_result *canonical, + struct program_space *search_pspace) { struct linespec_sals lsal; - lsal.sals = parse_probes (locspec, NULL, canonical); + lsal.sals = parse_probes (locspec, search_pspace, canonical); lsal.canonical = xstrdup (canonical->locspec->to_string ()); canonical->lsals.push_back (std::move (lsal)); } @@ -12202,9 +12300,9 @@ tracepoint::print_recreate (struct ui_file *fp) const } void -dprintf_breakpoint::re_set () +dprintf_breakpoint::re_set (struct program_space *pspace) { - re_set_default (); + re_set_default (pspace); /* 1 - connect to target 1, that can run breakpoint commands. 2 - create a dprintf, which resolves fine. @@ -12258,8 +12356,10 @@ dprintf_breakpoint::after_condition_true (struct bpstat *bs) markers (`-m'). */ static void -strace_marker_create_sals_from_location_spec (location_spec *locspec, - struct linespec_result *canonical) +strace_marker_create_sals_from_location_spec + (location_spec *locspec, + struct linespec_result *canonical, + struct program_space *search_pspace) { struct linespec_sals lsal; const char *arg_start, *arg; @@ -12776,12 +12876,32 @@ update_breakpoint_locations (code_breakpoint *b, all locations are in the same shared library, that was unloaded. We'd like to retain the location, so that when the library is loaded again, we don't loose the enabled/disabled status of the - individual locations. */ + individual locations. + + Thread specific breakpoints will also trigger this case if the thread + is changed to a different program space, and all of the old locations + go out of scope. In this case we do (currently) discard the old + locations -- we assume the change in thread is permanent and the old + locations will never come back into scope. */ if (all_locations_are_pending (b, filter_pspace) && sals.empty ()) - return; + { + if (b->thread != -1) + b->clear_locations (); + return; + } bp_location_list existing_locations = b->steal_locations (filter_pspace); + /* If this is a thread-specific breakpoint then any locations left on the + breakpoint are for a program space in which the thread of interest + does not operate. This can happen when the user changes the thread of + a thread-specific breakpoint. + + We assume that the change in thread is permanent, and that the old + locations will never be used again, so discard them now. */ + if (b->thread != -1) + b->clear_locations (); + for (const auto &sal : sals) { struct bp_location *new_loc; @@ -12947,40 +13067,45 @@ code_breakpoint::location_spec_to_sals (location_spec *locspec, locations. */ void -code_breakpoint::re_set_default () +code_breakpoint::re_set_default (struct program_space *filter_pspace) { - struct program_space *filter_pspace = current_program_space; std::vector expanded, expanded_end; - int found; - std::vector sals = location_spec_to_sals (locspec.get (), - filter_pspace, - &found); - if (found) - expanded = std::move (sals); - - if (locspec_range_end != nullptr) - { - std::vector sals_end - = location_spec_to_sals (locspec_range_end.get (), - filter_pspace, &found); + /* If this breakpoint is thread-specific then find the program space in + which the specific thread exists. Otherwise, for breakpoints that are + not thread-specific THREAD_PSPACE will be nullptr. */ + program_space *bp_pspace + = find_program_space_for_breakpoint (this->thread, this->inferior); + + /* If this is not a thread or inferior specific breakpoint, or it is a + thread or inferior specific breakpoint but we are looking for new + locations in the program space that the specific thread or inferior is + running, then look for new locations for this breakpoint. */ + if (bp_pspace == nullptr || filter_pspace == bp_pspace) + { + int found; + std::vector sals + = location_spec_to_sals (locspec.get (), filter_pspace, &found); if (found) - expanded_end = std::move (sals_end); + expanded = std::move (sals); + + if (locspec_range_end != nullptr) + { + std::vector sals_end + = location_spec_to_sals (locspec_range_end.get (), + filter_pspace, &found); + if (found) + expanded_end = std::move (sals_end); + } } + /* Update the locations for this breakpoint. For thread-specific + breakpoints this will remove any old locations that are for the wrong + program space -- this can happen if the user changes the thread of a + thread-specific breakpoint. */ update_breakpoint_locations (this, filter_pspace, expanded, expanded_end); } -/* Default method for creating SALs from an address string. It basically - calls parse_breakpoint_sals. Return 1 for success, zero for failure. */ - -static void -create_sals_from_location_spec_default (location_spec *locspec, - struct linespec_result *canonical) -{ - parse_breakpoint_sals (locspec, canonical); -} - /* Re-set breakpoint locations for the current program space. Locations bound to other program spaces are left untouched. */ @@ -13015,7 +13140,7 @@ breakpoint_re_set (void) { input_radix = b.input_radix; set_language (b.language); - b.re_set (); + b.re_set (current_program_space); } catch (const gdb_exception &ex) { @@ -13036,6 +13161,53 @@ breakpoint_re_set (void) /* Now we can insert. */ update_global_location_list (UGLL_MAY_INSERT); } + +/* Re-set locations for breakpoint B in FILTER_PSPACE. If FILTER_PSPACE is + nullptr then re-set locations for B in all program spaces. Locations + bound to program spaces other than FILTER_PSPACE are left untouched. */ + +static void +breakpoint_re_set_one (breakpoint *b, program_space *filter_pspace) +{ + { + scoped_restore_current_language save_language; + scoped_restore save_input_radix = make_scoped_restore (&input_radix); + scoped_restore_current_pspace_and_thread restore_pspace_thread; + + /* To ::re_set each breakpoint we set the current_language to the + language of the breakpoint before re-evaluating the breakpoint's + location. This change can unfortunately get undone by accident if + the language_mode is set to auto, and we either switch frames, or + more likely in this context, we select the current frame. + + We prevent this by temporarily turning the language_mode to + language_mode_manual. We restore it once all breakpoints + have been reset. */ + scoped_restore save_language_mode = make_scoped_restore (&language_mode); + language_mode = language_mode_manual; + + /* Note: we must not try to insert locations until after all + breakpoints have been re-set. Otherwise, e.g., when re-setting + breakpoint 1, we'd insert the locations of breakpoint 2, which + hadn't been re-set yet, and thus may have stale locations. */ + + try + { + input_radix = b->input_radix; + set_language (b->language); + b->re_set (filter_pspace); + } + catch (const gdb_exception &ex) + { + exception_fprintf (gdb_stderr, ex, + "Error in re-setting breakpoint %d: ", + b->number); + } + } + + /* Now we can insert. */ + update_global_location_list (UGLL_MAY_INSERT); +} /* Reset the thread number of this breakpoint: diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h index 42b49144e79..dea55deb314 100644 --- a/gdb/breakpoint.h +++ b/gdb/breakpoint.h @@ -570,15 +570,15 @@ enum print_stop_action struct breakpoint_ops { - /* Create SALs from location spec, storing the result in - linespec_result. - - For an explanation about the arguments, see the function - `create_sals_from_location_spec_default'. + /* Create SALs from LOCSPEC, storing the result in linespec_result + CANONICAL. If SEARCH_PSPACE is not nullptr then only results in the + corresponding program space are returned. If SEARCH_PSPACE is nullptr + then results for all program spaces are returned. This function is called inside `create_breakpoint'. */ void (*create_sals_from_location_spec) (location_spec *locspec, - struct linespec_result *canonical); + linespec_result *canonical, + program_space *search_pspace); /* This method will be responsible for creating a breakpoint given its SALs. Usually, it just calls `create_breakpoints_sal' (for ordinary @@ -710,8 +710,15 @@ struct breakpoint : public intrusive_list_node /* Reevaluate a breakpoint. This is necessary after symbols change (e.g., an executable or DSO was loaded, or the inferior just - started). */ - virtual void re_set () + started). + + If not nullptr, then FILTER_PSPACE is the program space in which + symbols may have changed, we only need to add new locations in + FILTER_PSPACE. + + If FILTER_PSPACE is nullptr then all program spaces may have changed, + new locations need to be searched for in every program space. */ + virtual void re_set (program_space *filter_pspace) { /* Nothing to re-set. */ } @@ -955,7 +962,7 @@ struct code_breakpoint : public breakpoint /* Add a location for SAL to this breakpoint. */ bp_location *add_location (const symtab_and_line &sal); - void re_set () override; + void re_set (program_space *pspace) override; int insert_location (struct bp_location *) override; int remove_location (struct bp_location *, enum remove_bp_reason reason) override; @@ -977,7 +984,7 @@ struct code_breakpoint : public breakpoint struct program_space *search_pspace); /* Helper method that does the basic work of re_set. */ - void re_set_default (); + void re_set_default (program_space *pspace); /* Find the SaL locations corresponding to the given LOCATION. On return, FOUND will be 1 if any SaL was found, zero otherwise. */ @@ -999,7 +1006,7 @@ struct watchpoint : public breakpoint { using breakpoint::breakpoint; - void re_set () override; + void re_set (program_space *pspace) override; int insert_location (struct bp_location *) override; int remove_location (struct bp_location *, enum remove_bp_reason reason) override; diff --git a/gdb/testsuite/gdb.mi/new-ui-bp-deleted.exp b/gdb/testsuite/gdb.mi/new-ui-bp-deleted.exp index f736994d234..938e6deec05 100644 --- a/gdb/testsuite/gdb.mi/new-ui-bp-deleted.exp +++ b/gdb/testsuite/gdb.mi/new-ui-bp-deleted.exp @@ -76,8 +76,12 @@ foreach_mi_ui_mode mode { set loc2 [make_bp_loc "$::decimal\\.2"] # Create the inferior-specific breakpoint. - mi_create_breakpoint_multi "-g i2 foo" "create breakpoint in inferior 2" \ - -inferior "2" -locations "\\\[$loc1,$loc2\\\]" + mi_create_breakpoint "-g i2 foo" "create breakpoint in inferior 2" \ + -number "$decimal" \ + -type "breakpoint" \ + -enabled "y" \ + -func "foo" \ + -inferior "2" set bpnum [mi_get_valueof "/d" "\$bpnum" "INVALID"] if {$mode eq "separate"} { diff --git a/gdb/testsuite/gdb.mi/user-selected-context-sync.exp b/gdb/testsuite/gdb.mi/user-selected-context-sync.exp index 93b91b42f92..ed331aff873 100644 --- a/gdb/testsuite/gdb.mi/user-selected-context-sync.exp +++ b/gdb/testsuite/gdb.mi/user-selected-context-sync.exp @@ -370,7 +370,7 @@ proc test_continue_to_start { mode inf } { "thread $inf.2 stops MI" } else { mi_expect_stop "breakpoint-hit" "child_sub_function" \ - "" "$srcfile" "$decimal" {"" "disp=\"del\"" "locno=\"[0-9]+\""} \ + "" "$srcfile" "$decimal" {"" "disp=\"del\""} \ "thread $inf.2 stops MI" } } @@ -439,7 +439,7 @@ proc_with_prefix test_setup { mode } { with_spawn_id $mi_spawn_id { mi_expect_stop "breakpoint-hit" "main" "" "$srcfile" "$decimal" \ - {"" "disp=\"del\"" "locno=\"[0-9]+\""} "main stop" + {"" "disp=\"del\""} "main stop" } # Consume CLI output. diff --git a/gdb/testsuite/gdb.multi/bp-thread-specific.exp b/gdb/testsuite/gdb.multi/bp-thread-specific.exp index 7635e84b913..c1d87521ee9 100644 --- a/gdb/testsuite/gdb.multi/bp-thread-specific.exp +++ b/gdb/testsuite/gdb.multi/bp-thread-specific.exp @@ -50,7 +50,7 @@ gdb_test "info threads" \ # locations ('foo' in both inferiors) even though only one of those # locations will ever trigger ('foo' in inferior 2). gdb_test "break foo thread 2.1" \ - "Breakpoint $decimal at $hex: foo\\. \\(2 locations\\)" + "Breakpoint $decimal at $hex: file \[^\r\n\]+$srcfile, line $decimal\\." set bpnum [get_integer_valueof "\$bpnum" "INVALID"] @@ -58,10 +58,7 @@ set bpnum [get_integer_valueof "\$bpnum" "INVALID"] # earlier breakpoint. Check that the thread-id used when describing # the earlier breakpoints is correct. gdb_test "break foo thread 1.1" \ - [multi_line \ - "Note: breakpoint $bpnum \\(thread 2.1\\) also set at pc $hex\\." \ - "Note: breakpoint $bpnum \\(thread 2.1\\) also set at pc $hex\\." \ - "Breakpoint $decimal at $hex: foo\\. \\(2 locations\\)"] + "Breakpoint $decimal at $hex: file \[^\r\n\]+$srcfile, line $decimal\\." # Save the breakpoints into a file. if {[is_remote host]} { diff --git a/gdb/testsuite/gdb.multi/inferior-specific-bp.exp b/gdb/testsuite/gdb.multi/inferior-specific-bp.exp index 46efe6f54bc..52f84183589 100644 --- a/gdb/testsuite/gdb.multi/inferior-specific-bp.exp +++ b/gdb/testsuite/gdb.multi/inferior-specific-bp.exp @@ -105,16 +105,8 @@ proc check_info_breakpoints { testname bp_number expected_loc_count } { # Create an inferior-specific breakpoint. Use gdb_test instead of # gdb_breakpoint here as we want to check the breakpoint was placed in # multiple locations. -# -# Currently GDB still places inferior specific breakpoints into every -# inferior, just like it does with thread specific breakpoints. -# Hopefully this will change in the future, at which point, this test -# will need updating. -# -# Two of these locations are in inferior 1, while the third is in -# inferior 2. gdb_test "break foo inferior 1" \ - "Breakpoint $decimal at $hex: foo\\. \\(3 locations\\)" + "Breakpoint $decimal at $hex: foo\\. \\(2 locations\\)" set bp_number [get_integer_valueof "\$bpnum" "INVALID" \ "get b/p number for inferior specific breakpoint"] @@ -123,7 +115,7 @@ set location_count 0 set saw_inf_cond false check_info_breakpoints "first check for inferior specific breakpoint" \ - $bp_number 3 + $bp_number 2 # Create a multi-inferior breakpoint to stop at. gdb_breakpoint "stop_breakpt" message diff --git a/gdb/testsuite/gdb.multi/multi-target-continue.exp b/gdb/testsuite/gdb.multi/multi-target-continue.exp index d2201061713..d4b2fc28133 100644 --- a/gdb/testsuite/gdb.multi/multi-target-continue.exp +++ b/gdb/testsuite/gdb.multi/multi-target-continue.exp @@ -30,7 +30,7 @@ proc test_continue {non-stop} { proc set_break {inf} { gdb_test "break function${inf} thread ${inf}.1" \ - "Breakpoint .* function${inf}\\..*" + "Breakpoint ${::decimal} at ${::hex}: file .*, line ${::decimal}\\." } # Select inferior INF, and then run to a breakpoint on inferior diff --git a/gdb/testsuite/gdb.multi/multi-target-ping-pong-next.exp b/gdb/testsuite/gdb.multi/multi-target-ping-pong-next.exp index 0aff708c0f3..36f9d24a917 100644 --- a/gdb/testsuite/gdb.multi/multi-target-ping-pong-next.exp +++ b/gdb/testsuite/gdb.multi/multi-target-ping-pong-next.exp @@ -52,12 +52,12 @@ proc test_ping_pong_next {} { gdb_test "thread 1.1" "Switching to thread 1.1 .*" gdb_test "break $srcfile:$line1 thread 1.1" \ - "Breakpoint .*$srcfile:$line1\\..*" + "Breakpoint .*$srcfile, line $line1\\." gdb_test "continue" "hit Breakpoint .*" gdb_test "break $srcfile:$line2 thread 2.1" \ - "Breakpoint .*$srcfile:$line2\\..*" + "Breakpoint .*$srcfile, line $line2\\." # Now block inferior 1 and issue "next". We should stop at the # breakpoint for inferior 2, given schedlock off. diff --git a/gdb/testsuite/gdb.multi/pending-bp-del-inferior.exp b/gdb/testsuite/gdb.multi/pending-bp-del-inferior.exp index 5fcd1ef2e39..12c0a84bb02 100644 --- a/gdb/testsuite/gdb.multi/pending-bp-del-inferior.exp +++ b/gdb/testsuite/gdb.multi/pending-bp-del-inferior.exp @@ -129,10 +129,8 @@ proc do_bp_test { bp_type bp_pending } { } else { set bp_pattern_before \ [multi_line \ - "$bp_number\\s+breakpoint\\s+keep\\s+y\\s+\\s*" \ - "\\s+stop only in [string_to_regexp $bp_restriction]" \ - "$bp_number\\.1\\s+y\\s+$::hex in $bp_func at \[^\r\n\]+ inf 1" \ - "$bp_number\\.2\\s+y\\s+$::hex in $bp_func at \[^\r\n\]+ inf 2"] + "$bp_number\\s+breakpoint\\s+keep\\s+y\\s+$::hex in $bp_func at \[^\r\n\]+ inf 1" \ + "\\s+stop only in [string_to_regexp $bp_restriction]"] set bp_pattern_after \ [multi_line \ diff --git a/gdb/testsuite/gdb.multi/pending-bp.exp b/gdb/testsuite/gdb.multi/pending-bp.exp index 478d8d7c037..aeb8c2c886e 100644 --- a/gdb/testsuite/gdb.multi/pending-bp.exp +++ b/gdb/testsuite/gdb.multi/pending-bp.exp @@ -72,6 +72,48 @@ proc do_test_setup { inf_1_stop inf_2_stop } { return true } +# Create a breakpoint on the function 'foo' in THREAD. It is expected +# that the breakpoint created will be pending, this is checked by +# running the 'info breakpoints' command. +# +# Returns the number for the newly created breakpoint. +proc do_create_pending_foo_breakpoint { {thread "1.1"} } { + gdb_test "break foo thread $thread" \ + [multi_line \ + "Function \"foo\" not defined\\." \ + "Breakpoint $::decimal \\(foo\\) pending\."] \ + "set pending thread-specific breakpoint" + set bpnum [get_integer_valueof "\$bpnum" "*INVALID*" \ + "get number for thread-specific breakpoint on foo"] + gdb_test "info breakpoints $bpnum" \ + [multi_line \ + "$bpnum\\s+breakpoint\\s+keep\\s+y\\s+\\s+foo" \ + "\\s+stop only in thread [string_to_regexp $thread]"] \ + "check thread-specific breakpoint is initially pending" + + return $bpnum +} + +# Create a breakpoint on the function 'foo' in THREAD. It is expected +# that the breakpoint created will not be pending, this is checked by +# running the 'info breakpoints' command. +# +# Returns the number for the newly created breakpoint. +proc do_create_foo_breakpoint { {thread "1.1"} } { + gdb_test "break foo thread $thread" \ + "Breakpoint $::decimal at $::hex" \ + "set thread-specific breakpoint" + set bpnum [get_integer_valueof "\$bpnum" "*INVALID*" \ + "get number for thread-specific breakpoint on foo"] + gdb_test "info breakpoints $bpnum" \ + [multi_line \ + "$bpnum\\s+breakpoint\\s+keep\\s+y\\s+$::hex\\s+\]*> inf $::decimal" \ + "\\s+stop only in thread [string_to_regexp $thread]"] \ + "check thread-specific breakpoint is initially pending" + + return $bpnum +} + # Check that when a breakpoint is in the pending state, but that breakpoint # does have some locations (those locations themselves are pending), GDB # doesn't display the inferior list in the 'info breakpoints' output. @@ -122,5 +164,169 @@ proc_with_prefix test_no_inf_display {} { "check info breakpoints while breakpoint is pending" } +# Setup two inferiors. In #1 the symbol 'foo' has not yet been +# loaded, while in #2 the symbol 'foo' has been loaded. +# +# Create a thread-specific breakpoint on 'foo' tied to a thread in +# inferior #1, the breakpoint should be pending -- 'foo' is not yet +# loaded in #1. +# +# Now move inferior #1 forward until 'foo' is loaded, check the +# breakpoint is no longer pending. +# +# Move inferior #1 forward more until 'foo' is unloaded, check that +# the breakpoint returns to the pending state. +proc_with_prefix test_pending_toggle { } { + + do_test_setup "Break before open" "Break before close" + + set bpnum [do_create_pending_foo_breakpoint] + + # Now return to inferior 1 and continue until the shared library is + # loaded, the breakpoint should become non-pending. + gdb_test "inferior 1" "Switching to inferior 1 .*" \ + "switch back to inferior 1" + gdb_continue_to_breakpoint "stop in foo in inferior 1" "foo \\(\\) .*" + + gdb_test "info breakpoint $bpnum" \ + [multi_line \ + "$bpnum\\s+breakpoint\\s+keep\\s+y\\s+$::hex \]*> inf 1" \ + "\\s+stop only in thread 1\\.1" \ + "\\s+breakpoint already hit 1 time"] \ + "check thread-specific breakpoint is no longer pending" + + gdb_breakpoint [gdb_get_line_number "Break after close"] temporary + gdb_continue_to_breakpoint "close library" + gdb_test "info breakpoints $bpnum" \ + [multi_line \ + "$bpnum\\s+breakpoint\\s+keep\\s+y\\s+\\s+foo" \ + "\\s+stop only in thread 1\\.1" \ + "\\s+breakpoint already hit 1 time"] \ + "check thread-specific breakpoint is pending again" +} + +# Create a Python variable VAR and set it to the gdb.Breakpoint object +# corresponding to the breakpoint numbered BPNUM. If THREAD is not +# the empty string then THREAD should be an integer, check that +# gdb.Breakpoint.thread is set to the value of THREAD. Otherwise, if +# THREAD is the empty string, check that gdb.Breakpoint.thread is set +# to None. +proc py_find_breakpoint { var bpnum {thread ""} } { + gdb_test_no_output \ + "python ${var}=\[b for b in gdb.breakpoints() if b.number == $bpnum\]\[0\]" \ + "find Python gdb.Breakpoint object" + if { $thread ne "" } { + gdb_test_no_output "python assert(${var}.thread == ${thread})" \ + "check thread attribute is currently correct" + } else { + gdb_test_no_output "python assert(${var}.thread is None)" \ + "check thread attribute is currently correct" + } +} + +# Setup two inferiors. In #1 the symbol 'foo' has not yet been +# loaded, while in #2 the symbol 'foo' has been loaded. +# +# Create a thread-specific breakpoint on 'foo' tied to a thread in +# inferior #1, the breakpoint should be pending -- 'foo' is not yet +# loaded in #1. +# +# Use Python to change the thread of the thread-specific breakpoint to +# a thread in inferior #2, at this point the thread should gain a +# location and become non-pending. +# +# Set the thread back to a thread in inferior #1, the breakpoint +# should return to the pending state. +proc_with_prefix py_test_toggle_thread {} { + do_test_setup "Break before open" "Break after open" + + set bpnum [do_create_pending_foo_breakpoint] + + py_find_breakpoint "bp" $bpnum 1 + + gdb_test_no_output "python bp.thread = 2" \ + "change thread on thread-specific breakpoint" + gdb_test "info breakpoint $bpnum" \ + [multi_line \ + "$bpnum\\s+breakpoint\\s+keep\\s+y\\s+$::hex \]*> inf 2" \ + "\\s+stop only in thread 2\\.1"] \ + "check thread-specific breakpoint now has a location" + + gdb_test_no_output "set call_count = 2" "set call_count in inferior 2" + gdb_continue_to_breakpoint "stop at foo in inferior 2" "foo \\(\\) .*" + + gdb_test_no_output "python bp.thread = 1" \ + "restore thread on thread-specific breakpoint" + gdb_test "info breakpoints $bpnum" \ + [multi_line \ + "$bpnum\\s+breakpoint\\s+keep\\s+y\\s+\\s+foo" \ + "\\s+stop only in thread 1\\.1" \ + "\\s+breakpoint already hit 1 time"] \ + "check thread-specific breakpoint has returned to pending" + + gdb_breakpoint [gdb_get_line_number "Break after close"] temporary + gdb_continue_to_breakpoint "stop after close in inferior 2" \ + ".* Break after close\\. .*" + + gdb_test "inferior 1" "Switching to inferior 1 .*" \ + "switch to inferior 1" + gdb_continue_to_breakpoint "stop at foo in inferior 1" "foo \\(\\) .*" +} + +# Setup two inferiors. Both inferiors have the symbol 'foo' +# available. +# +# Create a thread-specific breakpoint on 'foo' tied to a thread in +# inferior #1, the breakpoint should not be pending, but will only +# have a single location, the location in inferior #1. +# +# Use Python to change the thread of the thread-specific breakpoint to +# None. At this point the breakpoint should gain a second location, a +# location in inferior #2. +proc_with_prefix py_test_clear_thread {} { + do_test_setup "Break after open" "Break after open" + + set bpnum [do_create_foo_breakpoint] + + py_find_breakpoint "bp" $bpnum 1 + + gdb_test_no_output "python bp.thread = None" \ + "clear thread on thread-specific breakpoint" + gdb_test "info breakpoints $bpnum" \ + [multi_line \ + "${bpnum}\\s+breakpoint\\s+keep y\\s+\\s*" \ + "${bpnum}\\.1\\s+y\\s+${::hex}\\s+\]*> inf $::decimal" \ + "${bpnum}\\.2\\s+y\\s+${::hex}\\s+\]*> inf $::decimal"] \ + "check for a location in both inferiors" + + gdb_continue_to_breakpoint "stop at foo in inferior 2" "foo \\(\\) .*" + gdb_test_no_output "set call_count = 2" "set call_count in inferior 2" + + gdb_test "inferior 1" "Switching to inferior 1 .*" \ + "switch to inferior 1" + gdb_continue_to_breakpoint "stop at foo in inferior 1" "foo \\(\\) .*" + gdb_test_no_output "set call_count = 2" "set call_count in inferior 1" + + gdb_test_no_output "python bp.thread = 2" + gdb_test "info breakpoints $bpnum" \ + [multi_line \ + "${bpnum}\\s+breakpoint\\s+keep y\\s+${::hex}\\s+\]*> inf 2" \ + "\\s+stop only in thread 2\\.1" \ + "\\s+breakpoint already hit 2 times"] \ + "check for a location only in inferior 2" + + gdb_breakpoint [gdb_get_line_number "Break after close"] temporary + gdb_continue_to_breakpoint "stop after close in inferior 1" \ + ".* Break after close\\. .*" + + gdb_test "inferior 2" "Switching to inferior 2 .*" \ + "switch back to inferior 2" + gdb_continue_to_breakpoint "stop at foo again in inferior 2" \ + "foo \\(\\) .*" +} + # Run all the tests. test_no_inf_display +test_pending_toggle +py_test_toggle_thread +py_test_clear_thread diff --git a/gdb/testsuite/gdb.multi/tids.exp b/gdb/testsuite/gdb.multi/tids.exp index 573b02fdd42..4f788844ee4 100644 --- a/gdb/testsuite/gdb.multi/tids.exp +++ b/gdb/testsuite/gdb.multi/tids.exp @@ -433,11 +433,13 @@ if { [allow_python_tests] } { gdb_py_test_silent_cmd "python bp = gdb.breakpoints()\[0\]" \ "get python breakpoint" 0 - gdb_test "python bp.thread = 6" "thread = 6" \ + gdb_test_no_output "python bp.thread = 6" \ "make breakpoint thread-specific with python" # Check that the inferior-qualified ID is correct. gdb_test "info breakpoint" \ - "stop only in thread 1.3\r\n.*" \ + [multi_line \ + "$decimal\\s+\[^\r\n\]+ in thread_function1 at \[^\r\n\]+" \ + "\\s+stop only in thread 1\\.3"] \ "thread specific breakpoint right thread" } }