From a414db021575accff64abad6f1047245e81c7476 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Thu, 19 May 2016 15:08:05 -0700 Subject: [PATCH] dix: Intermediate GrabServer state 'GrabKickout' not needed The intermediate grabState, "GrabKickout", was used to trigger dispatch into going back to WaitForSomething after doing a GrabServer so that the set of ready clients would be recomputed to match what the server should be processing. As we only process one client per WaitForSomething call, we will always hit WaitForSomething after finishing the current client, and so don't need any special case here. Signed-off-by: Keith Packard Reviewed-by: Adam Jackson --- dix/dispatch.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dix/dispatch.c b/dix/dispatch.c index 28a3c3f5f..7eb200dc4 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -151,7 +151,6 @@ static ClientPtr grabClient; #define GrabNone 0 #define GrabActive 1 -#define GrabKickout 2 static int grabState = GrabNone; static long grabWaiters[mskcnt]; CallbackListPtr ServerGrabCallback = NULL; @@ -375,11 +374,6 @@ Dispatch(void) /* KillClient can cause this to happen */ continue; } - /* GrabServer activation can cause this to be true */ - if (grabState == GrabKickout) { - grabState = GrabActive; - break; - } isItTimeToYield = FALSE; start_tick = SmartScheduleTime; @@ -1059,7 +1053,7 @@ ProcGrabServer(ClientPtr client) rc = OnlyListenToOneClient(client); if (rc != Success) return rc; - grabState = GrabKickout; + grabState = GrabActive; grabClient = client; if (ServerGrabCallback) {