Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitf40792a

Browse files
committed
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
1 parent45e5b4e commitf40792a

File tree

2 files changed

+23
-23
lines changed

2 files changed

+23
-23
lines changed

‎src/backend/storage/lmgr/deadlock.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,7 @@ FindLockCycleRecurse(PGPROC *checkProc,
608608
break;
609609

610610
/* Is there a conflict with this guy's request? */
611-
if (((1 <<proc->waitLockMode)&conflictMask)!=0)
611+
if ((LOCKBIT_ON(proc->waitLockMode)&conflictMask)!=0)
612612
{
613613
/* This proc soft-blocks checkProc */
614614
if (FindLockCycleRecurse(proc,depth+1,
@@ -648,7 +648,7 @@ FindLockCycleRecurse(PGPROC *checkProc,
648648
break;
649649

650650
/* Is there a conflict with this guy's request? */
651-
if (((1 <<proc->waitLockMode)&conflictMask)!=0)
651+
if ((LOCKBIT_ON(proc->waitLockMode)&conflictMask)!=0)
652652
{
653653
/* This proc soft-blocks checkProc */
654654
if (FindLockCycleRecurse(proc,depth+1,

‎src/backend/storage/lmgr/lock.c

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -64,41 +64,41 @@ static const LOCKMASK LockConflicts[] = {
6464
0,
6565

6666
/* AccessShareLock */
67-
(1 <<AccessExclusiveLock),
67+
LOCKBIT_ON(AccessExclusiveLock),
6868

6969
/* RowShareLock */
70-
(1 <<ExclusiveLock) |(1 <<AccessExclusiveLock),
70+
LOCKBIT_ON(ExclusiveLock) |LOCKBIT_ON(AccessExclusiveLock),
7171

7272
/* RowExclusiveLock */
73-
(1 <<ShareLock) |(1 <<ShareRowExclusiveLock) |
74-
(1 <<ExclusiveLock) |(1 <<AccessExclusiveLock),
73+
LOCKBIT_ON(ShareLock) |LOCKBIT_ON(ShareRowExclusiveLock) |
74+
LOCKBIT_ON(ExclusiveLock) |LOCKBIT_ON(AccessExclusiveLock),
7575

7676
/* ShareUpdateExclusiveLock */
77-
(1 <<ShareUpdateExclusiveLock) |
78-
(1 <<ShareLock) |(1 <<ShareRowExclusiveLock) |
79-
(1 <<ExclusiveLock) |(1 <<AccessExclusiveLock),
77+
LOCKBIT_ON(ShareUpdateExclusiveLock) |
78+
LOCKBIT_ON(ShareLock) |LOCKBIT_ON(ShareRowExclusiveLock) |
79+
LOCKBIT_ON(ExclusiveLock) |LOCKBIT_ON(AccessExclusiveLock),
8080

8181
/* ShareLock */
82-
(1 <<RowExclusiveLock) |(1 <<ShareUpdateExclusiveLock) |
83-
(1 <<ShareRowExclusiveLock) |
84-
(1 <<ExclusiveLock) |(1 <<AccessExclusiveLock),
82+
LOCKBIT_ON(RowExclusiveLock) |LOCKBIT_ON(ShareUpdateExclusiveLock) |
83+
LOCKBIT_ON(ShareRowExclusiveLock) |
84+
LOCKBIT_ON(ExclusiveLock) |LOCKBIT_ON(AccessExclusiveLock),
8585

8686
/* ShareRowExclusiveLock */
87-
(1 <<RowExclusiveLock) |(1 <<ShareUpdateExclusiveLock) |
88-
(1 <<ShareLock) |(1 <<ShareRowExclusiveLock) |
89-
(1 <<ExclusiveLock) |(1 <<AccessExclusiveLock),
87+
LOCKBIT_ON(RowExclusiveLock) |LOCKBIT_ON(ShareUpdateExclusiveLock) |
88+
LOCKBIT_ON(ShareLock) |LOCKBIT_ON(ShareRowExclusiveLock) |
89+
LOCKBIT_ON(ExclusiveLock) |LOCKBIT_ON(AccessExclusiveLock),
9090

9191
/* ExclusiveLock */
92-
(1 <<RowShareLock) |
93-
(1 <<RowExclusiveLock) |(1 <<ShareUpdateExclusiveLock) |
94-
(1 <<ShareLock) |(1 <<ShareRowExclusiveLock) |
95-
(1 <<ExclusiveLock) |(1 <<AccessExclusiveLock),
92+
LOCKBIT_ON(RowShareLock) |
93+
LOCKBIT_ON(RowExclusiveLock) |LOCKBIT_ON(ShareUpdateExclusiveLock) |
94+
LOCKBIT_ON(ShareLock) |LOCKBIT_ON(ShareRowExclusiveLock) |
95+
LOCKBIT_ON(ExclusiveLock) |LOCKBIT_ON(AccessExclusiveLock),
9696

9797
/* AccessExclusiveLock */
98-
(1 <<AccessShareLock) |(1 <<RowShareLock) |
99-
(1 <<RowExclusiveLock) |(1 <<ShareUpdateExclusiveLock) |
100-
(1 <<ShareLock) |(1 <<ShareRowExclusiveLock) |
101-
(1 <<ExclusiveLock) |(1 <<AccessExclusiveLock)
98+
LOCKBIT_ON(AccessShareLock) |LOCKBIT_ON(RowShareLock) |
99+
LOCKBIT_ON(RowExclusiveLock) |LOCKBIT_ON(ShareUpdateExclusiveLock) |
100+
LOCKBIT_ON(ShareLock) |LOCKBIT_ON(ShareRowExclusiveLock) |
101+
LOCKBIT_ON(ExclusiveLock) |LOCKBIT_ON(AccessExclusiveLock)
102102

103103
};
104104

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp