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.
This commit is contained in:
Joel Brobecker 2013-06-11 10:20:24 +00:00
parent 80e88e1aa2
commit 0c3d84be3e
2 changed files with 16 additions and 10 deletions

View File

@ -1,3 +1,9 @@
2013-06-11 Joel Brobecker <brobecker@adacore.com>
* 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 <brobecker@adacore.com>
* window-nat.c (thread_rec): Add thread ID in SuspendThread

View File

@ -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",