From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id WG3IDTkzK2g2NyoAWB0awg (envelope-from ) for ; Mon, 19 May 2025 09:33:45 -0400 Received: by simark.ca (Postfix, from userid 112) id 33AD61E11C; Mon, 19 May 2025 09:33:45 -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 816521E102 for ; Mon, 19 May 2025 09:33:44 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3966C3858402 for ; Mon, 19 May 2025 13:33:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3966C3858402 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by sourceware.org (Postfix) with ESMTPS id 216B0385829B for ; Mon, 19 May 2025 13:25:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 216B0385829B 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 216B0385829B Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=209.85.128.51 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1747661119; cv=none; b=YBug8O6Y5vg9bvsuU+FFynBwG4dnDXaNR4Onnhce7Gw9N489h2hNq3uc3PVA6eBefOrf7KteUKCH05uvFeaEpkrST+ibPgwcbYy236XKTSiCNKA6li6yXcTx2HhJy8unndRRv6XpNH3ie16+ajKBdgI25Hly4iuk1TPoFYyLffg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1747661119; c=relaxed/simple; bh=/uk+6Q9jMwL5t0KIWR9kHb1s+kPhoBoMLUddRG6xltQ=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=tr1rFWb6EBJVpXy7qjKBs7WEpY/y1H8YC97kBIhzC+cVz4sbDWYafjmBCss3VgFuBh+2BuQmbhTO5gDBYo9x08MmiLkjTGJy1Krr3MvGaNNmnd5j34SDU1TwBWtSIPCr7VmceyOtFzK72stSDTWYuOgC05Qbi4+/ZjLK4e4+3YI= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 216B0385829B Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-43cec5cd73bso29378315e9.3 for ; Mon, 19 May 2025 06:25:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747661118; x=1748265918; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JxpqrH1Q9q/lOVWAS8AbuAYfYXC+8i1poyRQcJ1ZJ/8=; b=JNuqoiGalZRVJDv/juu4g1AwZ72rta0lcIdV7zWzYV5zUXOflyNAnfnAIDgon47NYI mdXtelMVsY84wBJ+tUNyLa2DycGi62HZcBbjAwvVdWC9LjZVjg3Rz9pt3KDj6Msx1qKM VGBXRrhvUz6P/h8Hz4+JUGyucdUL68kRS+U5H656+Ri6z50QLixNpfeuuo0GWs2wBF9i Rg45cq0wk0q6P1tnUgHzfwtxo/7kzAyEdvyjSHsyy/UQEBRpRPSlfju4cNUYsA7SH1Tx HGRBrDCg7qF2ir50GvVOek460C1VJW88odqPK7Mjade+gAuv4UVmA6TEezs8wqAnFErA zL7Q== X-Gm-Message-State: AOJu0YyNd/5oBrnlXgecmoBsqMpDSLa8MeTMpee9vSdk2iVklWxjd/P2 CpKhgFMtTnYGnS7kvCZzGq/ur6A+7isMQKbULu43R+A8hmE07tcU1XpnO76/jNs/ X-Gm-Gg: ASbGncsPsUYFDK7KUZwRsRD+pdL5tpOwrUn8OP+gTQnHm/3YeonNrn4+ZDSnq4ebOnc ZoF2bfuXz/ocAUfAPmNmfCDiJ3NCuWXbQF7jhQ/thntcPQZ9heSJn6P+/3wdAKw7VxOrbVV6hPg Ba9eD2Al3e9E0eC4fRQ/szD+b/EJAA1t6p6SqEGZ/tVmGv8CU/TJLzRSRZrQAopolDz8qmQD95q PcSN5wTpF/Xr3GNRQ0uxTeZqHaGjbcXPwlr0o4uCoBYRatVy+IxG5X8DsEsz9KJB2ZpnUP5DqCu FUZxoJlA86GIAucS64vfAVTYaUqdjKCRAd13B+jp8u3PZ135MSZpD/JEOkO6qQ== X-Google-Smtp-Source: AGHT+IFwDMvf3Vtp+xP2FneT3/X35zIwrScOQnITiJh9/szUn7HxPaEL6emcV6IyhA/prbqyywZO/g== X-Received: by 2002:a05:600c:5006:b0:442:f956:53f9 with SMTP id 5b1f17b1804b1-442fd64e4d3mr111801545e9.18.1747661117561; Mon, 19 May 2025 06:25:17 -0700 (PDT) Received: from localhost ([2001:8a0:4fe9:b400:8d90:6f0d:36bf:32df]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-442ebd8b9absm114866345e9.1.2025.05.19.06.25.16 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 19 May 2025 06:25:17 -0700 (PDT) From: Pedro Alves To: gdb-patches@sourceware.org Subject: [PATCH v2 38/47] Introduce windows_nat::event_code_to_string Date: Mon, 19 May 2025 14:22:59 +0100 Message-ID: <20250519132308.3553663-39-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 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. Change-Id: Id38b7e30df182e4742f3179538de3c643cf42668 --- gdb/nat/windows-nat.c | 23 +++++++++++++++++++++ gdb/nat/windows-nat.h | 4 ++++ gdb/windows-nat.c | 37 +++++----------------------------- gdbserver/win32-low.cc | 45 +++++------------------------------------- 4 files changed, 37 insertions(+), 72 deletions(-) diff --git a/gdb/nat/windows-nat.c b/gdb/nat/windows-nat.c index 907d39f317a..7e683fd8629 100644 --- a/gdb/nat/windows-nat.c +++ b/gdb/nat/windows-nat.c @@ -689,6 +689,29 @@ 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); + } +} + +/* 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 667fc832292..19403d0e623 100644 --- a/gdb/nat/windows-nat.h +++ b/gdb/nat/windows-nat.h @@ -284,6 +284,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 492d2e3f55b..73ddfcb3b6a 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c @@ -1616,13 +1616,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); @@ -1654,10 +1655,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, @@ -1666,10 +1663,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; @@ -1686,10 +1679,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 (); @@ -1718,10 +1707,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) @@ -1739,10 +1724,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; @@ -1759,10 +1740,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, @@ -1782,10 +1759,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 1a80269678e..1d3b24540d6 100644 --- a/gdbserver/win32-low.cc +++ b/gdbserver/win32-low.cc @@ -1010,13 +1010,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, @@ -1026,10 +1027,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); @@ -1037,10 +1034,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) @@ -1060,10 +1053,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 @@ -1080,10 +1069,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; @@ -1093,10 +1078,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); @@ -1104,10 +1085,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) @@ -1116,20 +1093,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.49.0