Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 22:43:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use kernel facilities to change debug level at runtime

Browse source 
svn path=/trunk/; revision=31286
This commit is contained in:
Hervé Poussineau 2007-12-16 21:00:44 +00:00
parent 79c2227121
commit 4cf058de4c
4 changed files with 26 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

35
reactos/drivers/network/tcpip/include/debug.h
View file

@ -9,11 +9,9 @@
#ifndef __DEBUG_H #ifndef __DEBUG_H
#define __DEBUG_H #define __DEBUG_H
#define NORMAL_MASK 0x000000FF #define MIN_TRACE DPFLTR_WARNING_LEVEL
#define SPECIAL_MASK 0xFFFFFF00 #define MID_TRACE DPFLTR_WARNING_LEVEL | DPFLTR_TRACE_LEVEL
#define MIN_TRACE 0x00000001 #define MAX_TRACE DPFLTR_WARNING_LEVEL | DPFLTR_TRACE_LEVEL | DPFLTR_INFO_LEVEL
#define MID_TRACE 0x00000002
#define MAX_TRACE 0x00000003
#define DEBUG_CHECK 0x00000100 #define DEBUG_CHECK 0x00000100
#define DEBUG_MEMORY 0x00000200 #define DEBUG_MEMORY 0x00000200
@ -33,33 +31,14 @@
#define DEBUG_CPOINT 0x00800000 #define DEBUG_CPOINT 0x00800000
#define DEBUG_LOCK 0x01000000 #define DEBUG_LOCK 0x01000000
#define DEBUG_INFO 0x02000000 #define DEBUG_INFO 0x02000000
#define DEBUG_ULTRA 0xFFFFFFFF #define DEBUG_ULTRA 0x7FFFFFFF
#ifdef DBG #ifdef DBG
extern DWORD DebugTraceLevel; #define REMOVE_PARENS(...) __VA_ARGS__
#ifdef _MSC_VER
#define TI_DbgPrint(_t_, _x_) \ #define TI_DbgPrint(_t_, _x_) \
if (((DebugTraceLevel & NORMAL_MASK) >= _t_) || \ DbgPrintEx(DPFLTR_TCPIP_ID, (_t_) & DPFLTR_MASK, "(%s:%d) ", __FILE__, __LINE__), \
((DebugTraceLevel & _t_) > NORMAL_MASK)) { \ DbgPrintEx(DPFLTR_TCPIP_ID, (_t_) & DPFLTR_MASK, REMOVE_PARENS _x_)
DbgPrint("(%s:%d) ", __FILE__, __LINE__); \
DbgPrint _x_ ; \
}
#else /* _MSC_VER */
#define TI_DbgPrint(_t_, _x_) \
if (((DebugTraceLevel & NORMAL_MASK) >= _t_) || \
((DebugTraceLevel & _t_) > NORMAL_MASK)) { \
DbgPrint("(%s:%d)(%s) ", __FILE__, __LINE__, __FUNCTION__); \
DbgPrint _x_ ; \
}
#endif /* _MSC_VER */
#define ASSERT_IRQL(x) ASSERT(KeGetCurrentIrql() <= (x))
#else /* DBG */ #else /* DBG */

33
reactos/drivers/network/tcpip/tcpip/main.c
View file

@ -419,10 +419,7 @@ TiDispatchOpenClose(
} }
NTSTATUS NTSTATUS NTAPI
#ifndef _MSC_VER
STDCALL
#endif
TiDispatchInternal( TiDispatchInternal(
PDEVICE_OBJECT DeviceObject, PDEVICE_OBJECT DeviceObject,
PIRP Irp) PIRP Irp)
@ -526,10 +523,7 @@ TiDispatchInternal(
} }
NTSTATUS NTSTATUS NTAPI
#ifndef _MSC_VER
STDCALL
#endif
TiDispatch( TiDispatch(
PDEVICE_OBJECT DeviceObject, PDEVICE_OBJECT DeviceObject,
PIRP Irp) PIRP Irp)
@ -687,10 +681,7 @@ VOID STDCALL IPTimeoutDpcFn(
} }
} }
NTSTATUS NTSTATUS NTAPI
#ifndef _MSC_VER
STDCALL
#endif
DriverEntry( DriverEntry(
PDRIVER_OBJECT DriverObject, PDRIVER_OBJECT DriverObject,
PUNICODE_STRING RegistryPath) PUNICODE_STRING RegistryPath)
@ -870,14 +861,14 @@ DriverEntry(
DueTime.QuadPart = -(LONGLONG)IP_TIMEOUT * 10000; DueTime.QuadPart = -(LONGLONG)IP_TIMEOUT * 10000;
KeSetTimerEx(&IPTimer, DueTime, IP_TIMEOUT, &IPTimeoutDpc); KeSetTimerEx(&IPTimer, DueTime, IP_TIMEOUT, &IPTimeoutDpc);
/* ROS Hack: ideally, DebugTraceLevel variable should be removed */
DbgSetDebugFilterState(DPFLTR_TCPIP_ID, DebugTraceLevel, TRUE);
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
VOID VOID NTAPI
#ifndef _MSC_VER
STDCALL
#endif
IPAddInterface( IPAddInterface(
DWORD Unknown0, DWORD Unknown0,
DWORD Unknown1, DWORD Unknown1,
@ -889,10 +880,7 @@ IPAddInterface(
} }
VOID VOID NTAPI
#ifndef _MSC_VER
STDCALL
#endif
IPDelInterface( IPDelInterface(
DWORD Unknown0) DWORD Unknown0)
{ {
@ -900,10 +888,7 @@ IPDelInterface(
} }
VOID VOID NTAPI
#ifndef _MSC_VER
STDCALL
#endif
LookupRoute( LookupRoute(
DWORD Unknown0, DWORD Unknown0,
DWORD Unknown1) DWORD Unknown1)

7
reactos/include/ddk/winddk.h
View file

@ -240,7 +240,12 @@ typedef struct _ADAPTER_OBJECT *PADAPTER_OBJECT;
#define DPFLTR_INFO_LEVEL 3 #define DPFLTR_INFO_LEVEL 3
#define DPFLTR_MASK 0x80000000 #define DPFLTR_MASK 0x80000000
#define DPFLTR_PREFETCHER_ID 63 typedef enum _DPFLTR_TYPE
{
DPFLTR_I8042PRT_ID = 15,
DPFLTR_TCPIP_ID = 30,
DPFLTR_PREFETCHER_ID = 65,
} DPFLTR_TYPE;
#define MAXIMUM_PROCESSORS 32 #define MAXIMUM_PROCESSORS 32

6
reactos/lib/drivers/ip/network/routines.c
View file

@ -94,7 +94,8 @@ VOID DisplayTCPPacket(
UINT Length; UINT Length;
PCHAR Buffer; PCHAR Buffer;
if ((DebugTraceLevel & (DEBUG_PBUFFER | DEBUG_TCP)) != (DEBUG_PBUFFER | DEBUG_TCP)) { if (!DbgQueryDebugFilterState(DPFLTR_TCPIP_ID, DEBUG_PBUFFER | DPFLTR_MASK) ||
!DbgQueryDebugFilterState(DPFLTR_TCPIP_ID, DEBUG_TCP | DPFLTR_MASK)) {
return; return;
} }
@ -137,7 +138,8 @@ VOID DisplayIPPacket(
PNDIS_BUFFER NextBuffer; PNDIS_BUFFER NextBuffer;
PCHAR CharBuffer; PCHAR CharBuffer;
if ((DebugTraceLevel & (DEBUG_PBUFFER | DEBUG_IP)) != (DEBUG_PBUFFER | DEBUG_IP)) { if (!DbgQueryDebugFilterState(DPFLTR_TCPIP_ID, DEBUG_PBUFFER | DPFLTR_MASK) ||
!DbgQueryDebugFilterState(DPFLTR_TCPIP_ID, DEBUG_IP | DPFLTR_MASK)) {
return; return;
} }