diff options
Diffstat (limited to 'xorg-server/os/WaitFor.c')
| -rw-r--r-- | xorg-server/os/WaitFor.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/xorg-server/os/WaitFor.c b/xorg-server/os/WaitFor.c index da12976ca..d6dd99553 100644 --- a/xorg-server/os/WaitFor.c +++ b/xorg-server/os/WaitFor.c @@ -155,9 +155,7 @@ WaitForSomething(int *pClientsReady) int nready; fd_set devicesReadable; CARD32 now = 0; -#ifdef SMART_SCHEDULE Bool someReady = FALSE; -#endif FD_ZERO(&clientsReadable); @@ -170,7 +168,6 @@ WaitForSomething(int *pClientsReady) ProcessWorkQueue(); if (XFD_ANYSET (&ClientsWithInput)) { -#ifdef SMART_SCHEDULE if (!SmartScheduleDisable) { someReady = TRUE; @@ -179,13 +176,11 @@ WaitForSomething(int *pClientsReady) wt = &waittime; } else -#endif { XFD_COPYSET (&ClientsWithInput, &clientsReadable); break; } } -#ifdef SMART_SCHEDULE if (someReady) { XFD_COPYSET(&AllSockets, &LastSelectMask); @@ -193,7 +188,6 @@ WaitForSomething(int *pClientsReady) } else { -#endif wt = NULL; if (timers) { @@ -215,11 +209,9 @@ WaitForSomething(int *pClientsReady) } } XFD_COPYSET(&AllSockets, &LastSelectMask); -#ifdef SMART_SCHEDULE } SmartScheduleStopTimer (); -#endif BlockHandler((pointer)&wt, (pointer)&LastSelectMask); if (NewOutputPending) FlushAllOutput(); @@ -237,9 +229,7 @@ WaitForSomething(int *pClientsReady) } selecterr = GetErrno(); WakeupHandler(i, (pointer)&LastSelectMask); -#ifdef SMART_SCHEDULE SmartScheduleStartTimer (); -#endif if (i <= 0) /* An error or timeout occurred */ { if (dispatchException) @@ -263,7 +253,6 @@ WaitForSomething(int *pClientsReady) strerror(selecterr)); } } -#ifdef SMART_SCHEDULE else if (someReady) { /* @@ -273,7 +262,6 @@ WaitForSomething(int *pClientsReady) XFD_COPYSET(&ClientsWithInput, &clientsReadable); break; } -#endif if (*checkForInput[0] != *checkForInput[1]) return 0; @@ -310,10 +298,8 @@ WaitForSomething(int *pClientsReady) return 0; } } -#ifdef SMART_SCHEDULE if (someReady) XFD_ORSET(&LastSelectMask, &ClientsWithInput, &LastSelectMask); -#endif if (AnyClientsWriteBlocked && XFD_ANYSET (&clientsWritable)) { NewOutputPending = TRUE; @@ -364,7 +350,6 @@ WaitForSomething(int *pClientsReady) curclient = XFD_FD(&savedClientsReadable, i); client_index = GetConnectionTranslation(curclient); #endif -#ifdef XSYNC /* We implement "strict" priorities. * Only the highest priority client is returned to * dix. If multiple clients at the same priority are @@ -391,7 +376,6 @@ WaitForSomething(int *pClientsReady) * clients get batched together */ else if (client_priority == highest_priority) -#endif { pClientsReady[nready++] = client_index; } |