diff options
| author | Álvaro Herrera <alvherre@alvh.no-ip.org> | 2024-12-03 15:50:03 +0100 |
|---|---|---|
| committer | Álvaro Herrera <alvherre@alvh.no-ip.org> | 2024-12-03 15:50:03 +0100 |
| commit | 1e5ef3a2a17974f574b90b86f491d74e32615987 (patch) | |
| tree | 49c665482d0b7b859141ee6403239c0f5dd5e10d | |
| parent | 4cc2a449802ec654b1b3ac4db698c3af4e7fd9f7 (diff) | |
| download | postgresql-1e5ef3a2a17974f574b90b86f491d74e32615987.tar.gz postgresql-1e5ef3a2a17974f574b90b86f491d74e32615987.zip | |
Drop "Lock" suffix from LWLock wait event names
Commit da952b415f44 unintentially reverted the SQL-visible part of
commit 14a910109126, which breaks queries joining pg_wait_events with
pg_stat_acivity. Remove the suffix again.
Backpatch to 17.
Reported-by: Christophe Courtois <christophe.courtois@dalibo.com>
Author: Bertrand Drouvot <bertranddrouvot.pg@gmail.com>
Discussion: https://postgr.es/m/18728-450924477056a339%40postgresql.org
Discussion: https://postgr.es/m/Z01w1+LihtRiS0Te@ip-10-97-1-34.eu-west-3.compute.internal
| -rw-r--r-- | src/backend/storage/lmgr/generate-lwlocknames.pl | 1 | ||||
| -rw-r--r-- | src/backend/storage/lmgr/lwlock.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/backend/storage/lmgr/generate-lwlocknames.pl b/src/backend/storage/lmgr/generate-lwlocknames.pl index eaddd9d3b97..4eee6b47f15 100644 --- a/src/backend/storage/lmgr/generate-lwlocknames.pl +++ b/src/backend/storage/lmgr/generate-lwlocknames.pl @@ -107,6 +107,7 @@ while (<$lwlocklist>) $lastlockidx = $lockidx; $continue = ",\n"; + # Add a "Lock" suffix to each lock name, as the C code depends on that print $h "#define ${lockname}Lock (&MainLWLockArray[$lockidx].lock)\n"; } diff --git a/src/backend/storage/lmgr/lwlock.c b/src/backend/storage/lmgr/lwlock.c index db6ed784ab3..9cf3e4f4f3a 100644 --- a/src/backend/storage/lmgr/lwlock.c +++ b/src/backend/storage/lmgr/lwlock.c @@ -108,7 +108,7 @@ StaticAssertDecl(LW_VAL_EXCLUSIVE > (uint32) MAX_BACKENDS, /* * There are three sorts of LWLock "tranches": * - * 1. The individually-named locks defined in lwlocknames.h each have their + * 1. The individually-named locks defined in lwlocklist.h each have their * own tranche. We absorb the names of these tranches from there into * BuiltinTrancheNames here. * @@ -124,7 +124,7 @@ StaticAssertDecl(LW_VAL_EXCLUSIVE > (uint32) MAX_BACKENDS, * ... and do not forget to update the documentation's list of wait events. */ static const char *const BuiltinTrancheNames[] = { -#define PG_LWLOCK(id, lockname) [id] = CppAsString(lockname) "Lock", +#define PG_LWLOCK(id, lockname) [id] = CppAsString(lockname), #include "storage/lwlocklist.h" #undef PG_LWLOCK [LWTRANCHE_XACT_BUFFER] = "XactBuffer", |