2003-11-14 16:54:54 +01:00
|
|
|
/*
|
|
|
|
*
|
|
|
|
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 */
|
|
|
|
|
2005-07-03 09:02:09 +02:00
|
|
|
#ifdef HAVE_DIX_CONFIG_H
|
|
|
|
#include <dix-config.h>
|
|
|
|
#endif
|
|
|
|
|
2003-11-14 17:49:22 +01:00
|
|
|
#include "sleepuntil.h"
|
2005-04-20 14:25:48 +02:00
|
|
|
#include <X11/X.h>
|
|
|
|
#include <X11/Xmd.h>
|
2005-07-03 10:53:54 +02:00
|
|
|
#include "misc.h"
|
2003-11-14 16:54:54 +01:00
|
|
|
#include "windowstr.h"
|
|
|
|
#include "dixstruct.h"
|
|
|
|
#include "pixmapstr.h"
|
|
|
|
#include "scrnintstr.h"
|
|
|
|
|
|
|
|
typedef struct _Sertafied {
|
2012-03-21 20:55:09 +01:00
|
|
|
struct _Sertafied *next;
|
|
|
|
TimeStamp revive;
|
|
|
|
ClientPtr pClient;
|
|
|
|
XID id;
|
|
|
|
void (*notifyFunc) (ClientPtr /* client */ ,
|
2013-12-15 10:05:51 +01:00
|
|
|
void * /* closure */
|
2012-03-21 20:55:09 +01:00
|
|
|
);
|
|
|
|
|
2013-12-15 10:05:51 +01:00
|
|
|
void *closure;
|
2003-11-14 16:54:54 +01:00
|
|
|
} SertafiedRec, *SertafiedPtr;
|
|
|
|
|
|
|
|
static SertafiedPtr pPending;
|
2012-03-21 20:55:09 +01:00
|
|
|
static RESTYPE SertafiedResType;
|
|
|
|
static Bool BlockHandlerRegistered;
|
|
|
|
static int SertafiedGeneration;
|
|
|
|
|
|
|
|
static void ClientAwaken(ClientPtr /* client */ ,
|
2013-12-15 10:05:51 +01:00
|
|
|
void * /* closure */
|
2012-03-21 20:55:09 +01:00
|
|
|
);
|
2013-12-15 10:05:51 +01:00
|
|
|
static int SertafiedDelete(void * /* value */ ,
|
|
|
|
XID /* id */
|
2012-03-21 20:55:09 +01:00
|
|
|
);
|
2015-09-02 03:51:14 +02:00
|
|
|
static void SertafiedBlockHandler(void *data,
|
|
|
|
void *timeout);
|
|
|
|
|
|
|
|
static void SertafiedWakeupHandler(void *data,
|
|
|
|
int i);
|
2003-11-14 17:49:22 +01:00
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
int
|
2012-03-21 20:55:09 +01:00
|
|
|
ClientSleepUntil(ClientPtr client,
|
|
|
|
TimeStamp *revive,
|
2013-12-15 10:05:51 +01:00
|
|
|
void (*notifyFunc) (ClientPtr, void *), void *closure)
|
2003-11-14 16:54:54 +01:00
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
SertafiedPtr pRequest, pReq, pPrev;
|
|
|
|
|
|
|
|
if (SertafiedGeneration != serverGeneration) {
|
|
|
|
SertafiedResType = CreateNewResourceType(SertafiedDelete,
|
|
|
|
"ClientSleep");
|
|
|
|
if (!SertafiedResType)
|
|
|
|
return FALSE;
|
|
|
|
SertafiedGeneration = serverGeneration;
|
|
|
|
BlockHandlerRegistered = FALSE;
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
2012-03-21 20:55:09 +01:00
|
|
|
pRequest = malloc(sizeof(SertafiedRec));
|
2003-11-14 16:54:54 +01:00
|
|
|
if (!pRequest)
|
2012-03-21 20:55:09 +01:00
|
|
|
return FALSE;
|
2003-11-14 16:54:54 +01:00
|
|
|
pRequest->pClient = client;
|
|
|
|
pRequest->revive = *revive;
|
2012-03-21 20:55:09 +01:00
|
|
|
pRequest->id = FakeClientID(client->index);
|
2003-11-14 16:54:54 +01:00
|
|
|
pRequest->closure = closure;
|
2012-03-21 20:55:09 +01:00
|
|
|
if (!BlockHandlerRegistered) {
|
|
|
|
if (!RegisterBlockAndWakeupHandlers(SertafiedBlockHandler,
|
|
|
|
SertafiedWakeupHandler,
|
2013-12-15 10:05:51 +01:00
|
|
|
(void *) 0)) {
|
2012-03-21 20:55:09 +01:00
|
|
|
free(pRequest);
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
BlockHandlerRegistered = TRUE;
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
|
|
|
pRequest->notifyFunc = 0;
|
2013-12-15 10:05:51 +01:00
|
|
|
if (!AddResource(pRequest->id, SertafiedResType, (void *) pRequest))
|
2012-03-21 20:55:09 +01:00
|
|
|
return FALSE;
|
2003-11-14 16:54:54 +01:00
|
|
|
if (!notifyFunc)
|
2012-03-21 20:55:09 +01:00
|
|
|
notifyFunc = ClientAwaken;
|
2003-11-14 16:54:54 +01:00
|
|
|
pRequest->notifyFunc = notifyFunc;
|
|
|
|
/* Insert into time-ordered queue, with earliest activation time coming first. */
|
|
|
|
pPrev = 0;
|
2012-03-21 20:55:09 +01:00
|
|
|
for (pReq = pPending; pReq; pReq = pReq->next) {
|
|
|
|
if (CompareTimeStamps(pReq->revive, *revive) == LATER)
|
|
|
|
break;
|
|
|
|
pPrev = pReq;
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
|
|
|
if (pPrev)
|
2012-03-21 20:55:09 +01:00
|
|
|
pPrev->next = pRequest;
|
2003-11-14 16:54:54 +01:00
|
|
|
else
|
2012-03-21 20:55:09 +01:00
|
|
|
pPending = pRequest;
|
2003-11-14 16:54:54 +01:00
|
|
|
pRequest->next = pReq;
|
2012-03-21 20:55:09 +01:00
|
|
|
IgnoreClient(client);
|
2003-11-14 16:54:54 +01:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2013-12-15 10:05:51 +01:00
|
|
|
ClientAwaken(ClientPtr client, void *closure)
|
2003-11-14 16:54:54 +01:00
|
|
|
{
|
os: Don't crash in AttendClient if the client is gone
If a client is in the process of being closed down, then its client->osPrivate
pointer will be set to NULL by CloseDownConnection. This can cause a crash if
freeing the client's resources results in a call to AttendClient. For example,
if the client has a pending sync fence:
Thread 1 "X" received signal SIGSEGV, Segmentation fault.
AttendClient (client=0x5571c4aed9a0) at ../os/connection.c:942
(gdb) bt
#0 AttendClient (client=0x5571c4aed9a0) at ../os/connection.c:942
#1 0x00005571c3dbb865 in SyncAwaitTriggerFired (pTrigger=<optimized out>) at ../Xext/sync.c:694
#2 0x00005571c3dd5749 in miSyncDestroyFence (pFence=0x5571c5063980) at ../miext/sync/misync.c:120
#3 0x00005571c3dbbc69 in FreeFence (obj=<optimized out>, id=<optimized out>) at ../Xext/sync.c:1909
#4 0x00005571c3d7a01d in doFreeResource (res=0x5571c506e3d0, skip=skip@entry=0) at ../dix/resource.c:880
#5 0x00005571c3d7b1dc in FreeClientResources (client=0x5571c4aed9a0) at ../dix/resource.c:1146
#6 FreeClientResources (client=0x5571c4aed9a0) at ../dix/resource.c:1109
#7 0x00005571c3d5525f in CloseDownClient (client=0x5571c4aed9a0) at ../dix/dispatch.c:3473
#8 0x00005571c3d55eeb in Dispatch () at ../dix/dispatch.c:492
#9 0x00005571c3d59e96 in dix_main (argc=3, argv=0x7ffe7854bc28, envp=<optimized out>) at ../dix/main.c:276
#10 0x00007fea4837cb6b in __libc_start_main (main=0x5571c3d1d060 <main>, argc=3, argv=0x7ffe7854bc28, init=<optimized out>, fini=<optimized out>, rtld_fini=<optimized out>, stack_end=0x7ffe7854bc18) at ../csu/libc-start.c:308
#11 0x00005571c3d1d09a in _start () at ../Xext/sync.c:2378
(gdb) print client->osPrivate
$1 = (void *) 0x0
Since the client is about to be freed, its ignore count doesn't matter and
AttendClient can simply be a no-op. Check for client->clientGone in AttendClient
and remove similar checks from two callers that had them.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
2019-11-19 19:08:51 +01:00
|
|
|
AttendClient(client);
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2013-12-15 10:05:51 +01:00
|
|
|
SertafiedDelete(void *value, XID id)
|
2003-11-14 16:54:54 +01:00
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
SertafiedPtr pRequest = (SertafiedPtr) value;
|
|
|
|
SertafiedPtr pReq, pPrev;
|
2003-11-14 16:54:54 +01:00
|
|
|
|
|
|
|
pPrev = 0;
|
|
|
|
for (pReq = pPending; pReq; pPrev = pReq, pReq = pReq->next)
|
2012-03-21 20:55:09 +01:00
|
|
|
if (pReq == pRequest) {
|
|
|
|
if (pPrev)
|
|
|
|
pPrev->next = pReq->next;
|
|
|
|
else
|
|
|
|
pPending = pReq->next;
|
|
|
|
break;
|
|
|
|
}
|
2003-11-14 16:54:54 +01:00
|
|
|
if (pRequest->notifyFunc)
|
2012-03-21 20:55:09 +01:00
|
|
|
(*pRequest->notifyFunc) (pRequest->pClient, pRequest->closure);
|
2010-05-05 20:44:06 +02:00
|
|
|
free(pRequest);
|
2003-11-14 16:54:54 +01:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2015-09-02 03:51:14 +02:00
|
|
|
SertafiedBlockHandler(void *data, void *wt)
|
2003-11-14 16:54:54 +01:00
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
SertafiedPtr pReq, pNext;
|
|
|
|
unsigned long delay;
|
|
|
|
TimeStamp now;
|
2003-11-14 16:54:54 +01:00
|
|
|
|
|
|
|
if (!pPending)
|
2012-03-21 20:55:09 +01:00
|
|
|
return;
|
|
|
|
now.milliseconds = GetTimeInMillis();
|
2003-11-14 16:54:54 +01:00
|
|
|
now.months = currentTime.months;
|
|
|
|
if ((int) (now.milliseconds - currentTime.milliseconds) < 0)
|
2012-03-21 20:55:09 +01:00
|
|
|
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);
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
|
|
|
pReq = pPending;
|
|
|
|
if (!pReq)
|
2012-03-21 20:55:09 +01:00
|
|
|
return;
|
2003-11-14 17:49:22 +01:00
|
|
|
delay = pReq->revive.milliseconds - now.milliseconds;
|
2012-03-21 20:55:09 +01:00
|
|
|
AdjustWaitForDelay(wt, delay);
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2015-09-02 03:51:14 +02:00
|
|
|
SertafiedWakeupHandler(void *data, int i)
|
2003-11-14 16:54:54 +01:00
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
SertafiedPtr pReq, pNext;
|
|
|
|
TimeStamp now;
|
2003-11-14 16:54:54 +01:00
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
now.milliseconds = GetTimeInMillis();
|
2003-11-14 16:54:54 +01:00
|
|
|
now.months = currentTime.months;
|
|
|
|
if ((int) (now.milliseconds - currentTime.milliseconds) < 0)
|
2012-03-21 20:55:09 +01:00
|
|
|
now.months++;
|
|
|
|
for (pReq = pPending; pReq; pReq = pNext) {
|
|
|
|
pNext = pReq->next;
|
|
|
|
if (CompareTimeStamps(pReq->revive, now) == LATER)
|
|
|
|
break;
|
|
|
|
FreeResource(pReq->id, RT_NONE);
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
2012-03-21 20:55:09 +01:00
|
|
|
if (!pPending) {
|
|
|
|
RemoveBlockAndWakeupHandlers(SertafiedBlockHandler,
|
2013-12-15 10:05:51 +01:00
|
|
|
SertafiedWakeupHandler, (void *) 0);
|
2012-03-21 20:55:09 +01:00
|
|
|
BlockHandlerRegistered = FALSE;
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
|
|
|
}
|