From 80abbeba23d466b6541cf95082a9e1f36704424e Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Wed, 13 Apr 2016 16:42:01 -0700 Subject: Make init_spin_delay() C89 compliant and change stuck spinlock reporting. 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 --- src/include/utils/elog.h | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'src/include/utils/elog.h') diff --git a/src/include/utils/elog.h b/src/include/utils/elog.h index 7471dadd4b..c43e5b8943 100644 --- a/src/include/utils/elog.h +++ b/src/include/utils/elog.h @@ -71,18 +71,6 @@ #include "utils/errcodes.h" -/* Which __func__ symbol do we have, if any? */ -#ifdef HAVE_FUNCNAME__FUNC -#define PG_FUNCNAME_MACRO __func__ -#else -#ifdef HAVE_FUNCNAME__FUNCTION -#define PG_FUNCNAME_MACRO __FUNCTION__ -#else -#define PG_FUNCNAME_MACRO NULL -#endif -#endif - - /*---------- * New-style error reporting API: to be used in this way: * ereport(ERROR, -- cgit v1.2.1