From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id RGG1FNgxK2i1NioAWB0awg (envelope-from ) for ; Mon, 19 May 2025 09:27:52 -0400 Received: by simark.ca (Postfix, from userid 112) id 3D75E1E11C; Mon, 19 May 2025 09:27:52 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-9.0 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE 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 F17B01E11B for ; Mon, 19 May 2025 09:27:50 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 94CC63858405 for ; Mon, 19 May 2025 13:27:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 94CC63858405 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by sourceware.org (Postfix) with ESMTPS id 883C73858435 for ; Mon, 19 May 2025 13:23:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 883C73858435 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 883C73858435 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=209.85.128.48 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1747661026; cv=none; b=tF+Ou+X/3OQsnE6neuOu8F30uL6SVyUf3Zeambz6a98BCLoR5POnACS8B3T7CukytSEqW9lrxAu8xwsXeLkA7AWRADHOEVVlIXSVTr/vXQZzcdiUTtUmNBQZ339FwP1wIodLdb8P4X18ZWcm6GxuW9Q/qyNmiqXDPbeUl4uZQpw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1747661026; c=relaxed/simple; bh=79onZi3vlyNQnVrpA1Pyn7oq2ays5jz2hpiLIih2MFE=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=fyMaQab3ueo6pFCOdDIO08i1iDjnFATxn1JrFn+ygQKIa8hO99LktYCPHZVrMU4fKSN44NL46H5rnXKjh1fps/nyA7CavCsWtyiiyik51hsdzfImF7sYfoKrE0mH3sihG8Ou8Y/3uyjT4vWXXDs+Yv4v9dCKtfRtR+AKxK/AcRY= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 883C73858435 Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-441d437cfaaso26007185e9.1 for ; Mon, 19 May 2025 06:23:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747661025; x=1748265825; 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=gkKLs9FwIiyY6LQ7Byy+EUz8N+uB4XHbWyeRiv1wLho=; b=Vf6u3nAALPk3FK2GIAhOOYPXKbZupiF/cU48+tRvOfFIal+HrZr67fempNf91QU124 sanXRDEOmA0ATZ+myaCItudijEeyIkBBK7xdmwejY9louADZBkIOuKcQIsEJgdvdk5ss 8Isua1MJz8JriWxVCYrxhdmcNSLwNnFiNOEMur03DOSSTFxPLIrKU7i9IbXlPVMcEDi9 C1/kQpBF9ECMxBCngmaPlaEw6+TfLI8/mKQzEsAhEXw4bcm3TEf21fa+iGuO0B9bgWAm aphJV3t01VKSLADM+cFIWqODQhBY6UrZVITA6ehIX5nisRFl+06C0kLkxoORdwcKCSdK RgzQ== X-Gm-Message-State: AOJu0YyTxTESXJrCx0ePP4CiYziMaSkRhr+ANujeDebairA3AjwCa2G5 qs8NFCsd82VGegmCdzpZUoq5M6uUe87tK3RpzQUPEONe613G34Mgwk/3XRixiGfn X-Gm-Gg: ASbGncvEIR4rgy1ujJZtxuJFAlsJ0Hfr2lyq3UEdF0DshqYKAGsbtZbQXF9RNsOex29 1+pi+cpY5GiuSOm6BZnzvi6356Fpf/4Ev7Ma2LmC+Kpau9Mlmm8vsQHPeOdbzrCMt0SYSGbft86 wNEdrAC2GKTMamRqxd1UpuR6bBh6ULD0JY/cBtrn7HXXrX51FRBBCUAfnF1cDUP1nzuvR6BuKeo QBkuwq6Xm4xW8wWFFKiCeJxrdzy5Vt2BAIuAyzW+ogs7qCBVHxsVig2KTjSsSxWB4d5qWniMhRC g4BkhMFuf316WnYk02+44xUSySiysH5WKuAw19WfEVIYY3ydps0= X-Google-Smtp-Source: AGHT+IH96EXDDqyrG1qaVvhXUibh9ZQjZ0IvMJd1M5MCHlNWfKKae3pSaQqzpqMRHetDZnRtGiF0BQ== X-Received: by 2002:a05:600c:3c87:b0:442:d9f2:c6ef with SMTP id 5b1f17b1804b1-442fefd5f98mr124383285e9.2.1747661025074; Mon, 19 May 2025 06:23:45 -0700 (PDT) Received: from localhost ([2001:8a0:4fe9:b400:8d90:6f0d:36bf:32df]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-442fd515bb5sm136825355e9.23.2025.05.19.06.23.44 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 19 May 2025 06:23:44 -0700 (PDT) From: Pedro Alves To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH v2 11/47] Windows gdb+gdbserver: Eliminate thread_rec(INVALIDATE_CONTEXT) calls Date: Mon, 19 May 2025 14:22:32 +0100 Message-ID: <20250519132308.3553663-12-pedro@palves.net> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250519132308.3553663-1-pedro@palves.net> References: <20250519132308.3553663-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/nat/windows-nat.h | 2 -- gdb/windows-nat.c | 23 +++++++++-------------- gdbserver/win32-low.cc | 10 ++++------ 3 files changed, 13 insertions(+), 22 deletions(-) diff --git a/gdb/nat/windows-nat.h b/gdb/nat/windows-nat.h index 71560930e84..f7f2f3e62a7 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 4a10cf962a9..be62d2a6cad 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c @@ -541,11 +541,6 @@ windows_per_inferior::thread_rec (ptid_t ptid, { switch (disposition) { - case INVALIDATE_CONTEXT: - if (ptid.lwp () != current_event.dwThreadId) - th->suspend (); - invalidate_context (th); - break; case DONT_SUSPEND: th->suspended = -1; invalidate_context (th); @@ -717,8 +712,7 @@ windows_fetch_one_register (struct regcache *regcache, 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. */ @@ -729,6 +723,7 @@ windows_nat_target::fetch_registers (struct regcache *regcache, int r) { if (context->ContextFlags == 0) { + th->suspend (); context->ContextFlags = WindowsContext::all; CHECK (get_thread_context (th->h, context)); } @@ -755,6 +750,7 @@ windows_store_one_register (const struct regcache *regcache, char *context_ptr = windows_process.with_context (th, [] (auto *context) { + gdb_assert (context->ContextFlags != 0); return (char *) context; }); @@ -789,8 +785,7 @@ windows_store_one_register (const struct regcache *regcache, 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. */ @@ -1452,7 +1447,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_context (th); return ptid; } @@ -1673,8 +1670,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; } @@ -1712,8 +1708,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/gdbserver/win32-low.cc b/gdbserver/win32-low.cc index 2bf42f42350..42026971037 100644 --- a/gdbserver/win32-low.cc +++ b/gdbserver/win32-low.cc @@ -443,9 +443,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 @@ -459,9 +458,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.49.0