From patchwork Wed Feb 8 15:23:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 64489 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 209B5385800A for ; Wed, 8 Feb 2023 15:24:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 209B5385800A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1675869849; bh=9sovpJpV8zayyv1/beWmmmWwJZvGY3ZJt2MJDVVZ0Kw=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=cy0Fm0kfBGw1CfTudYKNVQ+0nAeW3FkmBqSEEBif/vFNJniEwgZstTkoTxM760JHR uFHcNikCVbAiPEG0pLOEtZeWsNFQD/WfzohJz3EyEFYlWC+r3w+hGKf4bcpwW47mBz S8xLSBZh4tjrEjY/bbHI+5QSRABcULyEFPQls6F8= 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 1E12B385840D for ; Wed, 8 Feb 2023 15:23:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1E12B385840D Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-639-p37Fh17YPMyhBOq_MXJvuA-1; Wed, 08 Feb 2023 10:23:40 -0500 X-MC-Unique: p37Fh17YPMyhBOq_MXJvuA-1 Received: by mail-qt1-f198.google.com with SMTP id i5-20020ac813c5000000b003b86b748aadso10934097qtj.14 for ; Wed, 08 Feb 2023 07:23:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9sovpJpV8zayyv1/beWmmmWwJZvGY3ZJt2MJDVVZ0Kw=; b=eodJ78sqFaqwFFDTzQQCSmRgz/V7ANmrYGTouWyVl4e6fk4FVNkO0KHrTAiPlv1jdL 8bCltGlPH5R8MrcJAoq6RDV7enWd6vnkWju7sRmPY0MC5mOMyGno6jzaFmAUBq0oPgub 7IlCa45O9JuqG1kN9t+FqCUSHT7FYBKpjCjZoA2gJQ5A6v0WznlghqTPNkGcaxutFjKV kYpE2/2Us9JRgHiB6WIWVvSxAtY8+PKbcpFWnKQJVHwfhtEX0fncpjgZKiXtpNc0oAhg YZ5QGoUSAy3t8mQz76klMx1qTHJnwCz5QNG3+E8Mde57bCDRpcTgB54JbwTiq5Jw68X1 3IoA== X-Gm-Message-State: AO0yUKWsbp5yxccK54BAxH/BvP8FOUaPYs4hQVnjaUg3NaR2d4ObEA5p ZatZEo4xTjApwUWm6Lzs5LV2HsfjX/8JRmxgwVN/lcsgQhyUT5VHA4drpRJBM16QQx9TJ8pU8rS 1trKbVil6tbGXjmGMLkMshjHt0txOZaFClLItTAIsl1Qvs3OMZjhvnvmFD/l/w/Yyv4g7Crf78Z SDejk= X-Received: by 2002:ac8:7f01:0:b0:3b8:5057:377b with SMTP id f1-20020ac87f01000000b003b85057377bmr13238849qtk.65.1675869819979; Wed, 08 Feb 2023 07:23:39 -0800 (PST) X-Google-Smtp-Source: AK7set8qwCuqgDiZIdi3NU27Y1H85+gIfGdjRfAf9dvqUsiQu57/xlX9wVPEuuW6zTKkyWoEgityfA== X-Received: by 2002:ac8:7f01:0:b0:3b8:5057:377b with SMTP id f1-20020ac87f01000000b003b85057377bmr13238808qtk.65.1675869819663; Wed, 08 Feb 2023 07:23:39 -0800 (PST) Received: from localhost (95.72.115.87.dyn.plus.net. [87.115.72.95]) by smtp.gmail.com with ESMTPSA id f3-20020ac84703000000b003b2d890752dsm11543384qtp.88.2023.02.08.07.23.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Feb 2023 07:23:39 -0800 (PST) To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCH 3/3] gdb: don't use the global thread-id in the saved breakpoints file Date: Wed, 8 Feb 2023 15:23:30 +0000 Message-Id: X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Andrew Burgess via Gdb-patches From: Andrew Burgess Reply-To: Andrew Burgess Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" I noticed that breakpoint::print_recreate_thread was printing the global thread-id. This function is used to implement the 'save breakpoints' command, and should be writing out suitable CLI commands for recreating the current breakpoints. The CLI does not use global thread-ids, but instead uses the inferior specific thread-ids, e.g. "2.1". This commit updates breakpoint::print_recreate_thread to use the print_thread_id function, and adds a test for this change. --- gdb/breakpoint.c | 5 +- .../gdb.multi/bp-thread-specific.exp | 46 +++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 6b576859592..6e3c76305e7 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -14120,7 +14120,10 @@ void breakpoint::print_recreate_thread (struct ui_file *fp) const { if (thread != -1) - gdb_printf (fp, " thread %d", thread); + { + struct thread_info *thr = find_thread_global_id (thread); + gdb_printf (fp, " thread %s", print_thread_id (thr)); + } if (task != 0) gdb_printf (fp, " task %d", task); diff --git a/gdb/testsuite/gdb.multi/bp-thread-specific.exp b/gdb/testsuite/gdb.multi/bp-thread-specific.exp index 777fcf85ab0..6a7cd044af4 100644 --- a/gdb/testsuite/gdb.multi/bp-thread-specific.exp +++ b/gdb/testsuite/gdb.multi/bp-thread-specific.exp @@ -15,6 +15,9 @@ # Check that GDB uses the correct thread-id when describing multiple # thread specific breakpoints at the same location. +# +# Also check that the correct thread-ids are used in the saved +# breakpoints file. # The plain remote target can't do multiple inferiors. require !use_gdb_stub @@ -59,3 +62,46 @@ gdb_test "break foo thread 1.1" \ "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\\)"] + +# Save the breakpoints into a file. +if {[is_remote host]} { + set bps bps +} else { + set bps [standard_output_file bps] +} + +remote_file host delete "$bps" +gdb_test "save breakpoint $bps" "" "save breakpoint to bps" + +if {[is_remote host]} { + set bps [remote_upload host bps [standard_output_file bps]] +} + +# Now dig through the saved breakpoints file and check that the +# thread-ids were written out correctly. First open the saved +# breakpoints and read them into a list. +set fh [open $bps] +set lines [split [read $fh] "\n"] +close $fh + +# Except the list created from the saved breakpoints file will have a +# blank line entry at the end, so remove it now. +gdb_assert {[string equal [lindex $lines end] ""]} \ + "check last item was an empty line" +set lines [lrange $lines 0 end-1] + +# These are the lines we expect in the saved breakpoints file, in the +# order that we expect them. These are strings, not regexps. +set expected_results \ + [list \ + "break -qualified main" \ + "break foo thread 2.1" \ + "break foo thread 1.1"] + +# Now check that the files contents (in LINES) matches the +# EXPECTED_RESULTS. +gdb_assert {[llength $lines] == [llength $expected_results]} \ + "correct number of lines in saved breakpoints file" +foreach a $lines b $expected_results { + gdb_assert {[string equal $a $b]} "line '$b'" +}