Suppress some unused-variable complaints in new LOCK_DEBUG code.

tglsfdc · tglsfdc · commit bed756a820a2 · 2015-03-26T12:00:30.000-04:00
Jeff Janes
diff --git a/src/backend/storage/lmgr/lwlock.c b/src/backend/storage/lmgr/lwlock.c
@@ -207,7 +207,8 @@ LOG_LWDEBUG(const char *where, LWLock *lock, const char *msg)
 		ereport(LOG,
 				(errhidestmt(true),
 				 errhidecontext(true),
-				 errmsg("%s(%s %d): %s", where, T_NAME(lock), T_ID(lock), msg)));
+				 errmsg("%s(%s %d): %s", where,
+						T_NAME(lock), T_ID(lock), msg)));
 	}
 }
 
@@ -879,7 +880,7 @@ LWLockDequeueSelf(LWLock *lock)
 #ifdef LOCK_DEBUG
 	{
 		/* not waiting anymore */
-		uint32 nwaiters = pg_atomic_fetch_sub_u32(&lock->nwaiters, 1);
+		uint32 nwaiters PG_USED_FOR_ASSERTS_ONLY = pg_atomic_fetch_sub_u32(&lock->nwaiters, 1);
 		Assert(nwaiters < MAX_BACKENDS);
 	}
 #endif
@@ -1045,7 +1046,7 @@ LWLockAcquireCommon(LWLock *lock, LWLockMode mode, uint64 *valptr, uint64 val)
 #ifdef LOCK_DEBUG
 		{
 			/* not waiting anymore */
-			uint32 nwaiters = pg_atomic_fetch_sub_u32(&lock->nwaiters, 1);
+			uint32 nwaiters PG_USED_FOR_ASSERTS_ONLY = pg_atomic_fetch_sub_u32(&lock->nwaiters, 1);
 			Assert(nwaiters < MAX_BACKENDS);
 		}
 #endif
@@ -1202,7 +1203,7 @@ LWLockAcquireOrWait(LWLock *lock, LWLockMode mode)
 #ifdef LOCK_DEBUG
 			{
 				/* not waiting anymore */
-				uint32 nwaiters = pg_atomic_fetch_sub_u32(&lock->nwaiters, 1);
+				uint32 nwaiters PG_USED_FOR_ASSERTS_ONLY = pg_atomic_fetch_sub_u32(&lock->nwaiters, 1);
 				Assert(nwaiters < MAX_BACKENDS);
 			}
 #endif
@@ -1403,7 +1404,7 @@ LWLockWaitForVar(LWLock *lock, uint64 *valptr, uint64 oldval, uint64 *newval)
 #ifdef LOCK_DEBUG
 		{
 			/* not waiting anymore */
-			uint32 nwaiters = pg_atomic_fetch_sub_u32(&lock->nwaiters, 1);
+			uint32 nwaiters PG_USED_FOR_ASSERTS_ONLY = pg_atomic_fetch_sub_u32(&lock->nwaiters, 1);
 			Assert(nwaiters < MAX_BACKENDS);
 		}
 #endif

Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,8 @@ LOG_LWDEBUG(const char where, LWLock lock, const char *msg)`
`207`	`207`	`ereport(LOG,`
`208`	`208`	`(errhidestmt(true),`
`209`	`209`	`errhidecontext(true),`
`210`		`- errmsg("%s(%s %d): %s", where, T_NAME(lock), T_ID(lock), msg)));`
	`210`	`+ errmsg("%s(%s %d): %s", where,`
	`211`	`+ T_NAME(lock), T_ID(lock), msg)));`
`211`	`212`	`}`
`212`	`213`	`}`
`213`	`214`
`@@ -879,7 +880,7 @@ LWLockDequeueSelf(LWLock *lock)`
`879`	`880`	`#ifdef LOCK_DEBUG`
`880`	`881`	`{`
`881`	`882`	`/* not waiting anymore */`
`882`		`- uint32 nwaiters = pg_atomic_fetch_sub_u32(&lock->nwaiters, 1);`
	`883`	`+ uint32 nwaiters PG_USED_FOR_ASSERTS_ONLY = pg_atomic_fetch_sub_u32(&lock->nwaiters, 1);`
`883`	`884`	`Assert(nwaiters < MAX_BACKENDS);`
`884`	`885`	`}`
`885`	`886`	`#endif`
`@@ -1045,7 +1046,7 @@ LWLockAcquireCommon(LWLock lock, LWLockMode mode, uint64 valptr, uint64 val)`
`1045`	`1046`	`#ifdef LOCK_DEBUG`
`1046`	`1047`	`{`
`1047`	`1048`	`/* not waiting anymore */`
`1048`		`- uint32 nwaiters = pg_atomic_fetch_sub_u32(&lock->nwaiters, 1);`
	`1049`	`+ uint32 nwaiters PG_USED_FOR_ASSERTS_ONLY = pg_atomic_fetch_sub_u32(&lock->nwaiters, 1);`
`1049`	`1050`	`Assert(nwaiters < MAX_BACKENDS);`
`1050`	`1051`	`}`
`1051`	`1052`	`#endif`
`@@ -1202,7 +1203,7 @@ LWLockAcquireOrWait(LWLock *lock, LWLockMode mode)`
`1202`	`1203`	`#ifdef LOCK_DEBUG`
`1203`	`1204`	`{`
`1204`	`1205`	`/* not waiting anymore */`
`1205`		`- uint32 nwaiters = pg_atomic_fetch_sub_u32(&lock->nwaiters, 1);`
	`1206`	`+ uint32 nwaiters PG_USED_FOR_ASSERTS_ONLY = pg_atomic_fetch_sub_u32(&lock->nwaiters, 1);`
`1206`	`1207`	`Assert(nwaiters < MAX_BACKENDS);`
`1207`	`1208`	`}`
`1208`	`1209`	`#endif`
`@@ -1403,7 +1404,7 @@ LWLockWaitForVar(LWLock lock, uint64 valptr, uint64 oldval, uint64 *newval)`
`1403`	`1404`	`#ifdef LOCK_DEBUG`
`1404`	`1405`	`{`
`1405`	`1406`	`/* not waiting anymore */`
`1406`		`- uint32 nwaiters = pg_atomic_fetch_sub_u32(&lock->nwaiters, 1);`
	`1407`	`+ uint32 nwaiters PG_USED_FOR_ASSERTS_ONLY = pg_atomic_fetch_sub_u32(&lock->nwaiters, 1);`
`1407`	`1408`	`Assert(nwaiters < MAX_BACKENDS);`
`1408`	`1409`	`}`
`1409`	`1410`	`#endif`