[ion] 24981: - Forgot to actually initialize Dbgk during system initialization, so any API would crash. - Fix some stupid bugs in NtCreateDebugObject. - Add tracing framework and add tracing to all of debug.c. - Dbgk *almost* works: http://www.tinykrnl.org/dbgworking.png. Here I attach to services.exe and the kernel is sending notifications for all threads and DLLs loaded.
Author: ion Date: Thu Nov 30 07:16:35 2006 New Revision: 24981
URL: http://svn.reactos.org/svn/reactos?rev=24981&view=rev Log: - Forgot to actually initialize Dbgk during system initialization, so any API would crash. - Fix some stupid bugs in NtCreateDebugObject. - Add tracing framework and add tracing to all of debug.c. - Dbgk *almost* works: http://www.tinykrnl.org/dbgworking.png. Here I attach to services.exe and the kernel is sending notifications for all threads and DLLs loaded.
Modified: trunk/reactos/ntoskrnl/dbgk/debug.c trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/include/internal/dbgk.h trunk/reactos/ntoskrnl/include/internal/ps.h
Modified: trunk/reactos/ntoskrnl/dbgk/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/debug.c?rev=2... ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/debug.c (original) +++ trunk/reactos/ntoskrnl/dbgk/debug.c Thu Nov 30 07:16:35 2006 @@ -14,6 +14,7 @@
POBJECT_TYPE DbgkDebugObjectType; FAST_MUTEX DbgkpProcessDebugPortMutex; +ULONG DbgkpTraceLevel = -1;
GENERIC_MAPPING DbgkDebugObjectMapping = { @@ -47,6 +48,10 @@ NTSTATUS Status; BOOLEAN NewEvent; PAGED_CODE(); + DBGKTRACE(DBGK_MESSAGE_DEBUG, + "Process: %p Thread: %p Message: %p Flags: %lx\n", + Process, Thread, Message, Flags); + DBGKTRACE(DBGK_MESSAGE_DEBUG, "MessageType: %lx\n", Message->ApiNumber);
/* Check if we have to allocate a debug event */ NewEvent = (Flags & 2) ? TRUE : FALSE; @@ -191,6 +196,7 @@ }
/* Return status */ + DBGKTRACE(DBGK_MESSAGE_DEBUG, "Status: %lx\n", Status); return Status; }
@@ -240,6 +246,7 @@ { NTSTATUS Status; PAGED_CODE(); + DBGKTRACE(DBGK_MESSAGE_DEBUG, "ApiMsg: %p Flags: %lx\n", ApiMsg, Flags);
/* Suspend process if required */ if (Flags) DbgkpSuspendProcess(); @@ -272,6 +279,7 @@ { PDEBUG_OBJECT DebugObject; PAGED_CODE(); + DBGKTRACE(DBGK_PROCESS_DEBUG, "Process: %p Parent: %p\n", Process, Parent);
/* Clear this process's port */ Process->DebugPort = NULL; @@ -318,6 +326,8 @@ PVOID Port; BOOLEAN UseLpc = FALSE; PAGED_CODE(); + DBGKTRACE(DBGK_EXCEPTION_DEBUG, + "ExceptionRecord: %p Port: %p\n", ExceptionRecord, DebugPort);
/* Setup the API Message */ ApiMessage.h.u1.Length = sizeof(DBGKM_MSG) << 16 | @@ -379,6 +389,7 @@ { PHANDLE Handle = NULL; PAGED_CODE(); + DBGKTRACE(DBGK_OBJECT_DEBUG, "DebugEvent: %p\n", DebugEvent);
/* Check if this event had a file handle */ switch (DebugEvent->ApiMsg.ApiNumber) @@ -414,6 +425,7 @@ { PETHREAD Thread = DebugEvent->Thread; PAGED_CODE(); + DBGKTRACE(DBGK_OBJECT_DEBUG, "DebugEvent: %p\n", DebugEvent);
/* Check if we have to wake the thread */ if (DebugEvent->Flags & 20) PsResumeThread(Thread, NULL); @@ -457,6 +469,8 @@ IO_STATUS_BLOCK IoStatusBlock; NTSTATUS Status; PAGED_CODE(); + DBGKTRACE(DBGK_PROCESS_DEBUG, "Process: %p Thread: %p DebugObject: %p\n", + Process, Thread, DebugObject);
/* Quit if there's no PEB */ if (!Peb) return STATUS_SUCCESS; @@ -492,6 +506,10 @@ PointerToSymbolTable; LoadDll->DebugInfoSize = NtHeader->FileHeader.NumberOfSymbols; } + + /* Trace */ + DBGKTRACE(DBGK_PROCESS_DEBUG, "Name: %wZ. Base: %p\n", + &LdrEntry->FullDllName, LdrEntry->DllBase);
/* Get the name of the DLL */ Status = MmGetFileNameForAddress(NtHeader, &ModuleName); @@ -561,6 +579,8 @@ BOOLEAN First; PIMAGE_NT_HEADERS NtHeader; PAGED_CODE(); + DBGKTRACE(DBGK_THREAD_DEBUG, "Process: %p StartThread: %p Object: %p\n", + Process, StartThread, DebugObject);
/* Check if we have a start thread */ if (StartThread) @@ -668,6 +688,12 @@ ApiMessage.ApiNumber = DbgKmCreateThreadApi; CreateThread->StartAddress = ThisThread->StartAddress; } + + /* Trace */ + DBGKTRACE(DBGK_THREAD_DEBUG, "Thread: %p. First: %lx, OldThread: %p\n", + ThisThread, First, OldThread); + DBGKTRACE(DBGK_THREAD_DEBUG, "Start Address: %p\n", + ThisThread->StartAddress);
/* Queue the message */ Status = DbgkpQueueMessage(Process, @@ -726,6 +752,8 @@ PETHREAD ReturnThread = NULL; NTSTATUS Status; PAGED_CODE(); + DBGKTRACE(DBGK_PROCESS_DEBUG, "Process: %p DebugObject: %p\n", + Process, DebugObject);
/* Attach to the process */ KeStackAttachProcess(&Process->Pcb, &ApcState); @@ -883,6 +911,7 @@ { KAPC_STATE ApcState; PAGED_CODE(); + DBGKTRACE(DBGK_PROCESS_DEBUG, "Process: %p\n", Process);
/* Acquire process rundown */ if (!ExAcquireRundownProtection(&Process->RundownProtect)) return; @@ -920,6 +949,8 @@ HANDLE Handle; PHANDLE DupHandle; PAGED_CODE(); + DBGKTRACE(DBGK_OBJECT_DEBUG, "Process: %p Thread: %p\n", + Process, Thread);
/* Check which state this is */ switch (WaitStateChange->NewState) @@ -1035,6 +1066,8 @@ BOOLEAN DebugPortCleared = FALSE; PLIST_ENTRY DebugEventList; PDEBUG_EVENT DebugEvent; + DBGKTRACE(DBGK_OBJECT_DEBUG, "OwnerProcess: %p DebugObject: %p\n", + OwnerProcess, DebugObject);
/* If this isn't the last handle, do nothing */ if (HandleCount > 1) return; @@ -1122,6 +1155,8 @@ PETHREAD ThisThread, FirstThread; PLIST_ENTRY NextEntry; PAGED_CODE(); + DBGKTRACE(DBGK_PROCESS_DEBUG, "Process: %p DebugObject: %p\n", + Process, DebugObject);
/* Initialize the temporary list */ InitializeListHead(&TempList); @@ -1228,6 +1263,8 @@ NextEntry = DebugObject->EventList.Flink; while (NextEntry != &DebugObject->EventList) { + DPRINT1("Next Entry: %p\n", NextEntry); + DPRINT1("List: %p\n", &DebugObject->EventList); /* FIXME: TODO */ KEBUGCHECK(0); } @@ -1260,6 +1297,8 @@ IN PDEBUG_OBJECT SourceDebugObject) { /* FIXME: TODO */ + DBGKTRACE(DBGK_PROCESS_DEBUG, "Process: %p DebugObject: %p\n", + Process, SourceDebugObject); return STATUS_UNSUCCESSFUL; }
@@ -1330,7 +1369,7 @@ ObjectAttributes, PreviousMode, NULL, - sizeof(PDEBUG_OBJECT), + sizeof(DEBUG_OBJECT), 0, 0, (PVOID*)&DebugObject); @@ -1343,7 +1382,9 @@ InitializeListHead(&DebugObject->EventList);
/* Initialize the Debug Object's Wait Event */ - KeInitializeEvent(&DebugObject->EventsPresent, NotificationEvent, 0); + KeInitializeEvent(&DebugObject->EventsPresent, + NotificationEvent, + FALSE);
/* Set the Flags */ DebugObject->KillProcessOnExit = KillProcessOnExit; @@ -1355,9 +1396,6 @@ 0, NULL, &hDebug); - ObDereferenceObject(DebugObject); - - /* Check for success and return handle */ if (NT_SUCCESS(Status)) { _SEH_TRY @@ -1372,6 +1410,8 @@ }
/* Return Status */ + DBGKTRACE(DBGK_OBJECT_DEBUG, "Handle: %p DebugObject: %p\n", + hDebug, DebugObject); return Status; }
@@ -1389,6 +1429,8 @@ BOOLEAN NeedsWake = FALSE; CLIENT_ID ClientId; PAGED_CODE(); + DBGKTRACE(DBGK_OBJECT_DEBUG, "Handle: %p Status: %p\n", + DebugHandle, ContinueStatus);
/* Check if we were called from user mode*/ if (PreviousMode != KernelMode) @@ -1513,6 +1555,9 @@ KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); PETHREAD LastThread; NTSTATUS Status; + PAGED_CODE(); + DBGKTRACE(DBGK_PROCESS_DEBUG, "Process: %p Handle: %p\n", + ProcessHandle, DebugHandle);
/* Reference the process */ Status = ObReferenceObjectByHandle(ProcessHandle, @@ -1576,6 +1621,9 @@ PDEBUG_OBJECT DebugObject; KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); NTSTATUS Status; + PAGED_CODE(); + DBGKTRACE(DBGK_PROCESS_DEBUG, "Process: %p Handle: %p\n", + ProcessHandle, DebugHandle);
/* Reference the process */ Status = ObReferenceObjectByHandle(ProcessHandle, @@ -1705,6 +1753,8 @@ NTSTATUS Status = STATUS_SUCCESS; PDEBUG_EVENT DebugEvent, DebugEvent2; PLIST_ENTRY ListHead, NextEntry; + PAGED_CODE(); + DBGKTRACE(DBGK_OBJECT_DEBUG, "Handle: %p\n", DebugHandle);
/* Clear the initial wait state change structure */ RtlZeroMemory(&WaitStateChange, sizeof(WaitStateChange));
Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=2498... ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Thu Nov 30 07:16:35 2006 @@ -792,6 +792,9 @@ /* Initialize the Process Manager */ if (!PsInitSystem()) KEBUGCHECK(PROCESS_INITIALIZATION_FAILED);
+ /* Initialize the User-Mode Debugging Subsystem */ + DbgkInitialize(); + /* Calculate the tick count multiplier */ ExpTickCountMultiplier = ExComputeTickCountMultiplier(KeMaximumIncrement); SharedUserData->TickCountMultiplier = ExpTickCountMultiplier;
Modified: trunk/reactos/ntoskrnl/include/internal/dbgk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/d... ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/dbgk.h (original) +++ trunk/reactos/ntoskrnl/include/internal/dbgk.h Thu Nov 30 07:16:35 2006 @@ -1,5 +1,57 @@ -#ifndef __NTOSKRNL_INCLUDE_INTERNAL_DBGK_H -#define __NTOSKRNL_INCLUDE_INTERNAL_DBGK_H +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/include/dbgk.h + * PURPOSE: Internal header for the User-Mode Debugging Backend + * PROGRAMMERS: Alex Ionescu (alex.ionescu@reactos.org) + */ + +// +// Define this if you want debugging support +// +#define _DBGK_DEBUG_ 0x01 + +// +// These define the Debug Masks Supported +// +#define DBGK_THREAD_DEBUG 0x01 +#define DBGK_PROCESS_DEBUG 0x02 +#define DBGK_OBJECT_DEBUG 0x04 +#define DBGK_MESSAGE_DEBUG 0x08 +#define DBGK_EXCEPTION_DEBUG 0x10 + +// +// Debug/Tracing support +// +#if _DBGK_DEBUG_ +#ifdef NEW_DEBUG_SYSTEM_IMPLEMENTED // enable when Debug Filters are implemented +#define DBGKTRACE(x, ...) \ + { \ + DbgPrintEx("%s [%.16s] - ", \ + __FUNCTION__, \ + PsGetCurrentProcess()->ImageFileName); \ + DbgPrintEx(__VA_ARGS__); \ + } +#else +#define DBGKTRACE(x, ...) \ + if (x & DbgkpTraceLevel) \ + { \ + DbgPrint("%s [%.16s] - ", \ + __FUNCTION__, \ + PsGetCurrentProcess()->ImageFileName); \ + DbgPrint(__VA_ARGS__); \ + } +#endif +#else +#define DBGKTRACE(x, ...) DPRINT(__VA_ARGS__); +#endif + +VOID +INIT_FUNCTION +NTAPI +DbgkInitialize( + VOID +);
VOID NTAPI @@ -82,6 +134,5 @@ );
extern POBJECT_TYPE DbgkDebugObjectType; -#endif
/* EOF */
Modified: trunk/reactos/ntoskrnl/include/internal/ps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/p... ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ps.h Thu Nov 30 07:16:35 2006 @@ -1,10 +1,10 @@ /* -* PROJECT: ReactOS Kernel -* LICENSE: GPL - See COPYING in the top level directory -* FILE: ntoskrnl/include/ps.h -* PURPOSE: Internal header for the Process Manager -* PROGRAMMERS: Alex Ionescu (alex.ionescu@reactos.org) -*/ + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/include/ps.h + * PURPOSE: Internal header for the Process Manager + * PROGRAMMERS: Alex Ionescu (alex.ionescu@reactos.org) + */
// // Define this if you want debugging support
-
ion＠svn.reactos.org