public inbox for [email protected]help / color / mirror / Atom feed
[PATCH v1 1/1] remove WaitEventCustomCounterData 6+ messages / 4 participants [nested] [flat]
* [PATCH v1 1/1] remove WaitEventCustomCounterData @ 2026-07-09 02:50 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 6+ messages in thread From: Nathan Bossart @ 2026-07-09 02:50 UTC (permalink / raw) --- src/backend/utils/activity/wait_event.c | 29 ++++++------------------- src/tools/pgindent/typedefs.list | 1 - 2 files changed, 7 insertions(+), 23 deletions(-) diff --git a/src/backend/utils/activity/wait_event.c b/src/backend/utils/activity/wait_event.c index 95635c7f56c..7ee6f99fb50 100644 --- a/src/backend/utils/activity/wait_event.c +++ b/src/backend/utils/activity/wait_event.c @@ -81,14 +81,7 @@ typedef struct WaitEventCustomEntryByName /* dynamic allocation counter for custom wait events */ -typedef struct WaitEventCustomCounterData -{ - int nextId; /* next ID to assign */ - slock_t mutex; /* protects the counter */ -} WaitEventCustomCounterData; - -/* pointer to the shared memory */ -static WaitEventCustomCounterData *WaitEventCustomCounter; +static int *WaitEventCustomCounter; /* first event ID of custom wait events */ #define WAIT_EVENT_CUSTOM_INITIAL_ID 1 @@ -110,8 +103,8 @@ const ShmemCallbacks WaitEventCustomShmemCallbacks = { static void WaitEventCustomShmemRequest(void *arg) { - ShmemRequestStruct(.name = "WaitEventCustomCounterData", - .size = sizeof(WaitEventCustomCounterData), + ShmemRequestStruct(.name = "WaitEventCustomCounter", + .size = sizeof(int), .ptr = (void **) &WaitEventCustomCounter, ); ShmemRequestHash(.name = "WaitEventCustom hash by wait event information", @@ -134,9 +127,8 @@ WaitEventCustomShmemRequest(void *arg) static void WaitEventCustomShmemInit(void *arg) { - /* initialize the allocation counter and its spinlock. */ - WaitEventCustomCounter->nextId = WAIT_EVENT_CUSTOM_INITIAL_ID; - SpinLockInit(&WaitEventCustomCounter->mutex); + /* initialize the allocation counter */ + *WaitEventCustomCounter = WAIT_EVENT_CUSTOM_INITIAL_ID; } /* @@ -221,19 +213,12 @@ WaitEventCustomNew(uint32 classId, const char *wait_event_name) } /* Allocate a new event Id */ - SpinLockAcquire(&WaitEventCustomCounter->mutex); - - if (WaitEventCustomCounter->nextId >= WAIT_EVENT_CUSTOM_HASH_SIZE) - { - SpinLockRelease(&WaitEventCustomCounter->mutex); + if (*WaitEventCustomCounter >= WAIT_EVENT_CUSTOM_HASH_SIZE) ereport(ERROR, errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED), errmsg("too many custom wait events")); - } - - eventId = WaitEventCustomCounter->nextId++; - SpinLockRelease(&WaitEventCustomCounter->mutex); + eventId = (*WaitEventCustomCounter)++; /* Register the new wait event */ wait_event_info = classId | eventId; diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index ffb413ab612..3174e0e4ab8 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -3418,7 +3418,6 @@ WaitEvent WaitEventActivity WaitEventBuffer WaitEventClient -WaitEventCustomCounterData WaitEventCustomEntryByInfo WaitEventCustomEntryByName WaitEventIO -- 2.50.1 (Apple Git-155) --65l7A33W789+zwjF-- ^ permalink raw reply [nested|flat] 6+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData @ 2026-07-09 02:50 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 6+ messages in thread From: Nathan Bossart @ 2026-07-09 02:50 UTC (permalink / raw) --- src/backend/utils/activity/wait_event.c | 29 ++++++------------------- src/tools/pgindent/typedefs.list | 1 - 2 files changed, 7 insertions(+), 23 deletions(-) diff --git a/src/backend/utils/activity/wait_event.c b/src/backend/utils/activity/wait_event.c index 95635c7f56c..7ee6f99fb50 100644 --- a/src/backend/utils/activity/wait_event.c +++ b/src/backend/utils/activity/wait_event.c @@ -81,14 +81,7 @@ typedef struct WaitEventCustomEntryByName /* dynamic allocation counter for custom wait events */ -typedef struct WaitEventCustomCounterData -{ - int nextId; /* next ID to assign */ - slock_t mutex; /* protects the counter */ -} WaitEventCustomCounterData; - -/* pointer to the shared memory */ -static WaitEventCustomCounterData *WaitEventCustomCounter; +static int *WaitEventCustomCounter; /* first event ID of custom wait events */ #define WAIT_EVENT_CUSTOM_INITIAL_ID 1 @@ -110,8 +103,8 @@ const ShmemCallbacks WaitEventCustomShmemCallbacks = { static void WaitEventCustomShmemRequest(void *arg) { - ShmemRequestStruct(.name = "WaitEventCustomCounterData", - .size = sizeof(WaitEventCustomCounterData), + ShmemRequestStruct(.name = "WaitEventCustomCounter", + .size = sizeof(int), .ptr = (void **) &WaitEventCustomCounter, ); ShmemRequestHash(.name = "WaitEventCustom hash by wait event information", @@ -134,9 +127,8 @@ WaitEventCustomShmemRequest(void *arg) static void WaitEventCustomShmemInit(void *arg) { - /* initialize the allocation counter and its spinlock. */ - WaitEventCustomCounter->nextId = WAIT_EVENT_CUSTOM_INITIAL_ID; - SpinLockInit(&WaitEventCustomCounter->mutex); + /* initialize the allocation counter */ + *WaitEventCustomCounter = WAIT_EVENT_CUSTOM_INITIAL_ID; } /* @@ -221,19 +213,12 @@ WaitEventCustomNew(uint32 classId, const char *wait_event_name) } /* Allocate a new event Id */ - SpinLockAcquire(&WaitEventCustomCounter->mutex); - - if (WaitEventCustomCounter->nextId >= WAIT_EVENT_CUSTOM_HASH_SIZE) - { - SpinLockRelease(&WaitEventCustomCounter->mutex); + if (*WaitEventCustomCounter >= WAIT_EVENT_CUSTOM_HASH_SIZE) ereport(ERROR, errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED), errmsg("too many custom wait events")); - } - - eventId = WaitEventCustomCounter->nextId++; - SpinLockRelease(&WaitEventCustomCounter->mutex); + eventId = (*WaitEventCustomCounter)++; /* Register the new wait event */ wait_event_info = classId | eventId; diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index ffb413ab612..3174e0e4ab8 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -3418,7 +3418,6 @@ WaitEvent WaitEventActivity WaitEventBuffer WaitEventClient -WaitEventCustomCounterData WaitEventCustomEntryByInfo WaitEventCustomEntryByName WaitEventIO -- 2.50.1 (Apple Git-155) --65l7A33W789+zwjF-- ^ permalink raw reply [nested|flat] 6+ messages in thread
* remove WaitEventCustomCounterData @ 2026-07-09 02:50 Nathan Bossart <[email protected]> 0 siblings, 1 reply; 6+ messages in thread From: Nathan Bossart @ 2026-07-09 02:50 UTC (permalink / raw) To: pgsql-hackers; +Cc: [email protected] While trying to understand the extent of our spinlock usage, I noticed that WaitEventCustomCounterData->mutex is unnecessary because the counter is only ever accessed with WaitEventCustomLock held exclusively. So, here's a patch to simplify matters a bit. Thoughts? -- nathan ^ permalink raw reply [nested|flat] 6+ messages in thread
* Re: remove WaitEventCustomCounterData @ 2026-07-09 04:04 Michael Paquier <[email protected]> parent: Nathan Bossart <[email protected]> 0 siblings, 1 reply; 6+ messages in thread From: Michael Paquier @ 2026-07-09 04:04 UTC (permalink / raw) To: Nathan Bossart <[email protected]>; +Cc: pgsql-hackers On Wed, Jul 08, 2026 at 09:50:33PM -0500, Nathan Bossart wrote: > While trying to understand the extent of our spinlock usage, I noticed that > WaitEventCustomCounterData->mutex is unnecessary because the counter is > only ever accessed with WaitEventCustomLock held exclusively. So, here's a > patch to simplify matters a bit. Thoughts? Indeed. This removal sounds good to me, thanks. -- Michael Attachments: [application/pgp-signature] signature.asc (833B, ../../[email protected]/2-signature.asc) download ^ permalink raw reply [nested|flat] 6+ messages in thread
* Re: remove WaitEventCustomCounterData @ 2026-07-09 04:22 Fujii Masao <[email protected]> parent: Michael Paquier <[email protected]> 0 siblings, 1 reply; 6+ messages in thread From: Fujii Masao @ 2026-07-09 04:22 UTC (permalink / raw) To: Michael Paquier <[email protected]>; +Cc: Nathan Bossart <[email protected]>; pgsql-hackers On Thu, Jul 9, 2026 at 1:04 PM Michael Paquier <[email protected]> wrote: > > On Wed, Jul 08, 2026 at 09:50:33PM -0500, Nathan Bossart wrote: > > While trying to understand the extent of our spinlock usage, I noticed that > > WaitEventCustomCounterData->mutex is unnecessary because the counter is > > only ever accessed with WaitEventCustomLock held exclusively. So, here's a > > patch to simplify matters a bit. Thoughts? > > Indeed. This removal sounds good to me, thanks. #include "storage/spin.h" seems no longer needed in wait_event.c, since the patch removes the last use of the spinlock code there. So we can remove that include as well? Regards, -- Fujii Masao ^ permalink raw reply [nested|flat] 6+ messages in thread
* Re: remove WaitEventCustomCounterData @ 2026-07-09 16:10 Nathan Bossart <[email protected]> parent: Fujii Masao <[email protected]> 0 siblings, 0 replies; 6+ messages in thread From: Nathan Bossart @ 2026-07-09 16:10 UTC (permalink / raw) To: Fujii Masao <[email protected]>; +Cc: Michael Paquier <[email protected]>; pgsql-hackers On Thu, Jul 09, 2026 at 01:22:52PM +0900, Fujii Masao wrote: > #include "storage/spin.h" seems no longer needed in wait_event.c, > since the patch removes the last use of the spinlock code there. > So we can remove that include as well? I think so. I've committed the patch with that change. Thanks for looking! -- nathan ^ permalink raw reply [nested|flat] 6+ messages in thread
end of thread, other threads:[~2026-07-09 16:10 UTC | newest] Thread overview: 6+ messages (download: mbox mbox.gz follow: Atom feed) -- links below jump to the message on this page -- 2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <[email protected]> 2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <[email protected]> 2026-07-09 02:50 remove WaitEventCustomCounterData Nathan Bossart <[email protected]> 2026-07-09 04:04 ` Michael Paquier <[email protected]> 2026-07-09 04:22 ` Fujii Masao <[email protected]> 2026-07-09 16:10 ` Nathan Bossart <[email protected]>
This inbox is served by agora; see mirroring instructions for how to clone and mirror all data and code used for this inbox