diff options
| author | marha <marha@users.sourceforge.net> | 2009-10-06 16:01:41 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-10-06 16:01:41 +0000 |
| commit | 460e917762969b956bfbdf43d40e02470bbe32ac (patch) | |
| tree | c5c24f1a7804b51bc9afb59f41c677bb17972822 /xorg-server/dix | |
| parent | 30962971c0e6ffac099a0d15ced5cc773674f7f5 (diff) | |
| download | vcxsrv-460e917762969b956bfbdf43d40e02470bbe32ac.tar.gz vcxsrv-460e917762969b956bfbdf43d40e02470bbe32ac.tar.bz2 vcxsrv-460e917762969b956bfbdf43d40e02470bbe32ac.zip | |
Adjusted the tracing.
Diffstat (limited to 'xorg-server/dix')
| -rw-r--r-- | xorg-server/dix/dispatch.c | 30 |
1 files changed, 27 insertions, 3 deletions
diff --git a/xorg-server/dix/dispatch.c b/xorg-server/dix/dispatch.c index 76ed70f66..3d5baeb4d 100644 --- a/xorg-server/dix/dispatch.c +++ b/xorg-server/dix/dispatch.c @@ -413,6 +413,9 @@ Dispatch(void) start_tick = SmartScheduleTime; while (!isItTimeToYield) { +#ifdef XSERVER_DTRACE + CARD8 StartMajorOp; +#endif if (*icheck[0] != *icheck[1]) ProcessInputEvents(); @@ -437,7 +440,8 @@ Dispatch(void) client->sequence++; #ifdef XSERVER_DTRACE - XSERVER_REQUEST_START(LookupMajorName(MAJOROP), MAJOROP, + StartMajorOp=MAJOROP; + XSERVER_REQUEST_START(LookupMajorName(StartMajorOp), StartMajorOp, ((xReq *)client->requestBuffer)->length, client->index, client->requestBuffer); #endif @@ -450,8 +454,28 @@ Dispatch(void) XaceHookAuditEnd(client, result); } #ifdef XSERVER_DTRACE - XSERVER_REQUEST_DONE(LookupMajorName(MAJOROP), MAJOROP, - client->sequence, client->index, result); + if (result!=Success) + { + char Message[255]; + sprintf(Message,"ERROR: %s (0x%x)",LookupMajorName(StartMajorOp),client->errorValue); + XSERVER_REQUEST_DONE(Message, MAJOROP, + client->sequence, client->index, result); + } + else + { + if (StartMajorOp!=MAJOROP) + { + char Message[255]; + sprintf(Message,"Changed request: %s -> %s",LookupMajorName(StartMajorOp),LookupMajorName(MAJOROP)); + XSERVER_REQUEST_DONE(Message, MAJOROP, + client->sequence, client->index, result); + } + else + { + XSERVER_REQUEST_DONE(LookupMajorName(MAJOROP), MAJOROP, + client->sequence, client->index, result); + } + } #endif if (result != Success) |