XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-24 05:54:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

dbe: ProcDbeGetVisualInfo(): reduce temporary allocations

Browse Source 
Since we're now constructing the payload step by step via x_rpcbuf,
there's no need to have an extra loop for collecting dbeScreenVisualInfo's,
we can just fetch and process them one by one, and so don't need extra
temporary storage for them.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-07-15 21:00:28 +02:00
committed by Enrico Weigelt
parent 1bcff3fe35
commit 7a4bf5ab10
1 changed files with 13 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
dbe/dbe.c
View File

@@ -565,8 +565,6 @@ ProcDbeGetVisualInfo(ClientPtr client)
DrawablePtr *pDrawables = NULL;
register int i, rc;
register int count; /* number of visual infos in reply */
ScreenPtr pScreen;
XdbeScreenVisualInfo *pScrVisInfo;
REQUEST_AT_LEAST_SIZE(xDbeGetVisualInfoReq);
if (stuff->n > UINT32_MAX / sizeof(CARD32))
@@ -597,14 +595,8 @@ ProcDbeGetVisualInfo(ClientPtr client)
x_rpcbuf_t rpcbuf = { .swapped = client->swapped, .err_clear = TRUE };
if (!(pScrVisInfo = calloc(count, sizeof(XdbeScreenVisualInfo)))) {
free(pDrawables);
return BadAlloc;
}
for (i = 0; i < count; i++) {
pScreen = (stuff->n == 0) ? screenInfo.screens[i] :
ScreenPtr pScreen = (stuff->n == 0) ? screenInfo.screens[i] :
pDrawables[i]->pScreen;
pDbeScreenPriv = DBE_SCREEN_PRIV(pScreen);
@@ -612,35 +604,35 @@ ProcDbeGetVisualInfo(ClientPtr client)
if (rc != Success)
goto clearRpcBuf;
if (!(*pDbeScreenPriv->GetVisualInfo) (pScreen, &pScrVisInfo[i])) {
/* We failed to alloc pScrVisInfo[i].visinfo. */
XdbeScreenVisualInfo visualInfo = { 0 };
if (!(pDbeScreenPriv->GetVisualInfo(pScreen, &visualInfo))) {
/* We failed to alloc visualInfo.visinfo. */
rc = BadAlloc;
/* Free visinfos that we allocated for previous screen infos. */
goto clearRpcBuf;
}
}
for (i = 0; i < count; i++) {
const size_t numVisuals = pScrVisInfo[i].count;
/* ensure enough buffer space here, so we don't need to check for
errors on individual operations */
if (!x_rpcbuf_makeroom(&rpcbuf, (numVisuals+1)*8)) {
if (!x_rpcbuf_makeroom(&rpcbuf, (visualInfo.count+1)*8)) {
rc = BadAlloc;
free(visualInfo.visinfo);
goto clearRpcBuf;
}
/* For each screen in the reply, send off the visual info */
x_rpcbuf_write_CARD32(&rpcbuf, numVisuals);
for (int j = 0; j < numVisuals; j++) {
x_rpcbuf_write_CARD32(&rpcbuf, visualInfo.count);
for (int j = 0; j < visualInfo.count; j++) {
/* Write visualID(32), depth(8), perfLevel(8), and pad(16). */
x_rpcbuf_write_CARD32(&rpcbuf, pScrVisInfo[i].visinfo[j].visual);
x_rpcbuf_write_CARD8(&rpcbuf, pScrVisInfo[i].visinfo[j].depth);
x_rpcbuf_write_CARD8(&rpcbuf, pScrVisInfo[i].visinfo[j].perflevel);
x_rpcbuf_write_CARD32(&rpcbuf, visualInfo.visinfo[j].visual);
x_rpcbuf_write_CARD8(&rpcbuf, visualInfo.visinfo[j].depth);
x_rpcbuf_write_CARD8(&rpcbuf, visualInfo.visinfo[j].perflevel);
x_rpcbuf_write_CARD16(&rpcbuf, 0);
}
free(visualInfo.visinfo);
}
if (rpcbuf.error) {
@@ -667,12 +659,6 @@ ProcDbeGetVisualInfo(ClientPtr client)
clearRpcBuf:
x_rpcbuf_clear(&rpcbuf);
/* Clean up memory. */
for (i = 0; i < count; i++) {
free(pScrVisInfo[i].visinfo);
}
free(pScrVisInfo);
free(pDrawables);
return rc;