From e70448087a05c123f916ff82f468e6d5fc57d714 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathieu=20B=C3=A9rard?= <mathieu.berard@crans.org>
Date: Thu, 9 Feb 2017 14:05:32 +0100
Subject: The smart scheduler is not optional.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 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>
---
 nx-X11/programs/Xserver/hw/nxagent/Handlers.c | 36 ---------------------------
 1 file changed, 36 deletions(-)

(limited to 'nx-X11/programs/Xserver/hw/nxagent/Handlers.c')

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c
index 1721be9fb..8e80a1524 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c
@@ -564,16 +564,12 @@ void nxagentBlockHandler(void * data, struct timeval **timeout, void * mask)
    * the client is scheduled in.
    */
 
-  #ifdef SMART_SCHEDULE
-
   #ifdef DEBUG
   fprintf(stderr, "nxagentBlockHandler: Stopping the smart schedule timer.\n");
   #endif
 
   nxagentStopTimer();
 
-  #endif
-
   nxagentPrintGeometry();
 
   #ifdef BLOCKS
@@ -601,13 +597,9 @@ void nxagentWakeupHandler(void * data, int count, void * mask)
     nxagentHandleConnectionStates();
   }
 
-  #ifdef SMART_SCHEDULE
-
   if (SmartScheduleDisable == 1)
   {
 
-  #endif
-
     #ifdef DEBUG
     fprintf(stderr, "nxagentWakeupHandler: Resetting the dispatch state after wakeup.\n");
     #endif
@@ -617,12 +609,8 @@ void nxagentWakeupHandler(void * data, int count, void * mask)
     nxagentDispatch.in  = nxagentBytesIn;
     nxagentDispatch.out = nxagentBytesOut;
 
-  #ifdef SMART_SCHEDULE
-
   }
 
-  #endif
-
   /*
    * Can become true during the dispatch loop.
    */
@@ -897,13 +885,9 @@ void nxagentShadowWakeupHandler(void * data, int count, void * mask)
     nxagentHandleConnectionStates();
   }
 
-  #ifdef SMART_SCHEDULE
-
   if (SmartScheduleDisable == 1)
   {
 
-  #endif
-
     #ifdef DEBUG
     fprintf(stderr, "nxagentShadowWakeupHandler: Resetting the dispatch state after wakeup.\n");
     #endif
@@ -913,12 +897,8 @@ void nxagentShadowWakeupHandler(void * data, int count, void * mask)
     nxagentDispatch.in  = nxagentBytesIn;
     nxagentDispatch.out = nxagentBytesOut;
 
-  #ifdef SMART_SCHEDULE
-
   }
 
-  #endif
-
   /*
    * Can become true during the dispatch loop.
    */
@@ -1095,13 +1075,9 @@ void nxagentDispatchHandler(ClientPtr client, int in, int out)
       #endif
     }
 
-    #ifdef SMART_SCHEDULE
-
     if (SmartScheduleDisable == 1)
     {
 
-    #endif
-
       /*
        * Pay attention to the next client if this
        * client produced enough output.
@@ -1131,12 +1107,8 @@ void nxagentDispatchHandler(ClientPtr client, int in, int out)
       }
       #endif
 
-    #ifdef SMART_SCHEDULE
-
     }
 
-    #endif
-
     return;
   }
   else if (in > 0)
@@ -1178,13 +1150,9 @@ void nxagentDispatchHandler(ClientPtr client, int in, int out)
      * the inner dispatch loop forever.
      */
 
-    #ifdef SMART_SCHEDULE
-
     if (SmartScheduleDisable == 1)
     {
 
-    #endif
-
       if  (client -> index != nxagentDispatch.client)
       {
         #ifdef DEBUG
@@ -1230,12 +1198,8 @@ void nxagentDispatchHandler(ClientPtr client, int in, int out)
         #endif
       }
 
-    #ifdef SMART_SCHEDULE
-
     }
 
-    #endif
-
   }
 
   /*
-- 
cgit v1.2.3