From patchwork Mon Oct 30 13:41:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 78753 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 A89C63858438 for ; Mon, 30 Oct 2023 13:42:28 +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 6B2D43858D33 for ; Mon, 30 Oct 2023 13:41:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6B2D43858D33 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 6B2D43858D33 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=1698673297; cv=none; b=Sca56XzGkyeyDT5sItjmUFxFVZzKJtxT976w+slooKi9O9796tHvSk+f+mjst+/hJEFy18gH9nziA750JefjfKolNRS4aCtckcFaFHyQdScUniBBL8g9qOvTD4CHieFP81YQmyI3nt1Gxb0t7+U7TO/Mapuz7ibiyjvpJFHWvO0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698673297; c=relaxed/simple; bh=YRj6tm+5vT/c6qxsRak93rj98Ht0zDCItWDpim8y2pI=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=hIVlnfyOY+ceA7kFsytgdTqhmHIUX8mTJxArPr2/X/RkH5tv1IteR48JWPl2ut6xpE4a5QhIUpVol1Ez5lox/LNv/yny3t7KCe7Hvcghbmj7dNRAlICJ9UVTrXvLGRaMIK1e+zt41sTjWE3TB0he27Pnks6e7DM+i3xF8WMfHLo= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698673295; 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=/L7szC+hdSCIpWopk4hyCoKmWRDtN5ZQ1A57O6ccji8=; b=KZnkrGL6QH5sm1Wlx2Hkv+0QfBeuMFbM5A7ldF1ME4uFNMgbsQoPPXOMK5U8rRKKYXEQEo viz76gymLlz988FSNXhPJ1L5zJkgReO+zzpLcn0L1D3uogRfmEGMujwTpT9NmzRkB8renh j/Ox1C7WgQrJQFIFgfm1L+kww9r1L1I= 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-586-wCG0dU8TPWeiRbJqKGaDYA-1; Mon, 30 Oct 2023 09:41:33 -0400 X-MC-Unique: wCG0dU8TPWeiRbJqKGaDYA-1 Received: by mail-lf1-f71.google.com with SMTP id 2adb3069b0e04-5082705f6dfso3577416e87.2 for ; Mon, 30 Oct 2023 06:41:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698673292; x=1699278092; 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=9N3sRZd1Onx/5tfYFweKgi7cpeb0Xb/RzOPaDtOTgaY=; b=VhCCtyu1z1b0Dl3FRNPISWkFHNrlwBCzZAIrB+X/fVw4B7scvVzgZZQlhH7lUAoKdn kJa8Z7g/vM6/bQXXcKNbbXYBRdeN3PJLtpAJ7px2JGyNYASmI3OOA1CAOE1YkHndChv/ 91NKE6mUvMVXuL5hOIy/DOw0sPzXV46GuoQlMVHnL7/ess6F6NyFMXfHdsF6w0KLvOQ/ UjztSQHmVKpGCEtjvbmk4wxjpLVJKl3oU6S69RYDlFi8sVSKPstf33Fx9NaQcoWe84A1 w6e4ieJ9pFFME9ZBkA9nP+gIE1y99hwQ1+Pyy3fNK5wHYwNErgBApT4zTE3oiRhnjbJl 876w== X-Gm-Message-State: AOJu0YwtnpfvYojuVf/OJaDLMlNEpE0Uuc4xbiM2xbRwzdXDPN6zT3DD P3PONlZwBw12QxDBTcu9AhrqeHvKioHcbKJb8FZbiPTcl341U6IZlWV+tRHF7jNnltMjX2rG7mS zmO+YItahrMEe+L8d9rroDrIJKBsXXwzcU/Q7pB2sh699zJuc1GhCwqtM0Pg+Mz2Oh04r0BRejo uyAnipSg== X-Received: by 2002:ac2:5a02:0:b0:507:a624:3f35 with SMTP id q2-20020ac25a02000000b00507a6243f35mr7160048lfn.41.1698673291973; Mon, 30 Oct 2023 06:41:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF0EjZHrtaaXB1OqJJv9Dw6NNS287N2UO7AdntMkmicyV6TDpqpsQ6CnJgf12a6FRatiK9Gpw== X-Received: by 2002:ac2:5a02:0:b0:507:a624:3f35 with SMTP id q2-20020ac25a02000000b00507a6243f35mr7160022lfn.41.1698673291456; Mon, 30 Oct 2023 06:41:31 -0700 (PDT) Received: from localhost ([31.111.84.209]) by smtp.gmail.com with ESMTPSA id z6-20020a1709060f0600b009944e955e19sm6027315eji.30.2023.10.30.06.41.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Oct 2023 06:41:31 -0700 (PDT) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess , Lancelot SIX , Tom Tromey Subject: [PATCH 2/2] gdb: fix reopen_exec_file for files with target: prefix Date: Mon, 30 Oct 2023 13:41:23 +0000 Message-Id: <06f0d493791c0a9523484e5a3c16ba5b9f3485d5.1698673143.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.5 required=5.0 tests=BAYES_00, DKIM_INVALID, DKIM_SIGNED, GIT_PATCH_0, KAM_DMARC_NONE, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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.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 Following on from this commit: commit f2c4f78c813a9cef38b7e9c9ad18822fb9e19345 Date: Thu Sep 21 16:35:30 2023 +0100 gdb: fix reread_symbols when an objfile has target: prefix In this commit I update reopen_exec_file to correctly handle executables with a target: prefix. Before this commit we used the system 'stat' call, which obviously isn't going to work for files with a target: prefix (files located on a possibly remote target machine). By switching to bfd_stat we will use remote fileio to stat the remote files, which means we should now correctly detect changes in a remote executable. The program_space::ebfd_mtime variable, with which we compare the result of bfd_stat is set with a call to bfd_get_mtime, which in turn calls bfd_stat, so comparing to the result of calling bfd_stat makes sense (I think). As I discussed in the commit f2c4f78c813a, if a BFD is an in-memory BFD, then calling bfd_stat will always return 0, while bfd_get_mtime will always return the time at which the BFD was created. As a result comparing the results will always show the file having changed. I don't believe that GDB can set the main executable to an in-memory BFD object, so, in this commit, I simply assert that the executable is not in-memory. If this ever changes then we would need to decide how to handle this case -- always reload, or never reload. The assert doesn't appear to trigger for our current test suite. --- gdb/corefile.c | 17 +++-- gdb/testsuite/gdb.server/target-exec-file.exp | 70 +++++++++++++++++++ 2 files changed, 80 insertions(+), 7 deletions(-) diff --git a/gdb/corefile.c b/gdb/corefile.c index 19a96bc6f86..b9c204d18dc 100644 --- a/gdb/corefile.c +++ b/gdb/corefile.c @@ -105,21 +105,24 @@ specify_exec_file_hook (void (*hook) (const char *)) void reopen_exec_file (void) { - int res; - struct stat st; + bfd *exec_bfd = current_program_space->exec_bfd (); /* Don't do anything if there isn't an exec file. */ - if (current_program_space->exec_bfd () == NULL) + if (exec_bfd == nullptr) return; + /* The main executable can't be an in-memory BFD object. If it was then + the use of bfd_stat below would not work as expected. */ + gdb_assert ((exec_bfd->flags & BFD_IN_MEMORY) == 0); + /* If the timestamp of the exec file has changed, reopen it. */ - std::string filename = bfd_get_filename (current_program_space->exec_bfd ()); - res = stat (filename.c_str (), &st); + struct stat st; + int res = bfd_stat (exec_bfd, &st); if (res == 0 - && current_program_space->ebfd_mtime + && current_program_space->ebfd_mtime != 0 && current_program_space->ebfd_mtime != st.st_mtime) - exec_file_attach (filename.c_str (), 0); + exec_file_attach (bfd_get_filename (exec_bfd), 0); } /* If we have both a core file and an exec file, diff --git a/gdb/testsuite/gdb.server/target-exec-file.exp b/gdb/testsuite/gdb.server/target-exec-file.exp index 9260df8b88d..40863538785 100644 --- a/gdb/testsuite/gdb.server/target-exec-file.exp +++ b/gdb/testsuite/gdb.server/target-exec-file.exp @@ -52,6 +52,19 @@ set target_exec [gdb_remote_download target $binfile] # prompt us if this is the right thing to do. gdb_test_no_output "set confirm off" +if { [allow_python_tests] } { + # Register an event handler for the executable changed event. + # This handler just copies the event into a global Python object. + gdb_test_multiline "Add connection_removed event" \ + "python" "" \ + "global_exec_changed_event = None" "" \ + "def executable_changed(event):" "" \ + " global global_exec_changed_event" "" \ + " global_exec_changed_event = event" "" \ + "gdb.events.executable_changed.connect (executable_changed)" "" \ + "end" "" +} + # Start gdbserver, but always in extended-remote mode, and then # connect to it from GDB. set res [gdbserver_start "--multi" $target_exec] @@ -59,6 +72,22 @@ set gdbserver_protocol "extended-remote" set gdbserver_gdbport [lindex $res 1] gdb_target_cmd $gdbserver_protocol $gdbserver_gdbport +if { [allow_python_tests] } { + # When connecting to a remote target, if the user has not told GDB + # which executable to use, then GDB will figure out an executable + # from the remote target. + # + # As a result we expect to have seen an executable changed event. + with_test_prefix "after connecting" { + gdb_test "python print(global_exec_changed_event)" \ + "" + gdb_test "python print(global_exec_changed_event.progspace.executable_filename)" \ + [string_to_regexp target:$target_exec] + gdb_test "python print(global_exec_changed_event.reload)" "False" + gdb_test_no_output "python global_exec_changed_event = None" + } +} + # Issue a 'file' command and parse the output. We look for a couple # of specific things to ensure that we are correctly reading the exec # from the remote target. @@ -104,6 +133,20 @@ gdb_assert { $saw_read_of_remote_exec } \ gdb_assert { $saw_read_of_syms_from_exec } \ "symbols were read from remote exec file" +if { [allow_python_tests] } { + # The 'file' command forces GDB to always load the executable, + # even if the same filename is used. In this case, as the + # filename is the same, this will show as a reload event. + with_test_prefix "after 'file' command" { + gdb_test "python print(global_exec_changed_event)" \ + "" + gdb_test "python print(global_exec_changed_event.progspace.executable_filename)" \ + [string_to_regexp target:$target_exec] + gdb_test "python print(global_exec_changed_event.reload)" "True" + gdb_test_no_output "python global_exec_changed_event = None" + } +} + # Start the inferior (with the 'start' command), use TESTNAME for any # pass/fail calls. EXPECT_REREAD should be true or false and # indicates if we expect to too a line like: @@ -155,10 +198,24 @@ proc start_inferior { testname expect_reread } { # see the symbols re-read now. start_inferior "start inferior the first time" false +if { [allow_python_tests] } { + # The executable hasn't changed. + with_test_prefix "after starting inferior for the first time" { + gdb_test "python print(global_exec_changed_event)" "None" + } +} + # Re-start the inferior. The executable is unchanged so we should not # see the symbol file being re-read. start_inferior "start inferior a second time" false +if { [allow_python_tests] } { + # The executable still hasn't changed. + with_test_prefix "after starting inferior for the second time" { + gdb_test "python print(global_exec_changed_event)" "None" + } +} + # Delay for a short while so, when we touch the exec, we know the # timestamp will change. sleep 1 @@ -172,3 +229,16 @@ if { $status != 0 } { # Start the inferior again, we expect to see the symbols being re-read # from the remote file. start_inferior "start inferior a third time" true + +if { [allow_python_tests] } { + # The executable has now changed on disk. This will be a reload + # event. + with_test_prefix "after starting inferior for the third time" { + gdb_test "python print(global_exec_changed_event)" \ + "" + gdb_test "python print(global_exec_changed_event.progspace.executable_filename)" \ + [string_to_regexp target:$target_exec] + gdb_test "python print(global_exec_changed_event.reload)" "True" + gdb_test_no_output "python global_exec_changed_event = None" + } +}