database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-14 18:42:34 +03:00
Code Activity

Make init_spin_delay() C89 compliant #2.

Browse Source 
My previous attempt at doing so, in 80abbeba23, was not sufficient. While that
fixed the problem for bufmgr.c and lwlock.c , s_lock.c still has non-constant
expressions in the struct initializer, because the file/line/function
information comes from the caller of s_lock().

Give up on using a macro, and use a static inline instead.

Discussion: 4369.1460435533@sss.pgh.pa.us
This commit is contained in:
Andres Freund
2016-04-14 19:26:13 -07:00
parent 533cd2303a
commit 4b74c6a40e
4 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/backend/storage/buffer/bufmgr.c
View File

@ -4029,9 +4029,11 @@ rnode_comparator(const void *p1, const void *p2)
uint32
LockBufHdr(BufferDesc *desc)
{
SpinDelayStatus delayStatus = init_local_spin_delay();
SpinDelayStatus delayStatus;
uint32 old_buf_state;
init_local_spin_delay(&delayStatus);
while (true)
{
/* set BM_LOCKED flag */
@ -4055,9 +4057,11 @@ LockBufHdr(BufferDesc *desc)
static uint32
WaitBufHdrUnlocked(BufferDesc *buf)
{
SpinDelayStatus delayStatus = init_local_spin_delay();
SpinDelayStatus delayStatus;
uint32 buf_state;
init_local_spin_delay(&delayStatus);
buf_state = pg_atomic_read_u32(&buf->state);
while (buf_state & BM_LOCKED)