From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id UVgBKXbW62m5UzkAWB0awg (envelope-from ) for ; Fri, 24 Apr 2026 16:45:42 -0400 Received: by simark.ca (Postfix, from userid 112) id A4E981E0BA; Fri, 24 Apr 2026 16:45:42 -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 803CA1E093 for ; Fri, 24 Apr 2026 16:45:41 -0400 (EDT) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 1674D4B9208F for ; Fri, 24 Apr 2026 20:45:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1674D4B9208F Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by sourceware.org (Postfix) with ESMTPS id 1E89B4BB590A for ; Fri, 24 Apr 2026 20:45:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1E89B4BB590A 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 1E89B4BB590A Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=209.85.128.44 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1777063515; cv=none; b=vJCPRUB09glRvoStVO24n+bByAWxF7SVdc/RUPkYEchtT7mvQjHIbZb2XilVMHX2xeELau/6AjpsLiGJaVhGdGbreuiZPCA1fBxV7E5gfJVOexxR8fOX1EWXlRjZMAv+UmzUWb1fNdBfJ3eFGziZsuowbqKSBj/LJRmGqiHu65M= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1777063515; c=relaxed/simple; bh=outuuakjHaiglmOFgX4Z8PCtHelYn/cfCxEGI2lUXI8=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=AC8CsPExhHAQ8MGWa5EaFpCAu/3u5GWDPxrFVReAi067QlXG/LPZ8H9/BzWApin1zkCyENjJUZM7Aby51766M7RNtKr50igXDZ1hevupEtPhNDAZWu/WqA2Qy58nE1oPW7nHkgnhnd3wGQLy4TgRK/Bb/w0sXuykByo5IsjAE7s= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1E89B4BB590A Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-488a9033b2cso88762185e9.2 for ; Fri, 24 Apr 2026 13:45:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777063514; x=1777668314; 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=2SHZ6MRvFL1WQ4a3wkT8S91rSuIF/qQoVxmhpXYTDx0=; b=Ube8shzj+BrZlK9MrAmhSJpjfNppBh61XLTWP9L75nZ55cKhEPTVPRrMp2N2gHcDl2 dEHAEHGfFNrpWF/R8w+sS9OxJng35ZpPfGRz45yLu+TKlZTV3SA6I9iJPtfldqXImP36 q1WyGoBxWg8JOoz/sM/DOx884y/p9lcR3jC4zvOqYEn8qZi95zu3PZd/oRYU0PLF+hFT Jkjosi76iSd49PD9KGVBtWQtIHsMghWOv3ze41FjQcZlFYOUmXDGOHQB7Ak9TQgfHRnH 3ab3SbVk/b9A+FPFliw5/zOI/bjuH+aXxdSoucteO1K0QWXdmgI+R8d/B3DWtuAC9RTT SzuQ== X-Gm-Message-State: AOJu0Yx8ExcncknNIIFZgp20p0lf+i+/TkKdLIMA0tWdwmLUnjJs7PIm OIcYF9o1dx+LpOJHIpBf8r7YEWs8Fgbt012xszVmXKx5dZ7GkPMUmvK9SDOSrg6s X-Gm-Gg: AeBDiesRUvOkmkwEFX6jYHKy08QsS4OngKuqGvqQLjjl9cQ3ktsbazsjAx84rXgV/l4 B7D3hbv83JY01cvkk15phaThh+w7Nd4qKZlp6P81VkaSczA+72DTc8P3GcVhImT5Pus34B3TbDb gpKAQRNMe3iv3V+zV1uVEI/yqs6vNuqfYGZY502cZnRYntx90DiraPFlTr6aWPM9T9L9J/SXoVI a68wUUvekuEtOCDQBKeF1lMzRoDzLqJ0NccQJ83yy54krTFibBe1Y1FBArWIdRccLv1GEWlJ8GY sNFWCX7vnLdZ4nSRk866zgXkSD04UluQnIgnPQEKMwuZBwP9Fm+KGlkNGQ8rU+ekd4uHPgHcxgB xNepaS8F54E//vh0w2AdCtZohLL+u3GPla+G+ZwKKdPp3YevV2dtArHWZkZdPtkj5f9AeOOP4bM 47/Sd0JG/rTFriTBD9PtU4mj6tDhsCMRFk X-Received: by 2002:a05:600c:3513:b0:488:a977:8de with SMTP id 5b1f17b1804b1-488fb77a3a7mr485954565e9.16.1777063513562; Fri, 24 Apr 2026 13:45:13 -0700 (PDT) Received: from localhost ([2001:8a0:facb:a800:7315:8865:c664:fc06]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-48a5a579bd3sm252302875e9.6.2026.04.24.13.45.12 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 24 Apr 2026 13:45:13 -0700 (PDT) From: Pedro Alves To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [pushed 01/28] Windows gdb+gdbserver: New find_thread, replaces thread_rec(DONT_INVALIDATE_CONTEXT) Date: Fri, 24 Apr 2026 21:44:41 +0100 Message-ID: <20260424204508.1343973-2-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 The goal of the next few patches is to eliminate thread_rec completely. This is the first patch in that effort. thread_rec(DONT_INVALIDATE_CONTEXT) is really just a thread lookup with no side effects, so this adds a find_thread function that lets you do that. Approved-By: Tom Tromey Change-Id: Ie486badce00e234b10caa478b066c34537103e3f --- gdb/nat/windows-nat.c | 5 ++-- gdb/nat/windows-nat.h | 7 +++-- gdb/windows-nat.c | 68 +++++++++++++++++++++--------------------- gdb/windows-nat.h | 1 + gdb/x86-windows-nat.c | 5 ++-- gdbserver/win32-low.cc | 32 +++++++++++--------- gdbserver/win32-low.h | 1 + 7 files changed, 62 insertions(+), 57 deletions(-) diff --git a/gdb/nat/windows-nat.c b/gdb/nat/windows-nat.c index a74bab75238..cefd335f652 100644 --- a/gdb/nat/windows-nat.c +++ b/gdb/nat/windows-nat.c @@ -315,9 +315,8 @@ windows_process_info::handle_ms_vc_exception (const EXCEPTION_RECORD *rec) if (named_thread_id == (DWORD) -1) named_thread_id = current_event.dwThreadId; - named_thread = thread_rec (ptid_t (current_event.dwProcessId, - named_thread_id, 0), - DONT_INVALIDATE_CONTEXT); + named_thread = find_thread (ptid_t (current_event.dwProcessId, + named_thread_id, 0)); if (named_thread != NULL) { int thread_name_len; diff --git a/gdb/nat/windows-nat.h b/gdb/nat/windows-nat.h index f4b3669df1b..32f055a7a52 100644 --- a/gdb/nat/windows-nat.h +++ b/gdb/nat/windows-nat.h @@ -111,9 +111,6 @@ struct windows_thread_info /* Possible values to pass to 'thread_rec'. */ enum thread_disposition_type { - /* Do not invalidate the thread's context, and do not suspend the - thread. */ - DONT_INVALIDATE_CONTEXT, /* Invalidate the context, but do not suspend the thread. */ DONT_SUSPEND, /* Invalidate the context and suspend the thread. */ @@ -184,6 +181,10 @@ struct windows_process_info bool ignore_first_breakpoint = false; #endif + /* Find a thread record given a thread id. + + This function must be supplied by the embedding application. */ + virtual windows_thread_info *find_thread (ptid_t ptid) = 0; /* Find a thread record given a thread id. THREAD_DISPOSITION controls whether the thread is suspended, and whether the context diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c index 65dfc0c1800..46385ff87c5 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c @@ -264,34 +264,38 @@ windows_nat_target::wait_for_debug_event_main_thread (DEBUG_EVENT *event) /* See nat/windows-nat.h. */ windows_thread_info * -windows_per_inferior::thread_rec - (ptid_t ptid, thread_disposition_type disposition) +windows_per_inferior::find_thread (ptid_t ptid) { for (auto &th : thread_list) if (th->tid == ptid.lwp ()) - { - if (!th->suspended) - { - switch (disposition) - { - case DONT_INVALIDATE_CONTEXT: - /* Nothing. */ - break; - case INVALIDATE_CONTEXT: - if (ptid.lwp () != current_event.dwThreadId) - th->suspend (); - th->reload_context = true; - break; - case DONT_SUSPEND: - th->reload_context = true; - th->suspended = -1; - break; - } - } - return th.get (); - } + return th.get (); + return nullptr; +} + +/* See nat/windows-nat.h. */ - return NULL; +windows_thread_info * +windows_per_inferior::thread_rec (ptid_t ptid, + thread_disposition_type disposition) +{ + windows_thread_info *th = find_thread (ptid); + + if (th != nullptr && !th->suspended) + { + switch (disposition) + { + case INVALIDATE_CONTEXT: + if (ptid.lwp () != current_event.dwThreadId) + th->suspend (); + th->reload_context = true; + break; + case DONT_SUSPEND: + th->reload_context = true; + th->suspended = -1; + break; + } + } + return th; } /* Add a thread to the thread list. @@ -310,7 +314,7 @@ windows_nat_target::add_thread (ptid_t ptid, HANDLE h, void *tlb, gdb_assert (ptid.lwp () != 0); - if ((th = windows_process->thread_rec (ptid, DONT_INVALIDATE_CONTEXT))) + if ((th = windows_process->find_thread (ptid))) return th; CORE_ADDR base = (CORE_ADDR) (uintptr_t) tlb; @@ -434,8 +438,7 @@ windows_nat_target::store_registers (struct regcache *regcache, int r) bool windows_nat_target::stopped_by_sw_breakpoint () { - windows_thread_info *th - = windows_process->thread_rec (inferior_ptid, DONT_INVALIDATE_CONTEXT); + windows_thread_info *th = windows_process->find_thread (inferior_ptid); return th->stopped_at_software_breakpoint; } @@ -843,7 +846,7 @@ windows_nat_target::resume (ptid_t ptid, int step, enum gdb_signal sig) ptid.pid (), (unsigned) ptid.lwp (), step, sig); /* Get context for currently selected thread. */ - th = windows_process->thread_rec (inferior_ptid, DONT_INVALIDATE_CONTEXT); + th = windows_process->find_thread (inferior_ptid); if (th != nullptr && step) { /* Single step by setting t bit. */ @@ -2510,7 +2513,7 @@ windows_nat_target::get_tib_address (ptid_t ptid, CORE_ADDR *addr) { windows_thread_info *th; - th = windows_process->thread_rec (ptid, DONT_INVALIDATE_CONTEXT); + th = windows_process->find_thread (ptid); if (th == NULL) return false; @@ -2531,9 +2534,7 @@ windows_nat_target::get_ada_task_ptid (long lwp, ULONGEST thread) const char * windows_nat_target::thread_name (struct thread_info *thr) { - windows_thread_info *th - = windows_process->thread_rec (thr->ptid, - DONT_INVALIDATE_CONTEXT); + windows_thread_info *th = windows_process->find_thread (thr->ptid); return th->thread_name (); } @@ -2634,8 +2635,7 @@ windows_nat_target::thread_alive (ptid_t ptid) { gdb_assert (ptid.lwp () != 0); - windows_thread_info *th - = windows_process->thread_rec (ptid, DONT_INVALIDATE_CONTEXT); + windows_thread_info *th = windows_process->find_thread (ptid); return WaitForSingleObject (th->h, 0) != WAIT_OBJECT_0; } diff --git a/gdb/windows-nat.h b/gdb/windows-nat.h index 4368a29b2bb..10c144bf4c6 100644 --- a/gdb/windows-nat.h +++ b/gdb/windows-nat.h @@ -47,6 +47,7 @@ struct windows_solib struct windows_per_inferior : public windows_nat::windows_process_info { + windows_thread_info *find_thread (ptid_t ptid) override; windows_thread_info *thread_rec (ptid_t ptid, thread_disposition_type disposition) override; int handle_output_debug_string (struct target_waitstatus *ourstatus) override; diff --git a/gdb/x86-windows-nat.c b/gdb/x86-windows-nat.c index c7be192a894..5a82a2e0e36 100644 --- a/gdb/x86-windows-nat.c +++ b/gdb/x86-windows-nat.c @@ -307,8 +307,7 @@ cygwin_set_dr7 (unsigned long val) static CORE_ADDR cygwin_get_dr (int i) { - windows_thread_info *th - = windows_process->thread_rec (inferior_ptid, DONT_INVALIDATE_CONTEXT); + windows_thread_info *th = windows_process->find_thread (inferior_ptid); return windows_process->with_context (th, [&] (auto *context) -> CORE_ADDR { @@ -443,7 +442,7 @@ display_selectors (const char * args, int from_tty) } windows_thread_info *current_windows_thread - = windows_process->thread_rec (inferior_ptid, DONT_INVALIDATE_CONTEXT); + = windows_process->find_thread (inferior_ptid); if (!args) { diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc index adb4c08b980..d2b76b5d6c9 100644 --- a/gdbserver/win32-low.cc +++ b/gdbserver/win32-low.cc @@ -118,6 +118,17 @@ win32_require_context (windows_thread_info *th) /* See nat/windows-nat.h. */ +windows_thread_info * +gdbserver_windows_process::find_thread (ptid_t ptid) +{ + thread_info *thread = find_thread_ptid (ptid); + if (thread == nullptr) + return nullptr; + return static_cast (thread->target_data ()); +} + +/* See nat/windows-nat.h. */ + windows_thread_info * gdbserver_windows_process::thread_rec (ptid_t ptid, thread_disposition_type disposition) @@ -127,8 +138,7 @@ gdbserver_windows_process::thread_rec return NULL; auto th = static_cast (thread->target_data ()); - if (disposition != DONT_INVALIDATE_CONTEXT) - win32_require_context (th); + win32_require_context (th); return th; } @@ -139,7 +149,7 @@ child_add_thread (DWORD pid, DWORD tid, HANDLE h, void *tlb) windows_thread_info *th; ptid_t ptid = ptid_t (pid, tid, 0); - if ((th = windows_process.thread_rec (ptid, DONT_INVALIDATE_CONTEXT))) + if ((th = windows_process.find_thread (ptid))) return th; CORE_ADDR base = (CORE_ADDR) (uintptr_t) tlb; @@ -787,7 +797,7 @@ win32_process_target::resume (thread_resume *resume_info, size_t n) /* Get context for the currently selected thread. */ ptid = debug_event_ptid (&windows_process.current_event); - th = windows_process.thread_rec (ptid, DONT_INVALIDATE_CONTEXT); + th = windows_process.find_thread (ptid); if (th) { win32_prepare_to_resume (th); @@ -940,8 +950,7 @@ maybe_adjust_pc () child_fetch_inferior_registers (regcache, -1); windows_thread_info *th - = windows_process.thread_rec (current_thread->id, - DONT_INVALIDATE_CONTEXT); + = windows_process.find_thread (current_thread->id); th->stopped_at_software_breakpoint = false; if (windows_process.current_event.dwDebugEventCode == EXCEPTION_DEBUG_EVENT @@ -1339,8 +1348,7 @@ win32_process_target::supports_get_tib_address () int win32_process_target::get_tib_address (ptid_t ptid, CORE_ADDR *addr) { - windows_thread_info *th; - th = windows_process.thread_rec (ptid, DONT_INVALIDATE_CONTEXT); + windows_thread_info *th = windows_process.find_thread (ptid); if (th == NULL) return 0; if (addr != NULL) @@ -1360,9 +1368,7 @@ win32_process_target::sw_breakpoint_from_kind (int kind, int *size) bool win32_process_target::stopped_by_sw_breakpoint () { - windows_thread_info *th - = windows_process.thread_rec (current_thread->id, - DONT_INVALIDATE_CONTEXT); + windows_thread_info *th = windows_process.find_thread (current_thread->id); return th == nullptr ? false : th->stopped_at_software_breakpoint; } @@ -1387,9 +1393,7 @@ win32_process_target::write_pc (struct regcache *regcache, CORE_ADDR pc) const char * win32_process_target::thread_name (ptid_t thread) { - windows_thread_info *th - = windows_process.thread_rec (current_thread->id, - DONT_INVALIDATE_CONTEXT); + windows_thread_info *th = windows_process.find_thread (current_thread->id); return th->thread_name (); } diff --git a/gdbserver/win32-low.h b/gdbserver/win32-low.h index 0259105ba11..edd7c757f09 100644 --- a/gdbserver/win32-low.h +++ b/gdbserver/win32-low.h @@ -178,6 +178,7 @@ class win32_process_target : public process_stratum_target struct gdbserver_windows_process : public windows_nat::windows_process_info { + windows_nat::windows_thread_info *find_thread (ptid_t ptid) override; windows_nat::windows_thread_info *thread_rec (ptid_t ptid, windows_nat::thread_disposition_type disposition) override; -- 2.53.0