93 lines
2.6 KiB
Diff
93 lines
2.6 KiB
Diff
|
From 1472048b7a02d1b7fc25cfeda761db23fba21eac Mon Sep 17 00:00:00 2001
|
|||
|
|
From: Olivier Fourdan <ofourdan@redhat.com>
|
|||
|
|
Date: Fri, 7 Jun 2024 09:05:55 +0200
|
|||
|
|
Subject: [PATCH 3/3] Make colormap private interfaces thread safe.
|
|||
|
|
|
|||
|
|
Protect access to the dpy structure by a display lock, so that these can
|
|||
|
|
be called outside of a global display lock.
|
|||
|
|
|
|||
|
|
That allows the XCMS colormap functions to be thread safe without having
|
|||
|
|
the whole functions within a display lock, to avoid deadlocks.
|
|||
|
|
|
|||
|
|
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
|
|||
|
|
See-also: https://gitlab.freedesktop.org/xorg/lib/libx11/-/issues/215
|
|||
|
|
See-also: https://gitlab.freedesktop.org/xorg/lib/libx11/-/issues/94
|
|||
|
|
Reviewed-by: Adam Jackson <ajax@redhat.com>
|
|||
|
|
Part-of: <https://gitlab.freedesktop.org/xorg/lib/libx11/-/merge_requests/254>
|
|||
|
|
---
|
|||
|
|
src/xcms/cmsCmap.c | 14 ++++++++++++++
|
|||
|
|
1 file changed, 14 insertions(+)
|
|||
|
|
|
|||
|
|
diff --git a/src/xcms/cmsCmap.c b/src/xcms/cmsCmap.c
|
|||
|
|
index c7087ecb..4b229477 100644
|
|||
|
|
--- a/src/xcms/cmsCmap.c
|
|||
|
|
+++ b/src/xcms/cmsCmap.c
|
|||
|
|
@@ -87,12 +87,17 @@ CmapRecForColormap(
|
|||
|
|
_XAsyncHandler async;
|
|||
|
|
_XAsyncErrorState async_state;
|
|||
|
|
|
|||
|
|
+ LockDisplay(dpy);
|
|||
|
|
for (pRec = (XcmsCmapRec *)dpy->cms.clientCmaps; pRec != NULL;
|
|||
|
|
pRec = pRec->pNext) {
|
|||
|
|
if (pRec->cmapID == cmap) {
|
|||
|
|
+ UnlockDisplay(dpy);
|
|||
|
|
+ SyncHandle();
|
|||
|
|
return(pRec);
|
|||
|
|
}
|
|||
|
|
}
|
|||
|
|
+ UnlockDisplay(dpy);
|
|||
|
|
+ SyncHandle();
|
|||
|
|
|
|||
|
|
/*
|
|||
|
|
* Can't find an XcmsCmapRec associated with cmap in our records.
|
|||
|
|
@@ -258,9 +263,12 @@ _XcmsAddCmapRec(
|
|||
|
|
pNew->dpy = dpy;
|
|||
|
|
pNew->windowID = windowID;
|
|||
|
|
pNew->visual = visual;
|
|||
|
|
+ LockDisplay(dpy);
|
|||
|
|
pNew->pNext = (XcmsCmapRec *)dpy->cms.clientCmaps;
|
|||
|
|
dpy->cms.clientCmaps = (XPointer)pNew;
|
|||
|
|
dpy->free_funcs->clientCmaps = _XcmsFreeClientCmaps;
|
|||
|
|
+ UnlockDisplay(dpy);
|
|||
|
|
+ SyncHandle();
|
|||
|
|
|
|||
|
|
/*
|
|||
|
|
* Note, we don't create the XcmsCCC for pNew->ccc here because
|
|||
|
|
@@ -342,6 +350,7 @@ _XcmsDeleteCmapRec(
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
/* search for it in the list */
|
|||
|
|
+ LockDisplay(dpy);
|
|||
|
|
pPrevPtr = (XcmsCmapRec **)&dpy->cms.clientCmaps;
|
|||
|
|
while ((pRec = *pPrevPtr) && (pRec->cmapID != cmap)) {
|
|||
|
|
pPrevPtr = &pRec->pNext;
|
|||
|
|
@@ -354,6 +363,8 @@ _XcmsDeleteCmapRec(
|
|||
|
|
*pPrevPtr = pRec->pNext;
|
|||
|
|
Xfree(pRec);
|
|||
|
|
}
|
|||
|
|
+ UnlockDisplay(dpy);
|
|||
|
|
+ SyncHandle();
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
|
|||
|
|
@@ -378,6 +389,7 @@ _XcmsFreeClientCmaps(
|
|||
|
|
{
|
|||
|
|
XcmsCmapRec *pRecNext, *pRecFree;
|
|||
|
|
|
|||
|
|
+ LockDisplay(dpy);
|
|||
|
|
pRecNext = (XcmsCmapRec *)dpy->cms.clientCmaps;
|
|||
|
|
while (pRecNext != NULL) {
|
|||
|
|
pRecFree = pRecNext;
|
|||
|
|
@@ -390,6 +402,8 @@ _XcmsFreeClientCmaps(
|
|||
|
|
Xfree(pRecFree);
|
|||
|
|
}
|
|||
|
|
dpy->cms.clientCmaps = (XPointer)NULL;
|
|||
|
|
+ UnlockDisplay(dpy);
|
|||
|
|
+ SyncHandle();
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
|
|||
|
|
--
|
|||
|
|
2.45.2
|
|||
|
|
|