9838b7032e
This is strictly the application of the script 'x-indent-all.sh' from util/modular. Compared to the patch that Daniel posted in January, I've added a few indent flags: -bap -psl -T PrivatePtr -T pmWait -T _XFUNCPROTOBEGIN -T _XFUNCPROTOEND -T _X_EXPORT The typedefs were needed to make the output of sdksyms.sh match the previous output, otherwise, the code is formatted badly enough that sdksyms.sh generates incorrect output. The generated code was compared with the previous version and found to be essentially identical -- "assert" line numbers and BUILD_TIME were the only differences found. The comparison was done with this script: dir1=$1 dir2=$2 for dir in $dir1 $dir2; do (cd $dir && find . -name '*.o' | while read file; do dir=`dirname $file` base=`basename $file .o` dump=$dir/$base.dump objdump -d $file > $dump done) done find $dir1 -name '*.dump' | while read dump; do otherdump=`echo $dump | sed "s;$dir1;$dir2;"` diff -u $dump $otherdump done Signed-off-by: Keith Packard <keithp@keithp.com> Acked-by: Daniel Stone <daniel@fooishbar.org> Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
210 lines
6.4 KiB
C
210 lines
6.4 KiB
C
/*
|
|
*
|
|
Copyright 1992, 1998 The Open Group
|
|
|
|
Permission to use, copy, modify, distribute, and sell this software and its
|
|
documentation for any purpose is hereby granted without fee, provided that
|
|
the above copyright notice appear in all copies and that both that
|
|
copyright notice and this permission notice appear in supporting
|
|
documentation.
|
|
|
|
The above copyright notice and this permission notice shall be included in
|
|
all copies or substantial portions of the Software.
|
|
|
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
|
|
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
|
|
Except as contained in this notice, the name of The Open Group shall not be
|
|
used in advertising or otherwise to promote the sale, use or other dealings
|
|
in this Software without prior written authorization from The Open Group.
|
|
*
|
|
* Author: Keith Packard, MIT X Consortium
|
|
*/
|
|
|
|
/* dixsleep.c - implement millisecond timeouts for X clients */
|
|
|
|
#ifdef HAVE_DIX_CONFIG_H
|
|
#include <dix-config.h>
|
|
#endif
|
|
|
|
#include "sleepuntil.h"
|
|
#include <X11/X.h>
|
|
#include <X11/Xmd.h>
|
|
#include "misc.h"
|
|
#include "windowstr.h"
|
|
#include "dixstruct.h"
|
|
#include "pixmapstr.h"
|
|
#include "scrnintstr.h"
|
|
|
|
typedef struct _Sertafied {
|
|
struct _Sertafied *next;
|
|
TimeStamp revive;
|
|
ClientPtr pClient;
|
|
XID id;
|
|
void (*notifyFunc) (ClientPtr /* client */ ,
|
|
pointer /* closure */
|
|
);
|
|
|
|
pointer closure;
|
|
} SertafiedRec, *SertafiedPtr;
|
|
|
|
static SertafiedPtr pPending;
|
|
static RESTYPE SertafiedResType;
|
|
static Bool BlockHandlerRegistered;
|
|
static int SertafiedGeneration;
|
|
|
|
static void ClientAwaken(ClientPtr /* client */ ,
|
|
pointer /* closure */
|
|
);
|
|
static int SertafiedDelete(pointer /* value */ ,
|
|
XID /* id */
|
|
);
|
|
static void SertafiedBlockHandler(pointer /* data */ ,
|
|
OSTimePtr /* wt */ ,
|
|
pointer /* LastSelectMask */
|
|
);
|
|
static void SertafiedWakeupHandler(pointer /* data */ ,
|
|
int /* i */ ,
|
|
pointer /* LastSelectMask */
|
|
);
|
|
|
|
int
|
|
ClientSleepUntil(ClientPtr client,
|
|
TimeStamp *revive,
|
|
void (*notifyFunc) (ClientPtr, pointer), pointer closure)
|
|
{
|
|
SertafiedPtr pRequest, pReq, pPrev;
|
|
|
|
if (SertafiedGeneration != serverGeneration) {
|
|
SertafiedResType = CreateNewResourceType(SertafiedDelete,
|
|
"ClientSleep");
|
|
if (!SertafiedResType)
|
|
return FALSE;
|
|
SertafiedGeneration = serverGeneration;
|
|
BlockHandlerRegistered = FALSE;
|
|
}
|
|
pRequest = malloc(sizeof(SertafiedRec));
|
|
if (!pRequest)
|
|
return FALSE;
|
|
pRequest->pClient = client;
|
|
pRequest->revive = *revive;
|
|
pRequest->id = FakeClientID(client->index);
|
|
pRequest->closure = closure;
|
|
if (!BlockHandlerRegistered) {
|
|
if (!RegisterBlockAndWakeupHandlers(SertafiedBlockHandler,
|
|
SertafiedWakeupHandler,
|
|
(pointer) 0)) {
|
|
free(pRequest);
|
|
return FALSE;
|
|
}
|
|
BlockHandlerRegistered = TRUE;
|
|
}
|
|
pRequest->notifyFunc = 0;
|
|
if (!AddResource(pRequest->id, SertafiedResType, (pointer) pRequest))
|
|
return FALSE;
|
|
if (!notifyFunc)
|
|
notifyFunc = ClientAwaken;
|
|
pRequest->notifyFunc = notifyFunc;
|
|
/* Insert into time-ordered queue, with earliest activation time coming first. */
|
|
pPrev = 0;
|
|
for (pReq = pPending; pReq; pReq = pReq->next) {
|
|
if (CompareTimeStamps(pReq->revive, *revive) == LATER)
|
|
break;
|
|
pPrev = pReq;
|
|
}
|
|
if (pPrev)
|
|
pPrev->next = pRequest;
|
|
else
|
|
pPending = pRequest;
|
|
pRequest->next = pReq;
|
|
IgnoreClient(client);
|
|
return TRUE;
|
|
}
|
|
|
|
static void
|
|
ClientAwaken(ClientPtr client, pointer closure)
|
|
{
|
|
if (!client->clientGone)
|
|
AttendClient(client);
|
|
}
|
|
|
|
static int
|
|
SertafiedDelete(pointer value, XID id)
|
|
{
|
|
SertafiedPtr pRequest = (SertafiedPtr) value;
|
|
SertafiedPtr pReq, pPrev;
|
|
|
|
pPrev = 0;
|
|
for (pReq = pPending; pReq; pPrev = pReq, pReq = pReq->next)
|
|
if (pReq == pRequest) {
|
|
if (pPrev)
|
|
pPrev->next = pReq->next;
|
|
else
|
|
pPending = pReq->next;
|
|
break;
|
|
}
|
|
if (pRequest->notifyFunc)
|
|
(*pRequest->notifyFunc) (pRequest->pClient, pRequest->closure);
|
|
free(pRequest);
|
|
return TRUE;
|
|
}
|
|
|
|
static void
|
|
SertafiedBlockHandler(pointer data, OSTimePtr wt, pointer LastSelectMask)
|
|
{
|
|
SertafiedPtr pReq, pNext;
|
|
unsigned long delay;
|
|
TimeStamp now;
|
|
|
|
if (!pPending)
|
|
return;
|
|
now.milliseconds = GetTimeInMillis();
|
|
now.months = currentTime.months;
|
|
if ((int) (now.milliseconds - currentTime.milliseconds) < 0)
|
|
now.months++;
|
|
for (pReq = pPending; pReq; pReq = pNext) {
|
|
pNext = pReq->next;
|
|
if (CompareTimeStamps(pReq->revive, now) == LATER)
|
|
break;
|
|
FreeResource(pReq->id, RT_NONE);
|
|
|
|
/* AttendClient() may have been called via the resource delete
|
|
* function so a client may have input to be processed and so
|
|
* set delay to 0 to prevent blocking in WaitForSomething().
|
|
*/
|
|
AdjustWaitForDelay(wt, 0);
|
|
}
|
|
pReq = pPending;
|
|
if (!pReq)
|
|
return;
|
|
delay = pReq->revive.milliseconds - now.milliseconds;
|
|
AdjustWaitForDelay(wt, delay);
|
|
}
|
|
|
|
static void
|
|
SertafiedWakeupHandler(pointer data, int i, pointer LastSelectMask)
|
|
{
|
|
SertafiedPtr pReq, pNext;
|
|
TimeStamp now;
|
|
|
|
now.milliseconds = GetTimeInMillis();
|
|
now.months = currentTime.months;
|
|
if ((int) (now.milliseconds - currentTime.milliseconds) < 0)
|
|
now.months++;
|
|
for (pReq = pPending; pReq; pReq = pNext) {
|
|
pNext = pReq->next;
|
|
if (CompareTimeStamps(pReq->revive, now) == LATER)
|
|
break;
|
|
FreeResource(pReq->id, RT_NONE);
|
|
}
|
|
if (!pPending) {
|
|
RemoveBlockAndWakeupHandlers(SertafiedBlockHandler,
|
|
SertafiedWakeupHandler, (pointer) 0);
|
|
BlockHandlerRegistered = FALSE;
|
|
}
|
|
}
|