diff options
| author | Mathieu Bérard <mathieu.berard@crans.org> | 2017-02-09 14:05:32 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-03-01 15:19:16 +0100 |
| commit | e70448087a05c123f916ff82f468e6d5fc57d714 (patch) | |
| tree | b9b00a4b9e3906c5d40a583f2f3628d4dd2fbe8b /nx-X11/programs/Xserver/os/WaitFor.c | |
| parent | f781b8e4c6137bb6428bfaf37aa364bb5b9ae4cf (diff) | |
| download | nx-libs-e70448087a05c123f916ff82f468e6d5fc57d714.tar.gz nx-libs-e70448087a05c123f916ff82f468e6d5fc57d714.tar.bz2 nx-libs-e70448087a05c123f916ff82f468e6d5fc57d714.zip | |
The smart scheduler is not optional.
Backported from X.org:
commit 9f9268821b13038556fbc029df54ab0e9b2aa77f
Author: Mathieu Bérard <mathieu.berard@crans.org>
Date: Mon Aug 11 13:52:38 2008 -0400
The smart scheduler is not optional.
Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Diffstat (limited to 'nx-X11/programs/Xserver/os/WaitFor.c')
| -rw-r--r-- | nx-X11/programs/Xserver/os/WaitFor.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/nx-X11/programs/Xserver/os/WaitFor.c b/nx-X11/programs/Xserver/os/WaitFor.c index 899b1de0b..0ecca8b7a 100644 --- a/nx-X11/programs/Xserver/os/WaitFor.c +++ b/nx-X11/programs/Xserver/os/WaitFor.c @@ -190,9 +190,7 @@ WaitForSomething(int *pClientsReady) int nready; fd_set devicesReadable; CARD32 now = 0; -#ifdef SMART_SCHEDULE Bool someReady = FALSE; -#endif #if defined(NX_TRANS_SOCKET) && defined(NX_TRANS_DEBUG) fprintf(stderr, "WaitForSomething: Got called.\n"); @@ -215,7 +213,6 @@ WaitForSomething(int *pClientsReady) ProcessWorkQueue(); if (XFD_ANYSET (&ClientsWithInput)) { -#ifdef SMART_SCHEDULE if (!SmartScheduleDisable) { someReady = TRUE; @@ -224,13 +221,11 @@ WaitForSomething(int *pClientsReady) wt = &waittime; } else -#endif { XFD_COPYSET (&ClientsWithInput, &clientsReadable); break; } } -#ifdef SMART_SCHEDULE if (someReady) { XFD_COPYSET(&AllSockets, &LastSelectMask); @@ -238,7 +233,6 @@ WaitForSomething(int *pClientsReady) } else { -#endif wt = NULL; if (timers) { @@ -252,10 +246,8 @@ WaitForSomething(int *pClientsReady) wt = &waittime; } XFD_COPYSET(&AllSockets, &LastSelectMask); -#ifdef SMART_SCHEDULE } SmartScheduleIdle = TRUE; -#endif BlockHandler((void *)&wt, (void *)&LastSelectMask); if (NewOutputPending) FlushAllOutput(); @@ -394,7 +386,6 @@ WaitForSomething(int *pClientsReady) i = XTestProcessInputAction (i, &waittime); } #endif /* XTESTEXT1 */ -#ifdef SMART_SCHEDULE if (i >= 0) { SmartScheduleIdle = FALSE; @@ -402,7 +393,6 @@ WaitForSomething(int *pClientsReady) if (SmartScheduleTimerStopped) (void) SmartScheduleStartTimer (); } -#endif if (i <= 0) /* An error or timeout occurred */ { #if defined(NX_TRANS_SOCKET) && defined(NX_TRANS_DEBUG) @@ -442,7 +432,6 @@ WaitForSomething(int *pClientsReady) selecterr); } } -#ifdef SMART_SCHEDULE else if (someReady) { /* @@ -452,7 +441,6 @@ WaitForSomething(int *pClientsReady) XFD_COPYSET(&ClientsWithInput, &clientsReadable); break; } -#endif #if defined(NX_TRANS_SOCKET) if (*checkForInput[0] != *checkForInput[1]) { @@ -499,10 +487,8 @@ WaitForSomething(int *pClientsReady) return 0; } } -#ifdef SMART_SCHEDULE if (someReady) XFD_ORSET(&LastSelectMask, &ClientsWithInput, &LastSelectMask); -#endif if (AnyClientsWriteBlocked && XFD_ANYSET (&clientsWritable)) { NewOutputPending = TRUE; |