From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id AV43EOXW62m5UzkAWB0awg (envelope-from ) for ; Fri, 24 Apr 2026 16:47:33 -0400 Received: by simark.ca (Postfix, from userid 112) id 3B5841E0BA; Fri, 24 Apr 2026 16:47:33 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.3 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, 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 vm01.sourceware.org (vm01.sourceware.org [38.145.34.32]) (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 408C51E0B1 for ; Fri, 24 Apr 2026 16:47:31 -0400 (EDT) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id DAE434B92084 for ; Fri, 24 Apr 2026 20:47:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DAE434B92084 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by sourceware.org (Postfix) with ESMTPS id D2A324B920FE for ; Fri, 24 Apr 2026 20:45:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D2A324B920FE Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=palves.net Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D2A324B920FE Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=209.85.128.54 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1777063527; cv=none; b=oM2CiTjA4so8/SJCmod2sWJ2Q7jW4TZRPMlE5CsupDPKPMmbnSyspGFRZefkplMlvDYZS4Tmw/065b8nVYBdZggL6wMDq4Sc9PMdUBpZqBdzDrJnZFqhPz13IlUF1gv6fQcSEpV5VFWV3n1v1tQoxpKw9Lg+qcZuGpCPYDpcJ6U= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1777063527; c=relaxed/simple; bh=EvqDx0SinjYu+y4Xn95uNh+sMl+YdPmSt8gbq28tJ58=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=NWn5j+9YDhbZD+Xa9DlerWjdG/pl2wjtdPVPD+VHp6hXd5700nhieWoiMI3s4QAmOcS+OBmhtpghZUedgbpk7zg6n4NWxF6P4Un1WDgo+g5VwD3mxChSgwTR4SQhSYQxVbcSq7CQyAY8kdAlvvY2l5VsobuVWn+GBEAAs/yoKco= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D2A324B920FE Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-48334ee0aeaso86360025e9.1 for ; Fri, 24 Apr 2026 13:45:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777063525; x=1777668325; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=eCYQnTqs9/71yT7XCivZVylNz+FKsfbCa1k23xN+/1w=; b=aNMfpBYOhBfXJTxgK9UncKvq91bBXMITawt4567kTAjOre4bwHoeOZYBh7vaBjO8vC myLlEGsmgP59E2VLuEyEBGDs0z7WMA7TbOvyu9vQFrKO5YZ+5buzEu/Un52wrwL19djg tvxcGCpz3XT8yO72Sn6Fhbq+2GMSdpHFkbfElprgViiPzupERwmEV4NXzVIZ5S9veB/W 1zKgRcZ1lrUeXoDe27A1r1Sy7MyfP6sk8ZYLJbBGjjS/CH1OWTuiR9Mt+CKeyT6S88+Q Foaz4reGmrRIDOvcPKjOglJ28cnjWKzAYZNUs2nJYykIgJNdjBFAqT0NK3EusCuC0ADl GEGA== X-Gm-Message-State: AOJu0Yy80w4qgDr2J3zfkIYVjho+L6/UEuiBbeDWwcVR11jx6aFpTgle Dpy5vat59VM91sp+NcJROIClQjvum92NTndfesMwbKFB4BycZWNkP7WTT+dq98N6 X-Gm-Gg: AeBDietELUgE9/1u5EDBRnowKuCvjadAgfiX7/23EYqyneatN//+3Ok4cz7fZR8/u+i AmzkK7TgdTB01aF5PNxFEMG/ZYHmLGtr0yWqlKlfgPDwOiJFTXAHZvUd2IakfTmQlcLHtjfbakI hr15wS356FwCcr4WdBqrZHUefZF3uXJLDm9M/KoXj2OU6+QlWcGQtIY2Pr00wU7ocCy8VAaJ+xx JM2xtRHJMMqiDPnDlqPsgM8DVBwyYuzaTdZGWZ3k9NLL5M32lS0otVHYRl49NiV8n9XRnzPrgJu QyelcXCq8PFqKFeRPmYYFd5OlS60KiAOw9TfJWyk4Jov/Wb9cNA1zAp3IE05v91SWoNcfAtgut4 7yhcATuVrx4Iq2+1BIZRJ0GH269nf5+TOyCvv8RoZUITzaOmFT+rNZ1zpkQ53lUmJgcofxL9kfH 1Mc0jhTXboEuoJ28Rg2kZrsMpzfnMGgE2q X-Received: by 2002:a05:600c:48a1:b0:489:a4:e58a with SMTP id 5b1f17b1804b1-48900a4e881mr272303015e9.19.1777063525349; Fri, 24 Apr 2026 13:45:25 -0700 (PDT) Received: from localhost ([2001:8a0:facb:a800:7315:8865:c664:fc06]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-488ffc5e3f4sm345173755e9.2.2026.04.24.13.45.24 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 24 Apr 2026 13:45:25 -0700 (PDT) From: Pedro Alves To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [pushed 04/28] Windows gdb+gdbserver: Eliminate thread_rec(INVALIDATE_CONTEXT) calls Date: Fri, 24 Apr 2026 21:44:44 +0100 Message-ID: <20260424204508.1343973-5-pedro@palves.net> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260424204508.1343973-1-pedro@palves.net> References: <20260424204508.1343973-1-pedro@palves.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Replace thread_rec(INVALIDATE_CONTEXT) calls with find_thread, and invalidate_context / suspend calls in the spots that might need those. I don't know why does the INVALIDATE_CONTEXT implementation in GDB avoid suspending the event thread: case INVALIDATE_CONTEXT: if (ptid.lwp () != current_event.dwThreadId) th->suspend (); Checks for a global "current_event" get in the way of non-stop support later in the series, as each thread will have its own "last debug event". Regardless, it should be fine to suspend the event thread. As a data point, the GDBserver implementation always suspends. So this patch does not try to avoid suspending the event thread on the native side either. Approved-By: Tom Tromey Change-Id: I8d2f0a749d23329956e62362a7007189902dddb5 --- gdb/aarch64-windows-nat.c | 2 ++ gdb/nat/windows-nat.h | 2 -- gdb/windows-nat.c | 21 +++++++-------------- gdb/x86-windows-nat.c | 2 ++ gdbserver/win32-low.cc | 10 ++++------ 5 files changed, 15 insertions(+), 22 deletions(-) diff --git a/gdb/aarch64-windows-nat.c b/gdb/aarch64-windows-nat.c index c375bbf2ddd..d43ee6f13fe 100644 --- a/gdb/aarch64-windows-nat.c +++ b/gdb/aarch64-windows-nat.c @@ -185,6 +185,7 @@ aarch64_windows_nat_target::fill_thread_context (windows_thread_info *th) if (context->ContextFlags == 0) { + th->suspend (); context->ContextFlags = WindowsContext::all; CHECK (get_thread_context (th->h, context)); } @@ -285,6 +286,7 @@ aarch64_windows_nat_target::store_one_register (const struct regcache *regcache, windows_thread_info *th, int r) { gdb_assert (r >= 0); + gdb_assert (th->context.ContextFlags != 0); char *context_ptr = (char *) &th->context; diff --git a/gdb/nat/windows-nat.h b/gdb/nat/windows-nat.h index 24ef6cc3f9c..1a564fbf11b 100644 --- a/gdb/nat/windows-nat.h +++ b/gdb/nat/windows-nat.h @@ -109,8 +109,6 @@ enum thread_disposition_type { /* Invalidate the context, but do not suspend the thread. */ DONT_SUSPEND, - /* Invalidate the context and suspend the thread. */ - INVALIDATE_CONTEXT }; /* A single pending stop. See "pending_stops" for more diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c index e8df5e053e6..ca9a197d64e 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c @@ -284,11 +284,6 @@ windows_per_inferior::thread_rec (ptid_t ptid, { switch (disposition) { - case INVALIDATE_CONTEXT: - if (ptid.lwp () != current_event.dwThreadId) - th->suspend (); - invalidate_thread_context (th); - break; case DONT_SUSPEND: th->suspended = -1; invalidate_thread_context (th); @@ -392,8 +387,7 @@ windows_nat_target::delete_thread (ptid_t ptid, DWORD exit_code, void windows_nat_target::fetch_registers (struct regcache *regcache, int r) { - windows_thread_info *th - = windows_process->thread_rec (regcache->ptid (), INVALIDATE_CONTEXT); + windows_thread_info *th = windows_process->find_thread (regcache->ptid ()); /* Check if TH exists. Windows sometimes uses a non-existent thread id in its events. */ @@ -415,8 +409,7 @@ windows_nat_target::fetch_registers (struct regcache *regcache, int r) void windows_nat_target::store_registers (struct regcache *regcache, int r) { - windows_thread_info *th - = windows_process->thread_rec (regcache->ptid (), INVALIDATE_CONTEXT); + windows_thread_info *th = windows_process->find_thread (regcache->ptid ()); /* Check if TH exists. Windows sometimes uses a non-existent thread id in its events. */ @@ -933,7 +926,9 @@ windows_nat_target::get_windows_debug_event *ourstatus = stop->status; ptid_t ptid (windows_process->current_event.dwProcessId, thread_id); - windows_process->thread_rec (ptid, INVALIDATE_CONTEXT); + windows_thread_info *th = windows_process->find_thread (ptid); + if (th != nullptr) + windows_process->invalidate_thread_context (th); return ptid; } @@ -1151,8 +1146,7 @@ windows_nat_target::get_windows_debug_event && windows_process->windows_initialization_done) { ptid_t ptid = ptid_t (current_event->dwProcessId, thread_id, 0); - windows_thread_info *th - = windows_process->thread_rec (ptid, INVALIDATE_CONTEXT); + windows_thread_info *th = windows_process->find_thread (ptid); th->stopped_at_software_breakpoint = true; th->pc_adjusted = false; } @@ -1190,8 +1184,7 @@ windows_nat_target::wait (ptid_t ptid, struct target_waitstatus *ourstatus, if (ourstatus->kind () != TARGET_WAITKIND_EXITED && ourstatus->kind () != TARGET_WAITKIND_SIGNALLED) { - windows_thread_info *th - = windows_process->thread_rec (result, INVALIDATE_CONTEXT); + windows_thread_info *th = windows_process->find_thread (result); if (th != nullptr) { diff --git a/gdb/x86-windows-nat.c b/gdb/x86-windows-nat.c index d76b89b186a..5b0f7066fba 100644 --- a/gdb/x86-windows-nat.c +++ b/gdb/x86-windows-nat.c @@ -111,6 +111,7 @@ x86_windows_nat_target::fill_thread_context (windows_thread_info *th) { if (context->ContextFlags == 0) { + th->suspend (); context->ContextFlags = WindowsContext::all; CHECK (get_thread_context (th->h, context)); } @@ -254,6 +255,7 @@ x86_windows_nat_target::store_one_register (const struct regcache *regcache, char *context_ptr = x86_windows_process.with_context (th, [] (auto *context) { + gdb_assert (context->ContextFlags != 0); return (char *) context; }); diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc index d6d7acf599d..180fabe0df9 100644 --- a/gdbserver/win32-low.cc +++ b/gdbserver/win32-low.cc @@ -432,9 +432,8 @@ static void child_fetch_inferior_registers (struct regcache *regcache, int r) { int regno; - windows_thread_info *th - = windows_process.thread_rec (current_thread->id, - INVALIDATE_CONTEXT); + windows_thread_info *th = windows_process.find_thread (current_thread->id); + win32_require_context (th); if (r == -1 || r > NUM_REGS) child_fetch_inferior_registers (regcache, NUM_REGS); else @@ -448,9 +447,8 @@ static void child_store_inferior_registers (struct regcache *regcache, int r) { int regno; - windows_thread_info *th - = windows_process.thread_rec (current_thread->id, - INVALIDATE_CONTEXT); + windows_thread_info *th = windows_process.find_thread (current_thread->id); + win32_require_context (th); if (r == -1 || r == 0 || r > NUM_REGS) child_store_inferior_registers (regcache, NUM_REGS); else -- 2.53.0