From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id AVnhK7Ml5mix6yMAWB0awg (envelope-from ) for ; Wed, 08 Oct 2025 04:49:55 -0400 Authentication-Results: simark.ca; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=WQj9lOZL; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id A69441E0B6; Wed, 08 Oct 2025 04:49:55 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-3.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,RCVD_IN_VALIDITY_CERTIFIED_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED autolearn=ham autolearn_force=no version=4.0.1 Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id B66B31E047 for ; Wed, 08 Oct 2025 04:49:54 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 4DA7C385772E for ; Wed, 8 Oct 2025 08:49:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4DA7C385772E Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=WQj9lOZL Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTP id 8AA533857735 for ; Wed, 8 Oct 2025 08:48:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8AA533857735 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine 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 8AA533857735 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=1759913336; cv=none; b=ItEtv1XPB7BXCV0INutQivwiL4CAH4a3e7nOLa6LRQc0zKDD4OPGP4WWYIMR5/j6u+w/JpHfYjV5ir4NQ0HGepXQbF0jwZ5IUIM6Sx5ZcMgW2BkYOoV8xp0iyM0upkODvcOz0kzJ9NZVnwnp2/+bM0xU6iZrzakOsANfQ4GsiaU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1759913336; c=relaxed/simple; bh=6+qfdqEiDKN76g3CyiyiznrLfhjguMrvn3aM4MvEc1M=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=ZpipwswJk4+Ubr+GN0R7pPxf+X/MBEyxsVL9RnB2rNrgWN5DaeXeAfwtVSQGIyur63xWQ6k36BKi17n7zl5Hc9OW15pUwwDJPJt8KgQbxoAcXnRAlCEVuLpmHsIoTAhGoFniQnD1qEoruM4WTiIUpqG97oOYMTYUvpYfqXopmGY= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8AA533857735 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1759913336; 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; bh=kXRztWO+zWM45LMpXZxoAxDkuQVsosb6+QLRpTxnLJU=; b=WQj9lOZLUs8zKQh55046dulnuwLuQRPls7u3/7eV+QTEGez/GeiN3FPrIqlHjCddVCcPkF u7PciH0DebTBKnLrSIwk6quAWP8I8CV+IPi/gQXH62TFlK7k8l3TbXlIwu+yMXLHvFbiHc 3aCR63HRmUmeyzOWHDJhzikZH3E8jVQ= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-441-davfl2cqNdmPhrPK4c829w-1; Wed, 08 Oct 2025 04:48:55 -0400 X-MC-Unique: davfl2cqNdmPhrPK4c829w-1 X-Mimecast-MFC-AGG-ID: davfl2cqNdmPhrPK4c829w_1759913334 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-46e3ed6540fso3687565e9.0 for ; Wed, 08 Oct 2025 01:48:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759913333; x=1760518133; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=kXRztWO+zWM45LMpXZxoAxDkuQVsosb6+QLRpTxnLJU=; b=EFyNkxMhXiXwtCF6c7yk73NwvD43NRXJY9Ri2HvprxfztqnzDM3HKadrLZWakqH8+V j0I9C2IhAYmwnBXgSl5h577Go5VvCLfagaDPoShqBhT2qtdfO6Ej2iXH2w0rKl7VtpKy WK/FUatIyw+r+n0Di/I49PxKiMExJodi7VFCvo/AdZzPcj1wYlOLihrlDXAPSuXR3CrN Vd6AyzVP0YFQUmSOMHL9LlYau6G0b4A/nPx4DDbqEPxwrMPtQGmc7uE/pLQrbgAEFmIO qNZ+UhvRPKRL3a7JF/4kdWbJDcpIZ6VXUB0poqQ5RsXCKtN0Y2dj04WLjzjafG6R9o26 PpUQ== X-Gm-Message-State: AOJu0Yy9F22bwgt/sH5baTSknxracG4y6S415rTSyYfgzVDkETJzSNHG aFO83VRmJEqR9iRXJ+Z76VhSgTwvMENT1gZ3jBUGfKy27qw3mWJgv6JvcchbycnRq1oK2AO0wLC d2J2KQh9+S17jeaWHsR9LmfXofLgGsblMtwOnp90+HytN/x9SRXvJ54Ehh30d7NZWM5N4Kt3Eb3 O07o3S6KmaSrIA1vQ+FyjersBJEyKIXtVBmmo3LGhiSxQudj4= X-Gm-Gg: ASbGncufEqkib5riF0odnT9ykLpxJl8GYuSWxlvLYmQwTqh6Yt36Nm44Pic9vvJOqE6 iRZ27JrVPwYaQ/2lKtKQlc5EXacvuPCkOWQNmxWR9WeN9uWn/9NdQCx3bM8S2goS+MLE3T0/xH8 rKri3pxgXUmNM3bQgS0H1vZWdSUJaBF/ImwjNNA4JKh6pCqbWqI/MnCc91uD5q6xbXOkAC5XdhF hJ11eA+NXq1sXq4+VNW/PZR25TvtPVXQAljqwpEUrYMyEPB1v1s2VneD1/i1ZVblfsx03oWsmiF feuwrcYQUiaobtt70cz8RaPLcdsHosGXf8+6S551 X-Received: by 2002:a05:600c:c090:b0:45d:e775:d8b8 with SMTP id 5b1f17b1804b1-46fa294fa85mr35139845e9.1.1759913333209; Wed, 08 Oct 2025 01:48:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHTz5nCnCKvyqdsLunLsXRuScdYYVY11W1Z00MnvYROMFt+MU5bK/Rex/JMlzd/xAACF0i3lw== X-Received: by 2002:a05:600c:c090:b0:45d:e775:d8b8 with SMTP id 5b1f17b1804b1-46fa294fa85mr35139545e9.1.1759913332676; Wed, 08 Oct 2025 01:48:52 -0700 (PDT) Received: from localhost ([31.111.84.207]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46fa9c16990sm27639575e9.10.2025.10.08.01.48.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Oct 2025 01:48:52 -0700 (PDT) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCH] gdb: notify of inferior switch when needed from 'thread' command Date: Wed, 8 Oct 2025 09:48:50 +0100 Message-ID: X-Mailer: git-send-email 2.47.1 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 8EdUSyXQJMUU65p42qRtnD28Z9KxNJEZnOhkH7jZmGI_1759913334 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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~public-inbox=simark.ca@sourceware.org While working on the commit: commit 9959019545d8d6d71d927f20f088efba944b1e9c Date: Sun Sep 28 16:16:53 2025 +0100 gdb: fix for 'set suppress-cli-notifications on' missed case I spotted this message in the gdb.mi/user-selected-context-sync.exp test script: # Idea for the future: selecting a thread in a different inferior. For now, # GDB doesn't show an inferior switch, but if it did, it would be a nice # place to test it. What this message is talking about is this behaviour: (gdb) info threads Id Target Id Frame 1.1 Thread 0xf7dbc700 (LWP 818430) "thr" 0xf7eb2888 in clone () from /lib/libc.so.6 1.2 Thread 0xf7dbbb40 (LWP 818433) "thr" 0xf7fd0579 in __kernel_vsyscall () 1.3 Thread 0xf73ffb40 (LWP 818434) "thr" breakpt () at thr.c:19 2.1 Thread 0xf7dbc700 (LWP 818456) "thr" 0xf7eb2888 in clone () from /lib/libc.so.6 2.2 Thread 0xf7dbbb40 (LWP 818457) "thr" breakpt () at thr.c:19 * 2.3 Thread 0xf73ffb40 (LWP 818458) "thr" breakpt () at thr.c:19 (gdb) inferior 1 [Switching to inferior 1 [process 818430] (/home/andrew/tmp/thr)] [Switching to thread 1.1 (Thread 0xf7dbc700 (LWP 818430))] #0 0xf7eb2888 in clone () from /lib/libc.so.6 (gdb) thread 2.2 [Switching to thread 2.2 (Thread 0xf7dbbb40 (LWP 818457))] #0 breakpt () at thr.c:19 19 while (stop) (gdb) Notice that when we switch from thread 2.3 to 1.1 using the 'inferior 1' command, GDB tells us that the inferior has changed, and that the thread has changed (and also that the frame has changed). But, when we switch from 1.1 to 2.2 using the 'thread 2.2' command, we are only told about the thread change. The 'Switching to inferior ...' line includes some useful information, the process PID and the executable name, and I think it is a shame that these are not presented when using the 'thread' command to switch inferior. So, this commit addresses this issue. There are changes in basically two areas. The easy part is in thread_command (thread.c). Here we spot when the inferior has changed as a result of the 'thread' command, and included USER_SELECTED_INFERIOR in the set of state passed to the notify_user_selected_context_changed function. The change in mi/mi-main.c is a little more involved. In the mi_cmd_execute function we use an instance of user_selected_context to spot if any inferior state (frame, thread, or inferior) changes after an MI command, this is then used to decide if there should be a call to notify_user_selected_context_changed. Currently, in mi_cmd_execute, notify_user_selected_context_changed is always passed 'USER_SELECTED_THREAD | USER_SELECTED_FRAME'. This makes sense, the MI doesn't allow "switching inferiors" as a command, instead, an MI frontend must switch threads, and the inferior is switched as a consequence. But this does mean that if a user has a CLI and MI interpreter running, and the MI switches threads, the CLI will only receive the thread switch style notifications, that is, there will be no "Switching to inferior ..." line. What I've done is rename user_selected_context::has_changed to user_selected_context::what_changed, this function is now responsible for returning the set of USER_SELECTED_* flags that indicate what changed. If anything has changed then we always return USER_SELECTED_THREAD | USER_SELECTED_FRAME as a minimum. This retains the existing behaviour, but is possibly more aggressive that we need to be; the -stack-select-frame command can only change the frame, so maybe in this case we should only return USER_SELECTED_FRAME? I've left that for the future though. However, the important change is that in ::what_changed, I now spot when the inferior has changed and include USER_SELECTED_INFERIOR in the set of flags that are returned. In mi_cmd_execute we now call the new what_changed function, and use the set of flags returned when calling notify_user_selected_context_changed. This means that the CLI will now receive inferior changed notifications when appropriate. The gdb.mi/user-selected-context-sync.exp script has been updated, replacing the comment I quoted above with an actual test that the inferior change is announced correctly. --- gdb/mi/mi-main.c | 44 ++++++++++++--- .../gdb.mi/user-selected-context-sync.exp | 56 ++++++++++++++++--- gdb/thread.c | 13 ++++- 3 files changed, 93 insertions(+), 20 deletions(-) diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c index bf1070030e2..3a5cbb27966 100644 --- a/gdb/mi/mi-main.c +++ b/gdb/mi/mi-main.c @@ -538,6 +538,11 @@ mi_cmd_thread_select (const char *command, const char *const *argv, int argc) thread_select (argv[0], thr); + /* We don't call print_selected_inferior here as this never prints + anything when the output is MI like (as it is now). MI consumers are + expected to derive the inferior change from the global thread-id + included in the print_selected_thread_frame output. */ + print_selected_thread_frame (current_uiout, USER_SELECTED_THREAD | USER_SELECTED_FRAME); } @@ -1968,12 +1973,30 @@ struct user_selected_context /* Return true if the user selected context has changed since this object was created. */ - bool has_changed () const + user_selected_what what_changed () const { + /* If anything changed then we report both the thread and frame at a + minimum. We optionally add the inferior if we know that it + changed. + + This means that for pure frame changes, e.g. -stack-select-frame, we + still report both a thread and a frame, which isn't ideal, but + there's also the cases where -thread-select is used to re-select the + current thread, in this case we'd still like to see the thread + reported, at least, that's what we have historically done. */ + user_selected_what state + = USER_SELECTED_THREAD | USER_SELECTED_FRAME; + /* Did the selected thread change? */ if (m_previous_ptid != null_ptid && inferior_ptid != null_ptid && m_previous_ptid != inferior_ptid) - return true; + { + /* Did the inferior change too? */ + if (m_previous_ptid.pid () != inferior_ptid.pid ()) + state |= USER_SELECTED_INFERIOR; + + return state; + } /* Grab details of the currently selected frame, for comparison. */ frame_id current_frame_id; @@ -1982,7 +2005,7 @@ struct user_selected_context /* Did the selected frame level change? */ if (current_frame_level != m_previous_frame_level) - return true; + return state; /* Did the selected frame id change? If the innermost frame is selected then the level will be -1, and the frame-id will be @@ -1991,10 +2014,10 @@ struct user_selected_context other than the innermost frame selected. */ if (current_frame_level != -1 && current_frame_id != m_previous_frame_id) - return true; + return state; /* Nothing changed! */ - return false; + return 0; } private: /* The previously selected thread. This might be null_ptid if there was @@ -2098,10 +2121,13 @@ mi_cmd_execute (struct mi_parse *parse) parse->cmd->invoke (parse); - if (!parse->cmd->preserve_user_selected_context () - && current_user_selected_context.has_changed ()) - interps_notify_user_selected_context_changed - (USER_SELECTED_THREAD | USER_SELECTED_FRAME); + if (!parse->cmd->preserve_user_selected_context ()) + { + user_selected_what what + = current_user_selected_context.what_changed (); + if (what != 0) + notify_user_selected_context_changed (what); + } } /* See mi-main.h. */ diff --git a/gdb/testsuite/gdb.mi/user-selected-context-sync.exp b/gdb/testsuite/gdb.mi/user-selected-context-sync.exp index 8a4827fd4a8..36792ee8293 100644 --- a/gdb/testsuite/gdb.mi/user-selected-context-sync.exp +++ b/gdb/testsuite/gdb.mi/user-selected-context-sync.exp @@ -698,9 +698,21 @@ proc_with_prefix test_cli_thread { mode } { } } - # Idea for the future: selecting a thread in a different inferior. For now, - # GDB doesn't show an inferior switch, but if it did, it would be a nice - # place to test it. + with_test_prefix "thread 2.2" { + # Select a thread in a different inferior. This should trigger an + # 'inferior changed' and 'thread changed' notification on the CLI, + # and a single MI async notification. + set mi_re [make_mi_re $mode 5 0 event] + set cli_re [make_cli_re $mode 2 2.2 0] + + with_spawn_id $gdb_main_spawn_id { + gdb_test "thread 2.2" $cli_re "select thread" + } + + with_spawn_id $mi_spawn_id { + match_re_or_ensure_no_output $mi_re "select thread, event on MI" + } + } } # Test frame selection from CLI. @@ -995,9 +1007,22 @@ proc_with_prefix test_mi_thread_select { mode } { } } - # Idea for the future: selecting a thread in a different inferior. For now, - # GDB doesn't show an inferior switch, but if it did, it would be a nice - # place to test it. + with_test_prefix "thread 2.2" { + # Select a thread in a different inferior. This should trigger an + # 'inferior changed' and 'thread changed' notification on the CLI, + # and a single MI async notification. + set mi_re [make_mi_re $mode 5 0 response] + set cli_re [make_cli_re $mode 2 2.2 0] + + with_spawn_id $mi_spawn_id { + mi_gdb_test "-thread-select 5" $mi_re "-thread-select" + } + + with_spawn_id $gdb_main_spawn_id { + match_re_or_ensure_no_output "$cli_re\r\n" "-thread-select, event on CLI" + } + + } } proc_with_prefix test_mi_stack_select_frame { mode } { @@ -1290,9 +1315,22 @@ proc_with_prefix test_cli_in_mi_thread { mode cli_in_mi_mode } { } } - # Idea for the future: selecting a thread in a different inferior. For now, - # GDB doesn't show an inferior switch, but if it did, it would be a nice - # place to test it. + with_test_prefix "thread 2.2" { + # Select a thread in a different inferior. This should trigger an + # 'inferior changed' and 'thread changed' notification on the CLI, + # and a single MI async notification. + set command [make_cli_in_mi_command $cli_in_mi_mode "thread 2.2"] + set mi_re [make_cli_in_mi_re $command $cli_in_mi_mode $mode 1 2 2.2 5 0] + set cli_re [make_cli_re $mode 2 2.2 0] + + with_spawn_id $mi_spawn_id { + mi_gdb_test $command $mi_re "select thread" + } + + with_spawn_id $gdb_main_spawn_id { + match_re_or_ensure_no_output "$cli_re\r\n" "select thread, event on CLI" + } + } } # Test selecting the frame using a CLI command in the MI channel. diff --git a/gdb/thread.c b/gdb/thread.c index 472f41969cf..fc9b3d0ccde 100644 --- a/gdb/thread.c +++ b/gdb/thread.c @@ -1977,10 +1977,19 @@ thread_command (const char *tidstr, int from_tty) } else { + inferior *previous_inferior = current_inferior (); + thread_select (tidstr, parse_thread_id (tidstr, NULL)); - notify_user_selected_context_changed - (USER_SELECTED_THREAD | USER_SELECTED_FRAME); + user_selected_what selection = (USER_SELECTED_THREAD + | USER_SELECTED_FRAME); + + /* If the inferior changed as a consequence of the thread change, + then let the user know. */ + if (previous_inferior != current_inferior ()) + selection |= USER_SELECTED_INFERIOR; + + notify_user_selected_context_changed (selection); } } base-commit: 9959019545d8d6d71d927f20f088efba944b1e9c -- 2.47.1