From 0c3d84be3e696d2d1787a7240e086a72054b9679 Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Tue, 11 Jun 2013 10:20:24 +0000 Subject: [PATCH] windows: Prefix thread ID values with "0x" in debug traces The windows-nat.c debug traces print the thread ID in base 16, but give no indication of it. So, in a trace like the following... gdb: kernel event for pid=4816 tid=720 code=CREATE_THREAD_DEBUG_EVENT) ... where tid is "720", it's easy to be confused and think that the thread ID is 720 rather than 0x720. This patch avoids the confusion by adding the usual "0x" prefix used for hexadecimal values. gdb/ChangeLog: * windows-nat.c (windows_continue): Add "0x" prefix for thread ID in debug trace. (get_windows_debug_event): Likewise, for all debug traces. --- gdb/ChangeLog | 6 ++++++ gdb/windows-nat.c | 20 ++++++++++---------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 2fb7ac8..fc0508e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2013-06-11 Joel Brobecker + * windows-nat.c (windows_continue): Add "0x" prefix for thread + ID in debug trace. + (get_windows_debug_event): Likewise, for all debug traces. + +2013-06-11 Joel Brobecker + * window-nat.c (thread_rec): Add thread ID in SuspendThread warning message. diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c index 66c44eb..e0bb719 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c @@ -1256,7 +1256,7 @@ windows_continue (DWORD continue_status, int id) thread_info *th; BOOL res; - DEBUG_EVENTS (("ContinueDebugEvent (cpid=%d, ctid=%x, %s);\n", + DEBUG_EVENTS (("ContinueDebugEvent (cpid=%d, ctid=0x%x, %s);\n", (unsigned) current_event.dwProcessId, (unsigned) current_event.dwThreadId, continue_status == DBG_CONTINUE ? @@ -1465,7 +1465,7 @@ get_windows_debug_event (struct target_ops *ops, switch (event_code) { case CREATE_THREAD_DEBUG_EVENT: - DEBUG_EVENTS (("gdb: kernel event for pid=%u tid=%x code=%s)\n", + DEBUG_EVENTS (("gdb: kernel event for pid=%u tid=0x%x code=%s)\n", (unsigned) current_event.dwProcessId, (unsigned) current_event.dwThreadId, "CREATE_THREAD_DEBUG_EVENT")); @@ -1494,7 +1494,7 @@ get_windows_debug_event (struct target_ops *ops, break; case EXIT_THREAD_DEBUG_EVENT: - DEBUG_EVENTS (("gdb: kernel event for pid=%u tid=%x code=%s)\n", + DEBUG_EVENTS (("gdb: kernel event for pid=%u tid=0x%x code=%s)\n", (unsigned) current_event.dwProcessId, (unsigned) current_event.dwThreadId, "EXIT_THREAD_DEBUG_EVENT")); @@ -1509,7 +1509,7 @@ get_windows_debug_event (struct target_ops *ops, break; case CREATE_PROCESS_DEBUG_EVENT: - DEBUG_EVENTS (("gdb: kernel event for pid=%u tid=%x code=%s)\n", + DEBUG_EVENTS (("gdb: kernel event for pid=%u tid=0x%x code=%s)\n", (unsigned) current_event.dwProcessId, (unsigned) current_event.dwThreadId, "CREATE_PROCESS_DEBUG_EVENT")); @@ -1532,7 +1532,7 @@ get_windows_debug_event (struct target_ops *ops, break; case EXIT_PROCESS_DEBUG_EVENT: - DEBUG_EVENTS (("gdb: kernel event for pid=%u tid=%x code=%s)\n", + DEBUG_EVENTS (("gdb: kernel event for pid=%u tid=0x%x code=%s)\n", (unsigned) current_event.dwProcessId, (unsigned) current_event.dwThreadId, "EXIT_PROCESS_DEBUG_EVENT")); @@ -1552,7 +1552,7 @@ get_windows_debug_event (struct target_ops *ops, break; case LOAD_DLL_DEBUG_EVENT: - DEBUG_EVENTS (("gdb: kernel event for pid=%u tid=%x code=%s)\n", + DEBUG_EVENTS (("gdb: kernel event for pid=%u tid=0x%x code=%s)\n", (unsigned) current_event.dwProcessId, (unsigned) current_event.dwThreadId, "LOAD_DLL_DEBUG_EVENT")); @@ -1566,7 +1566,7 @@ get_windows_debug_event (struct target_ops *ops, break; case UNLOAD_DLL_DEBUG_EVENT: - DEBUG_EVENTS (("gdb: kernel event for pid=%u tid=%x code=%s)\n", + DEBUG_EVENTS (("gdb: kernel event for pid=%u tid=0x%x code=%s)\n", (unsigned) current_event.dwProcessId, (unsigned) current_event.dwThreadId, "UNLOAD_DLL_DEBUG_EVENT")); @@ -1579,7 +1579,7 @@ get_windows_debug_event (struct target_ops *ops, break; case EXCEPTION_DEBUG_EVENT: - DEBUG_EVENTS (("gdb: kernel event for pid=%u tid=%x code=%s)\n", + DEBUG_EVENTS (("gdb: kernel event for pid=%u tid=0x%x code=%s)\n", (unsigned) current_event.dwProcessId, (unsigned) current_event.dwThreadId, "EXCEPTION_DEBUG_EVENT")); @@ -1601,7 +1601,7 @@ get_windows_debug_event (struct target_ops *ops, break; case OUTPUT_DEBUG_STRING_EVENT: /* Message from the kernel. */ - DEBUG_EVENTS (("gdb: kernel event for pid=%u tid=%x code=%s)\n", + DEBUG_EVENTS (("gdb: kernel event for pid=%u tid=0x%x code=%s)\n", (unsigned) current_event.dwProcessId, (unsigned) current_event.dwThreadId, "OUTPUT_DEBUG_STRING_EVENT")); @@ -1613,7 +1613,7 @@ get_windows_debug_event (struct target_ops *ops, default: if (saw_create != 1) break; - printf_unfiltered ("gdb: kernel event for pid=%u tid=%x\n", + printf_unfiltered ("gdb: kernel event for pid=%u tid=0x%x\n", (unsigned) current_event.dwProcessId, (unsigned) current_event.dwThreadId); printf_unfiltered (" unknown event code %u\n", -- 2.7.4