rdelaage/postgresql
1
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-07-19 13:51:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't let protected variable access to be reordered after spinlock release.

Browse Source 
LWLockAcquireWithVar needs to set the protected variable while holding
the spinlock. Need to use a volatile pointer to make sure it doesn't get
reordered by the compiler. The other functions that accessed the protected
variable already got this right.

9.4 only. Earlier releases didn't have this code, and in master, spinlock
release acts as a compiler barrier.
This commit is contained in:
Heikki Linnakangas 2014-10-14 10:01:00 +03:00
parent 4dbc7606cf
commit 4971c36b46
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/backend/storage/lmgr/lwlock.c
View File

@ -482,6 +482,7 @@ static inline bool
LWLockAcquireCommon(LWLock *l, LWLockMode mode, uint64 *valptr, uint64 val)
{
volatile LWLock *lock = l;
volatile uint64 *valp = valptr;
PGPROC *proc = MyProc;
bool retry = false;
bool result = true;
@ -637,8 +638,8 @@ LWLockAcquireCommon(LWLock *l, LWLockMode mode, uint64 *valptr, uint64 val)
}
/* If there's a variable associated with this lock, initialize it */
if (valptr)
*valptr = val;
if (valp)
*valp = val;
/* We are done updating shared state of the lock itself. */
SpinLockRelease(&lock->mutex);