diff options
| author | Robert Haas <rhaas@postgresql.org> | 2015-09-28 10:57:15 -0400 |
|---|---|---|
| committer | Robert Haas <rhaas@postgresql.org> | 2015-09-28 10:57:15 -0400 |
| commit | f40792a93ccdc4d01c448121da67693fc2f6297a (patch) | |
| tree | 0ba012487f4e3800551bc43a5acd5ed3bc88cb91 | |
| parent | 45e5b4ef5c392ddfcd72693f65659bafdda7ee1b (diff) | |
| download | postgresql-f40792a93ccdc4d01c448121da67693fc2f6297a.tar.gz postgresql-f40792a93ccdc4d01c448121da67693fc2f6297a.zip | |
Use LOCKBIT_ON() instead of a bit shift in a few places.
We do this mostly everywhere, so it seems just as well to do it here,
too.
Thomas Munro
| -rw-r--r-- | src/backend/storage/lmgr/deadlock.c | 4 | ||||
| -rw-r--r-- | src/backend/storage/lmgr/lock.c | 42 |
2 files changed, 23 insertions, 23 deletions
diff --git a/src/backend/storage/lmgr/deadlock.c b/src/backend/storage/lmgr/deadlock.c index aea46b28ffc..fd5ab21a081 100644 --- a/src/backend/storage/lmgr/deadlock.c +++ b/src/backend/storage/lmgr/deadlock.c @@ -608,7 +608,7 @@ FindLockCycleRecurse(PGPROC *checkProc, break; /* Is there a conflict with this guy's request? */ - if (((1 << proc->waitLockMode) & conflictMask) != 0) + if ((LOCKBIT_ON(proc->waitLockMode) & conflictMask) != 0) { /* This proc soft-blocks checkProc */ if (FindLockCycleRecurse(proc, depth + 1, @@ -648,7 +648,7 @@ FindLockCycleRecurse(PGPROC *checkProc, break; /* Is there a conflict with this guy's request? */ - if (((1 << proc->waitLockMode) & conflictMask) != 0) + if ((LOCKBIT_ON(proc->waitLockMode) & conflictMask) != 0) { /* This proc soft-blocks checkProc */ if (FindLockCycleRecurse(proc, depth + 1, diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c index c377d384b76..76fc615cd59 100644 --- a/src/backend/storage/lmgr/lock.c +++ b/src/backend/storage/lmgr/lock.c @@ -64,41 +64,41 @@ static const LOCKMASK LockConflicts[] = { 0, /* AccessShareLock */ - (1 << AccessExclusiveLock), + LOCKBIT_ON(AccessExclusiveLock), /* RowShareLock */ - (1 << ExclusiveLock) | (1 << AccessExclusiveLock), + LOCKBIT_ON(ExclusiveLock) | LOCKBIT_ON(AccessExclusiveLock), /* RowExclusiveLock */ - (1 << ShareLock) | (1 << ShareRowExclusiveLock) | - (1 << ExclusiveLock) | (1 << AccessExclusiveLock), + LOCKBIT_ON(ShareLock) | LOCKBIT_ON(ShareRowExclusiveLock) | + LOCKBIT_ON(ExclusiveLock) | LOCKBIT_ON(AccessExclusiveLock), /* ShareUpdateExclusiveLock */ - (1 << ShareUpdateExclusiveLock) | - (1 << ShareLock) | (1 << ShareRowExclusiveLock) | - (1 << ExclusiveLock) | (1 << AccessExclusiveLock), + LOCKBIT_ON(ShareUpdateExclusiveLock) | + LOCKBIT_ON(ShareLock) | LOCKBIT_ON(ShareRowExclusiveLock) | + LOCKBIT_ON(ExclusiveLock) | LOCKBIT_ON(AccessExclusiveLock), /* ShareLock */ - (1 << RowExclusiveLock) | (1 << ShareUpdateExclusiveLock) | - (1 << ShareRowExclusiveLock) | - (1 << ExclusiveLock) | (1 << AccessExclusiveLock), + LOCKBIT_ON(RowExclusiveLock) | LOCKBIT_ON(ShareUpdateExclusiveLock) | + LOCKBIT_ON(ShareRowExclusiveLock) | + LOCKBIT_ON(ExclusiveLock) | LOCKBIT_ON(AccessExclusiveLock), /* ShareRowExclusiveLock */ - (1 << RowExclusiveLock) | (1 << ShareUpdateExclusiveLock) | - (1 << ShareLock) | (1 << ShareRowExclusiveLock) | - (1 << ExclusiveLock) | (1 << AccessExclusiveLock), + LOCKBIT_ON(RowExclusiveLock) | LOCKBIT_ON(ShareUpdateExclusiveLock) | + LOCKBIT_ON(ShareLock) | LOCKBIT_ON(ShareRowExclusiveLock) | + LOCKBIT_ON(ExclusiveLock) | LOCKBIT_ON(AccessExclusiveLock), /* ExclusiveLock */ - (1 << RowShareLock) | - (1 << RowExclusiveLock) | (1 << ShareUpdateExclusiveLock) | - (1 << ShareLock) | (1 << ShareRowExclusiveLock) | - (1 << ExclusiveLock) | (1 << AccessExclusiveLock), + LOCKBIT_ON(RowShareLock) | + LOCKBIT_ON(RowExclusiveLock) | LOCKBIT_ON(ShareUpdateExclusiveLock) | + LOCKBIT_ON(ShareLock) | LOCKBIT_ON(ShareRowExclusiveLock) | + LOCKBIT_ON(ExclusiveLock) | LOCKBIT_ON(AccessExclusiveLock), /* AccessExclusiveLock */ - (1 << AccessShareLock) | (1 << RowShareLock) | - (1 << RowExclusiveLock) | (1 << ShareUpdateExclusiveLock) | - (1 << ShareLock) | (1 << ShareRowExclusiveLock) | - (1 << ExclusiveLock) | (1 << AccessExclusiveLock) + LOCKBIT_ON(AccessShareLock) | LOCKBIT_ON(RowShareLock) | + LOCKBIT_ON(RowExclusiveLock) | LOCKBIT_ON(ShareUpdateExclusiveLock) | + LOCKBIT_ON(ShareLock) | LOCKBIT_ON(ShareRowExclusiveLock) | + LOCKBIT_ON(ExclusiveLock) | LOCKBIT_ON(AccessExclusiveLock) }; |