[PATCH xserver (v2)] X Sync Cleanups
James Jones
jajones at nvidia.com
Mon Dec 20 10:27:57 PST 2010
Various cleanups identified during review of the
X Sync Fence Object patches.
-Correctly handle failure of AddResource()
-Don't assert when data structures are corrupt. Instead,
use a new helper function to check for counter sync
objects when they're expected, and warn if the type is
wrong.
-Use the default switch label rather than reimplementing
it.
-Re-introduce cast of result of dixAllocateObjectWithPrivate()
to kill an incompatible pointer type warning.
-Remove comments claiming protocol updates are needed. One
wasn't true and the other was addressed with a xextproto
change.
-Return BadFence, not BadCounter from XSyncAwaitFence()
Signed-off-by: James Jones <jajones at nvidia.com>
Reviewed-by: Keith Packard <keithp at keithp.com>
---
Xext/sync.c | 138 ++++++++++++++++++++++++++++++++++------------------------
1 files changed, 81 insertions(+), 57 deletions(-)
diff --git a/Xext/sync.c b/Xext/sync.c
index ab8f20d..29e729d 100644
--- a/Xext/sync.c
+++ b/Xext/sync.c
@@ -91,6 +91,14 @@ static RESTYPE RTFence;
static int SyncNumSystemCounters = 0;
static SyncCounter **SysCounterList = NULL;
+static const char *WARN_INVALID_COUNTER_COMPARE =
+"Warning: Non-counter XSync object using Counter-only\n"
+" comparison. Result will never be true.\n";
+
+static const char *WARN_INVALID_COUNTER_ALARM =
+"Warning: Non-counter XSync object used in alarm. This is\n"
+" the result of a programming error in the X server.\n";
+
#define IsSystemCounter(pCounter) \
(pCounter && (pCounter->sync.client == NULL))
@@ -104,6 +112,18 @@ static void SyncInitServerTime(void);
static void SyncInitIdleTime(void);
+static Bool
+SyncCheckWarnIsCounter(const SyncObject* pSync, const char *warning)
+{
+ if (pSync && (SYNC_COUNTER != pSync->type))
+ {
+ ErrorF("%s", warning);
+ ErrorF(" Counter type: %d\n", pSync->type);
+ return FALSE;
+ }
+
+ return TRUE;
+}
/* Each counter maintains a simple linked list of triggers that are
* interested in the counter. The two functions below are used to
@@ -191,7 +211,6 @@ SyncAddTriggerToSyncObject(SyncTrigger *pTrigger)
return Success;
}
-
/* Below are five possible functions that can be plugged into
* pTrigger->CheckTrigger for counter sync objects, corresponding to
* the four possible test-types, and the one possible function that
@@ -212,7 +231,12 @@ SyncCheckTriggerPositiveComparison(SyncTrigger *pTrigger, CARD64 oldval)
{
SyncCounter *pCounter;
- assert(!pTrigger->pSync || (SYNC_COUNTER == pTrigger->pSync->type));
+
+ /* Non-counter sync objects should never get here because they
+ * never trigger this comparison. */
+ if (!SyncCheckWarnIsCounter(pTrigger->pSync, WARN_INVALID_COUNTER_COMPARE))
+ return FALSE;
+
pCounter = (SyncCounter *)pTrigger->pSync;
return (pCounter == NULL ||
@@ -224,7 +248,11 @@ SyncCheckTriggerNegativeComparison(SyncTrigger *pTrigger, CARD64 oldval)
{
SyncCounter *pCounter;
- assert(!pTrigger->pSync || (SYNC_COUNTER == pTrigger->pSync->type));
+ /* Non-counter sync objects should never get here because they
+ * never trigger this comparison. */
+ if (!SyncCheckWarnIsCounter(pTrigger->pSync, WARN_INVALID_COUNTER_COMPARE))
+ return FALSE;
+
pCounter = (SyncCounter *)pTrigger->pSync;
return (pCounter == NULL ||
@@ -236,7 +264,11 @@ SyncCheckTriggerPositiveTransition(SyncTrigger *pTrigger, CARD64 oldval)
{
SyncCounter *pCounter;
- assert(!pTrigger->pSync || (SYNC_COUNTER == pTrigger->pSync->type));
+ /* Non-counter sync objects should never get here because they
+ * never trigger this comparison. */
+ if (!SyncCheckWarnIsCounter(pTrigger->pSync, WARN_INVALID_COUNTER_COMPARE))
+ return FALSE;
+
pCounter = (SyncCounter *)pTrigger->pSync;
return (pCounter == NULL ||
@@ -249,7 +281,11 @@ SyncCheckTriggerNegativeTransition(SyncTrigger *pTrigger, CARD64 oldval)
{
SyncCounter *pCounter;
- assert(!pTrigger->pSync || (SYNC_COUNTER == pTrigger->pSync->type));
+ /* Non-counter sync objects should never get here because they
+ * never trigger this comparison. */
+ if (!SyncCheckWarnIsCounter(pTrigger->pSync, WARN_INVALID_COUNTER_COMPARE))
+ return FALSE;
+
pCounter = (SyncCounter *)pTrigger->pSync;
return (pCounter == NULL ||
@@ -326,14 +362,6 @@ SyncInitTrigger(ClientPtr client, SyncTrigger *pTrigger, XID syncObject,
}
else
{
- if (pTrigger->test_type != XSyncPositiveTransition &&
- pTrigger->test_type != XSyncNegativeTransition &&
- pTrigger->test_type != XSyncPositiveComparison &&
- pTrigger->test_type != XSyncNegativeComparison)
- {
- client->errorValue = pTrigger->test_type;
- return BadValue;
- }
/* select appropriate CheckTrigger function */
switch (pTrigger->test_type)
@@ -350,6 +378,9 @@ SyncInitTrigger(ClientPtr client, SyncTrigger *pTrigger, XID syncObject,
case XSyncNegativeComparison:
pTrigger->CheckTrigger = SyncCheckTriggerNegativeComparison;
break;
+ default:
+ client->errorValue = pTrigger->test_type;
+ return BadValue;
}
}
}
@@ -402,7 +433,8 @@ SyncSendAlarmNotifyEvents(SyncAlarm *pAlarm)
SyncTrigger *pTrigger = &pAlarm->trigger;
SyncCounter *pCounter;
- assert(!pTrigger->pSync || (SYNC_COUNTER == pTrigger->pSync->type));
+ if (!SyncCheckWarnIsCounter(pTrigger->pSync, WARN_INVALID_COUNTER_ALARM))
+ return;
pCounter = (SyncCounter *)pTrigger->pSync;
@@ -507,7 +539,9 @@ SyncAlarmTriggerFired(SyncTrigger *pTrigger)
SyncCounter *pCounter;
CARD64 new_test_value;
- assert(!pTrigger->pSync || (SYNC_COUNTER == pTrigger->pSync->type));
+ if (!SyncCheckWarnIsCounter(pTrigger->pSync, WARN_INVALID_COUNTER_ALARM))
+ return;
+
pCounter = (SyncCounter *)pTrigger->pSync;
/* no need to check alarm unless it's active */
@@ -534,7 +568,10 @@ SyncAlarmTriggerFired(SyncTrigger *pTrigger)
SyncTrigger *paTrigger = &pAlarm->trigger;
SyncCounter *paCounter;
- assert(!paTrigger->pSync || (SYNC_COUNTER == paTrigger->pSync->type));
+ if (!SyncCheckWarnIsCounter(paTrigger->pSync,
+ WARN_INVALID_COUNTER_ALARM))
+ return;
+
paCounter = (SyncCounter *)pTrigger->pSync;
/* "The alarm is updated by repeatedly adding delta to the
@@ -758,17 +795,15 @@ SyncEventSelectForAlarm(SyncAlarm *pAlarm, ClientPtr client, Bool wantevents)
*/
pClients->delete_id = FakeClientID(client->index);
- if (!AddResource(pClients->delete_id, RTAlarmClient, pAlarm))
- {
- free(pClients);
- return BadAlloc;
- }
/* link it into list after we know all the allocations succeed */
-
pClients->next = pAlarm->pEventClients;
pAlarm->pEventClients = pClients;
pClients->client = client;
+
+ if (!AddResource(pClients->delete_id, RTAlarmClient, pAlarm))
+ return BadAlloc;
+
return Success;
}
@@ -877,17 +912,14 @@ static SyncObject *
SyncCreate(ClientPtr client, XID id, unsigned char type)
{
SyncObject *pSync;
- RESTYPE resType;
switch (type) {
case SYNC_COUNTER:
- resType = RTCounter;
pSync = malloc(sizeof(SyncCounter));
break;
case SYNC_FENCE:
- resType = RTFence;
- pSync = dixAllocateObjectWithPrivates(SyncFence,
- PRIVATE_SYNC_FENCE);
+ pSync = (SyncObject*)dixAllocateObjectWithPrivates(SyncFence,
+ PRIVATE_SYNC_FENCE);
break;
default:
return NULL;
@@ -896,19 +928,6 @@ SyncCreate(ClientPtr client, XID id, unsigned char type)
if (!pSync)
return NULL;
- if (!AddResource(id, resType, (pointer) pSync))
- {
- switch (type) {
- case SYNC_FENCE:
- dixFreeObjectWithPrivates((SyncFence *)pSync, PRIVATE_SYNC_FENCE);
- break;
- default:
- free(pSync);
- }
-
- return NULL;
- }
-
pSync->client = client;
pSync->id = id;
pSync->pTriglist = NULL;
@@ -931,6 +950,10 @@ SyncCreateCounter(ClientPtr client, XSyncCounter id, CARD64 initialvalue)
pCounter->value = initialvalue;
pCounter->pSysCounterInfo = NULL;
+
+ if (!AddResource(id, RTCounter, (pointer) pCounter))
+ return NULL;
+
return pCounter;
}
@@ -1519,15 +1542,12 @@ SyncAwaitPrologue(ClientPtr client, int items)
/* first item is the header, remainder are real wait conditions */
pAwaitUnion->header.delete_id = FakeClientID(client->index);
- if (!AddResource(pAwaitUnion->header.delete_id, RTAwait, pAwaitUnion))
- {
- free(pAwaitUnion);
- return NULL;
- }
-
pAwaitUnion->header.client = client;
pAwaitUnion->header.num_waitconditions = 0;
+ if (!AddResource(pAwaitUnion->header.delete_id, RTAwait, pAwaitUnion))
+ return NULL;
+
return pAwaitUnion;
}
@@ -1754,10 +1774,7 @@ ProcSyncCreateAlarm(ClientPtr client)
}
if (!AddResource(stuff->id, RTAlarm, pAlarm))
- {
- free(pAlarm);
return BadAlloc;
- }
/* see if alarm already triggered. NULL counter will not trigger
* in CreateAlarm and sets alarm state to Inactive.
@@ -1771,7 +1788,13 @@ ProcSyncCreateAlarm(ClientPtr client)
{
SyncCounter *pCounter;
- assert(SYNC_COUNTER == pTrigger->pSync->type);
+ if (!SyncCheckWarnIsCounter(pTrigger->pSync,
+ WARN_INVALID_COUNTER_ALARM))
+ {
+ FreeResource(stuff->id, RT_NONE);
+ return BadAlloc;
+ }
+
pCounter = (SyncCounter *)pTrigger->pSync;
if ((*pTrigger->CheckTrigger)(pTrigger, pCounter->value))
@@ -1810,11 +1833,9 @@ ProcSyncChangeAlarm(ClientPtr client)
(CARD32 *)&stuff[1])) != Success)
return status;
- if (pAlarm->trigger.pSync)
- {
- assert(SYNC_COUNTER == pAlarm->trigger.pSync->type);
+ if (SyncCheckWarnIsCounter(pAlarm->trigger.pSync,
+ WARN_INVALID_COUNTER_ALARM))
pCounter = (SyncCounter *)pAlarm->trigger.pSync;
- }
/* see if alarm already triggered. NULL counter WILL trigger
* in ChangeAlarm.
@@ -1928,6 +1949,9 @@ ProcSyncCreateFence(ClientPtr client)
miSyncInitFence(pDraw->pScreen, pFence, stuff->initially_triggered);
+ if (!AddResource(stuff->fid, RTFence, (pointer) pFence))
+ return BadAlloc;
+
return client->noClientException;
}
@@ -2070,7 +2094,7 @@ ProcSyncAwaitFence(ClientPtr client)
}
if (items == 0)
{
- client->errorValue = items; /* XXX protocol change */
+ client->errorValue = items;
return BadValue;
}
@@ -2084,14 +2108,14 @@ ProcSyncAwaitFence(ClientPtr client)
pAwait = &(pAwaitUnion+1)->await; /* skip over header */
for (i = 0; i < items; i++, pProtocolFences++, pAwait++)
{
- if (*pProtocolFences == None) /* XXX protocol change */
+ if (*pProtocolFences == None)
{
/* this should take care of removing any triggers created by
* this request that have already been registered on sync objects
*/
FreeResource(pAwaitUnion->header.delete_id, RT_NONE);
client->errorValue = *pProtocolFences;
- return SyncErrorBase + XSyncBadCounter;
+ return SyncErrorBase + XSyncBadFence;
}
pAwait->trigger.pSync = NULL;
--
1.7.1
More information about the xorg-devel
mailing list