git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

Suppress some unused-variable complaints in new LOCK_DEBUG code.

author Tom Lane <tgl@sss.pgh.pa.us>

2015年3月26日 16:00:30 +0000 (12:00 -0400)

committer Tom Lane <tgl@sss.pgh.pa.us>

2015年3月26日 16:00:30 +0000 (12:00 -0400)

Jeff Janes

src/backend/storage/lmgr/lwlock.c patch | blob | blame | history

diff --git a/src/backend/storage/lmgr/lwlock.c b/src/backend/storage/lmgr/lwlock.c

index 7ca8dc0007bd2d77277e7de1ab919b2592f87819..5813e71da0279524237644d3e6d2a85b6ce5115d 100644 (file)

--- 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

This is the main PostgreSQL git repository.

RSS Atom