andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Xext: pass the counter into block/wakeup handlers

Browse Source 
No functional changes, currently unused. Preparation work, we don't need a
global variable if we can pass the counters around anyway.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: James Jones <jajones@nvidia.com>
This commit is contained in:
Peter Hutterer 2012-03-13 09:29:39 +10:00
parent 90e6dc6de1
commit d9553b2bbe
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Xext/sync.c
View File

@ -2603,7 +2603,7 @@ IdleTimeQueryValue(pointer pCounter, CARD64 * pValue_return)
} }
static void static void
IdleTimeBlockHandler(pointer env, struct timeval **wt, pointer LastSelectMask) IdleTimeBlockHandler(pointer pCounter, struct timeval **wt, pointer LastSelectMask)
{ {
SyncCounter *counter = IdleTimeCounter; SyncCounter *counter = IdleTimeCounter;
XSyncValue *less = pIdleTimeValueLess, XSyncValue *less = pIdleTimeValueLess,
@ -2678,7 +2678,7 @@ IdleTimeBlockHandler(pointer env, struct timeval **wt, pointer LastSelectMask)
} }
static void static void
IdleTimeWakeupHandler(pointer env, int rc, pointer LastSelectMask) IdleTimeWakeupHandler(pointer pCounter, int rc, pointer LastSelectMask)
{ {
SyncCounter *counter = IdleTimeCounter; SyncCounter *counter = IdleTimeCounter;
XSyncValue idle; XSyncValue idle;
@ -2706,11 +2706,11 @@ IdleTimeBracketValues(pointer pCounter, CARD64 * pbracket_less,
if (registered && !pbracket_less && !pbracket_greater) { if (registered && !pbracket_less && !pbracket_greater) {
RemoveBlockAndWakeupHandlers(IdleTimeBlockHandler, RemoveBlockAndWakeupHandlers(IdleTimeBlockHandler,
IdleTimeWakeupHandler, NULL); IdleTimeWakeupHandler, pCounter);
} }
else if (!registered && (pbracket_less || pbracket_greater)) { else if (!registered && (pbracket_less || pbracket_greater)) {
RegisterBlockAndWakeupHandlers(IdleTimeBlockHandler, RegisterBlockAndWakeupHandlers(IdleTimeBlockHandler,
IdleTimeWakeupHandler, NULL); IdleTimeWakeupHandler, pCounter);
} }
pIdleTimeValueGreater = pbracket_greater; pIdleTimeValueGreater = pbracket_greater;