aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-02-15 12:13:20 +0000
committermarha <marha@users.sourceforge.net>2010-02-15 12:13:20 +0000
commit058f810182082292d8632e1f0ad4ffd21adc50fa (patch)
treea707aab8ed502b94fb93014aca9098dff0bb022c
parentb40e949511ca8c00cd7d13c622b5247145d44ab3 (diff)
downloadvcxsrv-058f810182082292d8632e1f0ad4ffd21adc50fa.tar.gz
vcxsrv-058f810182082292d8632e1f0ad4ffd21adc50fa.tar.bz2
vcxsrv-058f810182082292d8632e1f0ad4ffd21adc50fa.zip
Put xserver traces at log level 4
-rw-r--r--xorg-server/dix/Xserver-dtrace.h16
-rw-r--r--xorg-server/hw/xwin/winmsg.c9
-rw-r--r--xorg-server/hw/xwin/winmsg.h2
3 files changed, 19 insertions, 8 deletions
diff --git a/xorg-server/dix/Xserver-dtrace.h b/xorg-server/dix/Xserver-dtrace.h
index b4f27a0bc..0ced498af 100644
--- a/xorg-server/dix/Xserver-dtrace.h
+++ b/xorg-server/dix/Xserver-dtrace.h
@@ -43,21 +43,21 @@ extern "C" {
#endif
#define XSERVER_CLIENT_AUTH(arg0, arg1, arg2, arg3) \
- winDebug("XSERVER_CLIENT_AUTH: %d %s %d %d\n",arg0, arg1, arg2, arg3)
+ winDebug4("XSERVER_CLIENT_AUTH: %d %s %d %d\n",arg0, arg1, arg2, arg3)
#define XSERVER_CLIENT_CONNECT(arg0, arg1) \
- winDebug("XSERVER_CLIENT_CONNECT: %d %d\n",arg0, arg1)
+ winDebug4("XSERVER_CLIENT_CONNECT: %d %d\n",arg0, arg1)
#define XSERVER_CLIENT_DISCONNECT(arg0) \
- winDebug("XSERVER_CLIENT_DISCONNECT: %d %d\n",arg0)
+ winDebug4("XSERVER_CLIENT_DISCONNECT: %d %d\n",arg0)
#define XSERVER_REQUEST_DONE(arg0, arg1, arg2, arg3, arg4) \
- winDebug("XSERVER_REQUEST_DONE: %s %d %d %d %d\n",arg0, arg1, arg2, arg3, arg4)
+ winDebug4("XSERVER_REQUEST_DONE: %s %d %d %d %d\n",arg0, arg1, arg2, arg3, arg4)
#define XSERVER_REQUEST_START(arg0, arg1, arg2, arg3, arg4) \
- winDebug("XSERVER_REQUEST_START: %s %d %d %d ->%p\n",arg0, arg1, arg2, arg3, arg4)
+ winDebug4("XSERVER_REQUEST_START: %s %d %d %d ->%p\n",arg0, arg1, arg2, arg3, arg4)
#define XSERVER_RESOURCE_ALLOC(arg0, arg1, arg2, arg3) \
- winDebug("XSERVER_RESOURCE_ALLOC: 0x%x 0x%x ->%p %s\n",arg0, arg1, arg2, arg3)
+ winDebug4("XSERVER_RESOURCE_ALLOC: 0x%x 0x%x ->%p %s\n",arg0, arg1, arg2, arg3)
#define XSERVER_RESOURCE_FREE(arg0, arg1, arg2, arg3) \
- winDebug("XSERVER_RESOURCE_FREE: 0x%x 0x%x ->%p %s\n",arg0, arg1, arg2, arg3)
+ winDebug4("XSERVER_RESOURCE_FREE: 0x%x 0x%x ->%p %s\n",arg0, arg1, arg2, arg3)
#define XSERVER_SEND_EVENT(arg0, arg1, arg2) \
- winDebug("XSERVER_SEND_EVENT: 0x%x 0x%x ->%p\n",arg0, arg1, arg2)
+ winDebug4("XSERVER_SEND_EVENT: 0x%x 0x%x ->%p\n",arg0, arg1, arg2)
#define XSERVER_CLIENT_AUTH_ENABLED() (1)
#define XSERVER_CLIENT_CONNECT_ENABLED() (1)
diff --git a/xorg-server/hw/xwin/winmsg.c b/xorg-server/hw/xwin/winmsg.c
index a77fde299..e3d68915f 100644
--- a/xorg-server/hw/xwin/winmsg.c
+++ b/xorg-server/hw/xwin/winmsg.c
@@ -47,6 +47,15 @@ winDebug (const char *format, ...)
LogVMessageVerb(X_NONE, 3, format, ap);
va_end (ap);
}
+
+void
+winDebug4 (const char *format, ...)
+{
+ va_list ap;
+ va_start (ap, format);
+ LogVMessageVerb(X_NONE, 4, format, ap);
+ va_end (ap);
+}
#endif
void
diff --git a/xorg-server/hw/xwin/winmsg.h b/xorg-server/hw/xwin/winmsg.h
index ecee86994..beb6683ed 100644
--- a/xorg-server/hw/xwin/winmsg.h
+++ b/xorg-server/hw/xwin/winmsg.h
@@ -39,9 +39,11 @@
#if !defined(_MSC_VER) || defined(_DEBUG)
#define WINDBG
void winDebug (const char *format, ...);
+void winDebug4 (const char *format, ...);
void winDebugWin32Message(const char* function, HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
#else
#define winDebug(...)
+#define winDebug4(...)
#define winDebugWin32Message(...)
#endif