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 and change stuck spinlock reporting.

Browse Source 
The current definition of init_spin_delay (introduced recently in
48354581a) wasn't C89 compliant. It's not legal to refer to refer to
non-constant expressions, and the ptr argument was one.  This, as
reported by Tom, lead to a failure on buildfarm animal pademelon.

The pointer, especially on system systems with ASLR, isn't super helpful
anyway, though. So instead of making init_spin_delay into an inline
function, make s_lock_stuck() report the function name in addition to
file:line and change init_spin_delay() accordingly. While not a direct
replacement, the function name is likely more useful anyway (line
numbers are often hard to interpret in third party reports).

This also fixes what file/line number is reported for waits via
s_lock().

As PG_FUNCNAME_MACRO is now used outside of elog.h, move it to c.h.

Reported-By: Tom Lane
Discussion: 4369.1460435533@sss.pgh.pa.us
This commit is contained in:
Andres Freund
2016-04-13 16:42:01 -07:00
parent 6cead413bb
commit 80abbeba23
6 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4029,7 +4029,7 @@ rnode_comparator(const void *p1, const void *p2)
uint32
LockBufHdr(BufferDesc *desc)
{
SpinDelayStatus delayStatus = init_spin_delay(desc);
SpinDelayStatus delayStatus = init_local_spin_delay();
uint32 old_buf_state;
while (true)
@ -4055,7 +4055,7 @@ LockBufHdr(BufferDesc *desc)
static uint32
WaitBufHdrUnlocked(BufferDesc *buf)
{
SpinDelayStatus delayStatus = init_spin_delay(buf);
SpinDelayStatus delayStatus = init_local_spin_delay();
uint32 buf_state;
buf_state = pg_atomic_read_u32(&buf->state);