frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Xext: localise use of IdleTimeCounter 

Instead of referring to the global IdleTimeCounter everywhere, only do it
once and use a local variable for the rest.

Cleanup for future features, no functional changes.

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-12 15:27:56 +10:00
parent 1f12f059ef
commit 43eb2f2758
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Xext/sync.c
View File

@ -2595,16 +2595,17 @@ IdleTimeQueryValue(pointer pCounter, CARD64 * pValue_return)
static void static void
IdleTimeBlockHandler(pointer env, struct timeval **wt, pointer LastSelectMask) IdleTimeBlockHandler(pointer env, struct timeval **wt, pointer LastSelectMask)
{ {
SyncCounter *counter = IdleTimeCounter;
XSyncValue idle, old_idle; XSyncValue idle, old_idle;
SyncTriggerList *list = IdleTimeCounter->sync.pTriglist; SyncTriggerList *list = counter->sync.pTriglist;
SyncTrigger *trig; SyncTrigger *trig;
if (!pIdleTimeValueLess && !pIdleTimeValueGreater) if (!pIdleTimeValueLess && !pIdleTimeValueGreater)
return; return;
old_idle = IdleTimeCounter->value; old_idle = counter->value;
IdleTimeQueryValue(NULL, &idle); IdleTimeQueryValue(NULL, &idle);
IdleTimeCounter->value = idle; /* push, so CheckTrigger works */ counter->value = idle; /* push, so CheckTrigger works */
if (pIdleTimeValueLess && XSyncValueLessOrEqual(idle, *pIdleTimeValueLess)) { if (pIdleTimeValueLess && XSyncValueLessOrEqual(idle, *pIdleTimeValueLess)) {
/* /*
@ -2615,7 +2616,7 @@ IdleTimeBlockHandler(pointer env, struct timeval **wt, pointer LastSelectMask)
* immediately so we can reschedule. * immediately so we can reschedule.
*/ */
for (list = IdleTimeCounter->sync.pTriglist; list; list = list->next) { for (list = counter->sync.pTriglist; list; list = list->next) {
trig = list->pTrigger; trig = list->pTrigger;
if (trig->CheckTrigger(trig, old_idle)) { if (trig->CheckTrigger(trig, old_idle)) {
AdjustWaitForDelay(wt, 0); AdjustWaitForDelay(wt, 0);
@ -2648,7 +2649,7 @@ IdleTimeBlockHandler(pointer env, struct timeval **wt, pointer LastSelectMask)
timeout = min(timeout, XSyncValueLow32(value)); timeout = min(timeout, XSyncValueLow32(value));
} }
else { else {
for (list = IdleTimeCounter->sync.pTriglist; list; for (list = counter->sync.pTriglist; list;
list = list->next) { list = list->next) {
trig = list->pTrigger; trig = list->pTrigger;
if (trig->CheckTrigger(trig, old_idle)) { if (trig->CheckTrigger(trig, old_idle)) {
@ -2661,12 +2662,13 @@ IdleTimeBlockHandler(pointer env, struct timeval **wt, pointer LastSelectMask)
AdjustWaitForDelay(wt, timeout); AdjustWaitForDelay(wt, timeout);
} }
IdleTimeCounter->value = old_idle; /* pop */ counter->value = old_idle; /* pop */
} }
static void static void
IdleTimeWakeupHandler(pointer env, int rc, pointer LastSelectMask) IdleTimeWakeupHandler(pointer env, int rc, pointer LastSelectMask)
{ {
SyncCounter *counter = IdleTimeCounter;
XSyncValue idle; XSyncValue idle;
if (!pIdleTimeValueLess && !pIdleTimeValueGreater) if (!pIdleTimeValueLess && !pIdleTimeValueGreater)
@ -2678,7 +2680,7 @@ IdleTimeWakeupHandler(pointer env, int rc, pointer LastSelectMask)
XSyncValueGreaterOrEqual(idle, *pIdleTimeValueGreater)) || XSyncValueGreaterOrEqual(idle, *pIdleTimeValueGreater)) ||
(pIdleTimeValueLess && (pIdleTimeValueLess &&
XSyncValueLessOrEqual(idle, *pIdleTimeValueLess))) { XSyncValueLessOrEqual(idle, *pIdleTimeValueLess))) {
SyncChangeCounter(IdleTimeCounter, idle); SyncChangeCounter(counter, idle);
} }
} }