From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id AXjBGwvX62kyVDkAWB0awg (envelope-from ) for ; Fri, 24 Apr 2026 16:48:11 -0400 Received: by simark.ca (Postfix, from userid 112) id 6EEF71E093; Fri, 24 Apr 2026 16:48:11 -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 751841E093 for ; Fri, 24 Apr 2026 16:48:10 -0400 (EDT) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 207384BB590A for ; Fri, 24 Apr 2026 20:48:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 207384BB590A Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by sourceware.org (Postfix) with ESMTPS id 2CECA4B920E3 for ; Fri, 24 Apr 2026 20:46:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2CECA4B920E3 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 2CECA4B920E3 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=209.85.221.51 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1777063575; cv=none; b=UsY27f9/uNnfG9GApW96biLF1J5ds/jlraREPhzIHTevUaJ6j8OalHaZEo2hleIru3OdI2N3ZdqR0ww8cDo0zP7m6dRh/0Tw34SKc03fIRDQ93c7BSF3XiGktePS2vQ/AAtcHAw087bpf33UWiyQWBt0IBe8FBP/oVcr9mDQowg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1777063575; c=relaxed/simple; bh=XuhA2hBX6rTXm6Uu0SlHCQS0rULwruDOd7hQMZMzcVI=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=Vkvye7LCbDLxPsa8uWfa1jg5gctJz/JyhYnhcUJf6GIcCTifXX2B1rAPwFvZ9XZzQrfJ7a4y9IsPuWZTwLfmxL2HQJ8EbHotUaOa0vTbWjZS9bQh0JAyR+lSq3Zhg56/zLRC4SdGjq7WyNo1QtL5pQmvdRr3+x6tBXEflAVeOsU= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2CECA4B920E3 Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-4411e1eba51so4749313f8f.3 for ; Fri, 24 Apr 2026 13:46:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777063574; x=1777668374; 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=pWADz0di3KjSxNp35r2It02J0RglMBU2RiI7XiJqVO4=; b=dvcAt6//urxkEgrO5741uoM9C5pedGNludAcHt6bSSn4g959g0Jwv1VWPVwyGu5/0M Oeb8YLSduZI0rfPrD+Fs4QWpcb6FSP9ioPTjRkFl0RwLIVPeGi055/94AmhA71AKmBoA hOF8yqj/Om6v4WJg/W+ARrBOgBo5VdF+Q/Xf0utNQD4PVUo8Vrd1HrJYu9IW3DctC8oC 2Dysf+Pa/mtxYT03DMe+wAJV+kxGGgd2QVl7N10aM0K1WkQimrDV7oIL/DA2MbtDJZyI vkwLITS84BnRXRQM9LfRahEOnEkCebjIhdKS1Xa2rO0+3HNgVpVPsi0FAByFRfMp0+m4 VbWQ== X-Gm-Message-State: AOJu0YyLO0imWqU9q9DJgvVLDWuT/OnQFnjDr2eV5zruM9nrYNdMeZvG G2wfJL+V5OYiD6uKKlLBjjmlaR/8qdSI0m31MbgBd+1b/ZW9nk12Ga2tKGzF276v X-Gm-Gg: AeBDiesp4T+v0myBaTfCCbSajEZTdGRsOp/5ljjdWVjbWYhOZQIeZBM6Cg4E7zR2tvh YiiPIVbBQJxWQKrs/CucADOopC8L1FgwQUVROZS9O4i9dz5s0Bz0CGBOgiiWLhYMm0KUHU7GV3Z MYGfGtWpcFEjrpB6R/oPnDl2KJQ1Q48fjK5348a8z06D/1NtjkM9vhhyZwxfFot3XSQDm9b/sdM LWofnZxtIERRa+Ca2onWntDhaWLo0SNFR4KRVabLHGsF+6YCpxpHOMgt4baTsJnTfbb1YHx4hbi SSPpcHPJverYwVeeRhAyaexb5cs09aasWp0/VQGCd1FoOrdDUnIRist7b2QohWz4u+mPAT0Tvi3 LnLtFkNQAlSFx4t44HwGX+umOidMfMUbtOpl4tUtOYTywYv/Zs4nFLn73h/eVHYy5dzBaPcNzDK yaQN2lg6HxoLitJYe0XlDa298Cck2vfuXU X-Received: by 2002:a05:6000:2387:b0:43f:df1b:9e07 with SMTP id ffacd0b85a97d-43fe3e23488mr50878054f8f.42.1777063573601; Fri, 24 Apr 2026 13:46:13 -0700 (PDT) Received: from localhost ([2001:8a0:facb:a800:7315:8865:c664:fc06]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-43fe4e4ffa8sm64064398f8f.35.2026.04.24.13.46.13 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 24 Apr 2026 13:46:13 -0700 (PDT) From: Pedro Alves To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [pushed 20/28] Windows gdb+gdbserver: Make last_sig per-thread state Date: Fri, 24 Apr 2026 21:45:00 +0100 Message-ID: <20260424204508.1343973-21-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 With non-stop mode, each thread is controlled independently of the others, and each thread has its own independent reason for its last stop. Thus, any thread-specific state that is currently per-process must be converted to per-thread state. This patch converts windows_process_info::last_sig to per-thread state, moving it to windows_thread_info instead. This adjusts both native gdb and gdbserver. Approved-By: Tom Tromey Change-Id: Ie8c673a819be445753d967afd3a6084565648448 commit-id:d7dd0d0e --- gdb/nat/windows-nat.c | 8 +++++--- gdb/nat/windows-nat.h | 5 ++++- gdb/windows-nat.c | 10 +++------- gdbserver/win32-low.cc | 7 +++---- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/gdb/nat/windows-nat.c b/gdb/nat/windows-nat.c index 4adca4afa64..7eff99170fc 100644 --- a/gdb/nat/windows-nat.c +++ b/gdb/nat/windows-nat.c @@ -359,8 +359,6 @@ windows_process_info::handle_exception (DEBUG_EVENT ¤t_event, memcpy (&siginfo_er, rec, sizeof siginfo_er); - last_sig = GDB_SIGNAL_0; - switch (code) { case EXCEPTION_ACCESS_VIOLATION: @@ -494,7 +492,11 @@ windows_process_info::handle_exception (DEBUG_EVENT ¤t_event, } if (ourstatus->kind () == TARGET_WAITKIND_STOPPED) - last_sig = ourstatus->sig (); + { + ptid_t ptid (current_event.dwProcessId, current_event.dwThreadId, 0); + windows_thread_info *th = find_thread (ptid); + th->last_sig = ourstatus->sig (); + } return result; diff --git a/gdb/nat/windows-nat.h b/gdb/nat/windows-nat.h index 4710ec39130..8555085c9f7 100644 --- a/gdb/nat/windows-nat.h +++ b/gdb/nat/windows-nat.h @@ -104,6 +104,10 @@ struct windows_thread_info thread. */ DEBUG_EVENT last_event {}; + /* The last signal reported for this thread, extracted out of + last_event. */ + enum gdb_signal last_sig = GDB_SIGNAL_0; + /* The context of the thread, including any manipulations. */ union { @@ -147,7 +151,6 @@ struct windows_process_info HANDLE handle = 0; DWORD process_id = 0; DWORD main_thread_id = 0; - enum gdb_signal last_sig = GDB_SIGNAL_0; /* Contents of $_siginfo */ EXCEPTION_RECORD siginfo_er {}; diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c index 64c53b53934..b5e80139c26 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c @@ -712,6 +712,7 @@ windows_nat_target::continue_one_thread (windows_thread_info *th, bool killed = (cont_flags & WCONT_KILLED) != 0; thread_context_continue (th, killed); th->resume (); + th->last_sig = GDB_SIGNAL_0; } /* Resume thread specified by ID, or all artificially suspended @@ -812,7 +813,7 @@ windows_nat_target::resume (ptid_t ptid, int step, enum gdb_signal sig) DEBUG_EXCEPT ("Cannot continue with signal %d here. " "Not stopped for EXCEPTION_DEBUG_EVENT", sig); } - else if (sig == windows_process->last_sig) + else if (sig == th->last_sig) continue_status = DBG_EXCEPTION_NOT_HANDLED; else #if 0 @@ -836,11 +837,9 @@ windows_nat_target::resume (ptid_t ptid, int step, enum gdb_signal sig) } #endif DEBUG_EXCEPT ("Can only continue with received signal %d.", - windows_process->last_sig); + th->last_sig); } - windows_process->last_sig = GDB_SIGNAL_0; - /* Get context for currently selected thread. */ if (step) { @@ -944,8 +943,6 @@ windows_nat_target::get_windows_debug_event } } - windows_process->last_sig = GDB_SIGNAL_0; - if ((options & TARGET_WNOHANG) != 0 && !m_debug_event_pending) { ourstatus->set_ignore (); @@ -1263,7 +1260,6 @@ windows_nat_target::do_initial_windows_stuff (DWORD pid, bool attaching) initialize_windows_arch (attaching); - windows_process->last_sig = GDB_SIGNAL_0; windows_process->open_process_used = 0; #ifdef __CYGWIN__ windows_process->cygwin_load_start = 0; diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc index aa484fcda4a..5e09779082c 100644 --- a/gdbserver/win32-low.cc +++ b/gdbserver/win32-low.cc @@ -284,7 +284,6 @@ do_initial_child_stuff (HANDLE proch, DWORD pid, int attached) { struct process_info *proc; - windows_process.last_sig = GDB_SIGNAL_0; windows_process.handle = proch; windows_process.process_id = pid; windows_process.main_thread_id = 0; @@ -385,6 +384,7 @@ continue_one_thread (thread_info *thread, int thread_id) } th->resume (); + th->last_sig = GDB_SIGNAL_0; } } } @@ -747,11 +747,11 @@ resume_one_thread (thread_info *thread, bool step, gdb_signal sig, "Not stopped for EXCEPTION_DEBUG_EVENT.\n", gdb_signal_to_string (sig))); } - else if (sig == windows_process.last_sig) + else if (sig == th->last_sig) *continue_status = DBG_EXCEPTION_NOT_HANDLED; else OUTMSG (("Can only continue with received signal %s.\n", - gdb_signal_to_string (windows_process.last_sig))); + gdb_signal_to_string (th->last_sig))); } win32_prepare_to_resume (th); @@ -944,7 +944,6 @@ get_child_debug_event (DWORD *continue_status, { ptid_t ptid; - windows_process.last_sig = GDB_SIGNAL_0; ourstatus->set_spurious (); *continue_status = DBG_CONTINUE; -- 2.53.0