From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id 6fw2ORdn8mmGNgQAWB0awg (envelope-from ) for ; Wed, 29 Apr 2026 16:16:23 -0400 Received: by simark.ca (Postfix, from userid 112) id E583F1E0BA; Wed, 29 Apr 2026 16:16:23 -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_MSPIKE_H2, 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 3C9091E093 for ; Wed, 29 Apr 2026 16:16:23 -0400 (EDT) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id D4E214BBCDAA for ; Wed, 29 Apr 2026 20:16:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D4E214BBCDAA Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by sourceware.org (Postfix) with ESMTPS id 7AD364BBCDB1 for ; Wed, 29 Apr 2026 20:15:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7AD364BBCDB1 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 7AD364BBCDB1 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=1777493725; cv=none; b=IOKZh2v3iCg3mdZZOr6m69NF+JHC2oH6haNfQn8jdRwSrDtq4qgkUecTnMUtCSpapwoEnK5isvI0MYpVau7Y9PrHB0buYj147IGmGXoTMoPwAg2bAPBqFQjs4DSzLLiVCairJAv+p+qoXhPWmzQMm63NcMMQcsvyWc44Gf+nKw4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1777493725; c=relaxed/simple; bh=QgBK+bh1Eu6mdqOU1tGoWDT13nTClxJOCJe5p0ssjHc=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=DPv7ASJwwXeuQgfipiN7kQJa+KmEuvPyxvsAWDOxvB6ezouuEqheItwxZwtc0sPgIJCYZ1ZCFhgl02w/dCj6BuG+mLMai9dS7VSwNWeZ0B+5M//J9aDkwupZ+7Kip6emEcP42iWVrGTda2MEX0o0/tZ2cp4trG3j0upqY9fh64k= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7AD364BBCDB1 Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-488b0e1b870so2673785e9.2 for ; Wed, 29 Apr 2026 13:15:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777493724; x=1778098524; 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=V2njALFJkcA4O4bnSwqRxNQcQxJS+N+LqEqX4oXl8AU=; b=pjCekt257dd+ON6+/mr13O5rLhXXie0DNZbxUFUTCxHFH81R6FIuzWYClMcnsxNKfX dgIjobNRS6HQ6uigEQ8ZXj2h8XOGAc6mdB47o10pd4bYWYY/CYC2+OBIhjFXlDrG/XBZ m09A92Bafel03q4wN3wBKhXshQ3H1O0UGpLPhtcqiJrD/VkjxceO5fKNJN13UQncKvBt xo4lc823M+0lLGTLVLKwtplYzK8n6erABAKdNmQLb/ggksBoDFcMb5dEFTNegMtbXXzi w/EE0gkDU2j717i3WIn09hWYmRCAwNdePgBd+FPdbW+7joLpqwVtmvzCn40lK1RWC+P1 s64Q== X-Gm-Message-State: AOJu0YwCRhAARebIuUBjOco19KWM16xUCYXroUQtCKj3QLiea/yyoGCZ h5/9D2pL0uIEXIBjzMNOwb8JMxEbUl+S60eXDThnyEbLIOtnFTApTVPokixLuw== X-Gm-Gg: AeBDieu2ujVcxjLIJQ9Qi7FFDTLx9uKcisQlKnkfPKAjlwoRNfWHoXn9u+vb2f8QWrM 2PhPab/NsKa4c82s2/jm+Fw0/4DcSEul7lfWBlHj1tMpzvJJL9r5z7GKEdd2Om2WDymWzQY+Rpu 83+A5oSL22DhTT0y6ROyXJw4rjp0QSETFZmEjWDkQBIOzp/PsquXVVbfATw79Vibe5a/89JFztf h6qVoKVZ+ex9Yvk2Soj4fLooE48qDWLy8fxqPD2/f0lN3SGLRvPYhWoRSA3IRG70XFI6T2k8Jxj BYqN+h1Q7PXtufLwTriUk23oJM8laRi3uKG8c5CXRi9W0xgj/oHIEfKMP+F4OxazK+zQ1lRvogl D73wRN3PbImTpJnljBqUYIlucVyqH8rxSU3DAZQXjm/TPdHZD6QXDmaNYtI+WC7CC6+D1n1oqdM AzdgSpB5oG9ktn6p/VbL/ROsPjXiSTMqw= X-Received: by 2002:a05:600c:3e8d:b0:48a:53ea:140b with SMTP id 5b1f17b1804b1-48a844a4728mr722415e9.28.1777493723953; Wed, 29 Apr 2026 13:15:23 -0700 (PDT) Received: from localhost ([2001:8a0:facb:a800:f22f:591f:e700:e91]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-48a822be902sm15521745e9.6.2026.04.29.13.15.23 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 29 Apr 2026 13:15:23 -0700 (PDT) From: Pedro Alves To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH v3 04/11] Introduce windows_nat::event_code_to_string Date: Wed, 29 Apr 2026 21:15:00 +0100 Message-ID: <20260429201507.480870-5-pedro@palves.net> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260429201507.480870-1-pedro@palves.net> References: <20260429201507.480870-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 Instead of: switch (event_code) { case FOO_DEBUG_EVENT: DEBUG_EVENTS (..., "FOO_DEBUG_EVENT"); ... case BAR_DEBUG_EVENT: DEBUG_EVENTS (..., "BAR_DEBUG_EVENT"); ... ... with one DEBUG_EVENTS call per event type, log the event just once before the switch, and introduce a new event_code_to_string function to handle the event code to string conversion. Do the same on GDB's and gdbserver's Windows backends. Approved-By: Tom Tromey Change-Id: Id38b7e30df182e4742f3179538de3c643cf42668 commit-id:a8abf6a6 --- gdb/nat/windows-nat.c | 25 +++++++++++++++++++++++ gdb/nat/windows-nat.h | 4 ++++ gdb/windows-nat.c | 37 +++++----------------------------- gdbserver/win32-low.cc | 45 +++++------------------------------------- 4 files changed, 39 insertions(+), 72 deletions(-) diff --git a/gdb/nat/windows-nat.c b/gdb/nat/windows-nat.c index cf30a66a0c1..72576222b8d 100644 --- a/gdb/nat/windows-nat.c +++ b/gdb/nat/windows-nat.c @@ -694,6 +694,31 @@ windows_process_info::add_all_dlls () /* See nat/windows-nat.h. */ +std::string +event_code_to_string (DWORD event_code) +{ +#define CASE(X) \ + case X: return #X + + switch (event_code) + { + CASE (CREATE_THREAD_DEBUG_EVENT); + CASE (EXIT_THREAD_DEBUG_EVENT); + CASE (CREATE_PROCESS_DEBUG_EVENT); + CASE (EXIT_PROCESS_DEBUG_EVENT); + CASE (LOAD_DLL_DEBUG_EVENT); + CASE (UNLOAD_DLL_DEBUG_EVENT); + CASE (EXCEPTION_DEBUG_EVENT); + CASE (OUTPUT_DEBUG_STRING_EVENT); + default: + return string_printf ("unknown event code %u", (unsigned) event_code); + } + +#undef CASE +} + +/* See nat/windows-nat.h. */ + ptid_t get_last_debug_event_ptid () { diff --git a/gdb/nat/windows-nat.h b/gdb/nat/windows-nat.h index 0a503232718..364a01c5724 100644 --- a/gdb/nat/windows-nat.h +++ b/gdb/nat/windows-nat.h @@ -285,6 +285,10 @@ struct windows_process_info int get_exec_module_filename (char *exe_name_ret, size_t exe_name_max_len); }; +/* Return a string version of EVENT_CODE. */ + +extern std::string event_code_to_string (DWORD event_code); + /* A simple wrapper for ContinueDebugEvent that continues the last waited-for event. If DEBUG_EVENTS is true, logging will be enabled. */ diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c index 4029e7dad00..67e4d35f96f 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c @@ -927,13 +927,14 @@ windows_nat_target::get_windows_debug_event event_code = current_event->dwDebugEventCode; ourstatus->set_spurious (); + DEBUG_EVENTS ("kernel event for pid=%u tid=0x%x code=%s", + (unsigned) current_event->dwProcessId, + (unsigned) current_event->dwThreadId, + event_code_to_string (event_code).c_str ()); + switch (event_code) { case CREATE_THREAD_DEBUG_EVENT: - DEBUG_EVENTS ("kernel event for pid=%u tid=0x%x code=%s", - (unsigned) current_event->dwProcessId, - (unsigned) current_event->dwThreadId, - "CREATE_THREAD_DEBUG_EVENT"); if (windows_process->saw_create != 1) { inferior *inf = find_inferior_pid (this, current_event->dwProcessId); @@ -965,10 +966,6 @@ windows_nat_target::get_windows_debug_event break; case EXIT_THREAD_DEBUG_EVENT: - DEBUG_EVENTS ("kernel event for pid=%u tid=0x%x code=%s", - (unsigned) current_event->dwProcessId, - (unsigned) current_event->dwThreadId, - "EXIT_THREAD_DEBUG_EVENT"); delete_thread (ptid_t (current_event->dwProcessId, current_event->dwThreadId, 0), current_event->u.ExitThread.dwExitCode, @@ -977,10 +974,6 @@ windows_nat_target::get_windows_debug_event break; case CREATE_PROCESS_DEBUG_EVENT: - DEBUG_EVENTS ("kernel event for pid=%u tid=0x%x code=%s", - (unsigned) current_event->dwProcessId, - (unsigned) current_event->dwThreadId, - "CREATE_PROCESS_DEBUG_EVENT"); CloseHandle (current_event->u.CreateProcessInfo.hFile); if (++windows_process->saw_create != 1) break; @@ -997,10 +990,6 @@ windows_nat_target::get_windows_debug_event break; case EXIT_PROCESS_DEBUG_EVENT: - DEBUG_EVENTS ("kernel event for pid=%u tid=0x%x code=%s", - (unsigned) current_event->dwProcessId, - (unsigned) current_event->dwThreadId, - "EXIT_PROCESS_DEBUG_EVENT"); if (!windows_process->windows_initialization_done) { target_terminal::ours (); @@ -1029,10 +1018,6 @@ windows_nat_target::get_windows_debug_event break; case LOAD_DLL_DEBUG_EVENT: - DEBUG_EVENTS ("kernel event for pid=%u tid=0x%x code=%s", - (unsigned) current_event->dwProcessId, - (unsigned) current_event->dwThreadId, - "LOAD_DLL_DEBUG_EVENT"); CloseHandle (current_event->u.LoadDll.hFile); if (windows_process->saw_create != 1 || ! windows_process->windows_initialization_done) @@ -1050,10 +1035,6 @@ windows_nat_target::get_windows_debug_event break; case UNLOAD_DLL_DEBUG_EVENT: - DEBUG_EVENTS ("kernel event for pid=%u tid=0x%x code=%s", - (unsigned) current_event->dwProcessId, - (unsigned) current_event->dwThreadId, - "UNLOAD_DLL_DEBUG_EVENT"); if (windows_process->saw_create != 1 || ! windows_process->windows_initialization_done) break; @@ -1070,10 +1051,6 @@ windows_nat_target::get_windows_debug_event break; case EXCEPTION_DEBUG_EVENT: - DEBUG_EVENTS ("kernel event for pid=%u tid=0x%x code=%s", - (unsigned) current_event->dwProcessId, - (unsigned) current_event->dwThreadId, - "EXCEPTION_DEBUG_EVENT"); if (windows_process->saw_create != 1) break; switch (windows_process->handle_exception (*current_event, @@ -1093,10 +1070,6 @@ windows_nat_target::get_windows_debug_event break; case OUTPUT_DEBUG_STRING_EVENT: /* Message from the kernel. */ - DEBUG_EVENTS ("kernel event for pid=%u tid=0x%x code=%s", - (unsigned) current_event->dwProcessId, - (unsigned) current_event->dwThreadId, - "OUTPUT_DEBUG_STRING_EVENT"); if (windows_process->saw_create != 1) break; thread_id = windows_process->handle_output_debug_string (*current_event, diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc index 826d21867ae..8d24826d05c 100644 --- a/gdbserver/win32-low.cc +++ b/gdbserver/win32-low.cc @@ -997,13 +997,14 @@ get_child_debug_event (DWORD *continue_status, } } + OUTMSG2 (("gdbserver: kernel event %s for pid=%u tid=%x)\n", + event_code_to_string (current_event->dwDebugEventCode).c_str (), + (unsigned) current_event->dwProcessId, + (unsigned) current_event->dwThreadId)); + switch (current_event->dwDebugEventCode) { case CREATE_THREAD_DEBUG_EVENT: - OUTMSG2 (("gdbserver: kernel event CREATE_THREAD_DEBUG_EVENT " - "for pid=%u tid=%x)\n", - (unsigned) current_event->dwProcessId, - (unsigned) current_event->dwThreadId)); /* Record the existence of this thread. */ child_add_thread (current_event->dwProcessId, @@ -1013,10 +1014,6 @@ get_child_debug_event (DWORD *continue_status, break; case EXIT_THREAD_DEBUG_EVENT: - OUTMSG2 (("gdbserver: kernel event EXIT_THREAD_DEBUG_EVENT " - "for pid=%u tid=%x\n", - (unsigned) current_event->dwProcessId, - (unsigned) current_event->dwThreadId)); child_delete_thread (current_event->dwProcessId, current_event->dwThreadId); @@ -1024,10 +1021,6 @@ get_child_debug_event (DWORD *continue_status, return 1; case CREATE_PROCESS_DEBUG_EVENT: - OUTMSG2 (("gdbserver: kernel event CREATE_PROCESS_DEBUG_EVENT " - "for pid=%u tid=%x\n", - (unsigned) current_event->dwProcessId, - (unsigned) current_event->dwThreadId)); CloseHandle (current_event->u.CreateProcessInfo.hFile); if (windows_process.open_process_used) @@ -1047,10 +1040,6 @@ get_child_debug_event (DWORD *continue_status, break; case EXIT_PROCESS_DEBUG_EVENT: - OUTMSG2 (("gdbserver: kernel event EXIT_PROCESS_DEBUG_EVENT " - "for pid=%u tid=%x\n", - (unsigned) current_event->dwProcessId, - (unsigned) current_event->dwThreadId)); { DWORD exit_status = current_event->u.ExitProcess.dwExitCode; /* If the exit status looks like a fatal exception, but we @@ -1067,10 +1056,6 @@ get_child_debug_event (DWORD *continue_status, break; case LOAD_DLL_DEBUG_EVENT: - OUTMSG2 (("gdbserver: kernel event LOAD_DLL_DEBUG_EVENT " - "for pid=%u tid=%x\n", - (unsigned) current_event->dwProcessId, - (unsigned) current_event->dwThreadId)); CloseHandle (current_event->u.LoadDll.hFile); if (! windows_process.child_initialization_done) break; @@ -1080,10 +1065,6 @@ get_child_debug_event (DWORD *continue_status, break; case UNLOAD_DLL_DEBUG_EVENT: - OUTMSG2 (("gdbserver: kernel event UNLOAD_DLL_DEBUG_EVENT " - "for pid=%u tid=%x\n", - (unsigned) current_event->dwProcessId, - (unsigned) current_event->dwThreadId)); if (! windows_process.child_initialization_done) break; windows_process.handle_unload_dll (*current_event); @@ -1091,10 +1072,6 @@ get_child_debug_event (DWORD *continue_status, break; case EXCEPTION_DEBUG_EVENT: - OUTMSG2 (("gdbserver: kernel event EXCEPTION_DEBUG_EVENT " - "for pid=%u tid=%x\n", - (unsigned) current_event->dwProcessId, - (unsigned) current_event->dwThreadId)); if (windows_process.handle_exception (*current_event, ourstatus, debug_threads) == HANDLE_EXCEPTION_UNHANDLED) @@ -1103,20 +1080,8 @@ get_child_debug_event (DWORD *continue_status, case OUTPUT_DEBUG_STRING_EVENT: /* A message from the kernel (or Cygwin). */ - OUTMSG2 (("gdbserver: kernel event OUTPUT_DEBUG_STRING_EVENT " - "for pid=%u tid=%x\n", - (unsigned) current_event->dwProcessId, - (unsigned) current_event->dwThreadId)); windows_process.handle_output_debug_string (*current_event, nullptr); break; - - default: - OUTMSG2 (("gdbserver: kernel event unknown " - "for pid=%u tid=%x code=%x\n", - (unsigned) current_event->dwProcessId, - (unsigned) current_event->dwThreadId, - (unsigned) current_event->dwDebugEventCode)); - break; } ptid = debug_event_ptid (current_event); -- 2.53.0