agora inbox for pgsql-hackers@postgresql.org
help / color / mirror / Atom feed[PATCH v3] Fix DROP PROPERTY GRAPH "unsupported object class" error
327+ messages / 5 participants
[nested] [flat]
* [PATCH v3] Fix DROP PROPERTY GRAPH "unsupported object class" error
@ 2026-04-23 09:27 Bertrand Drouvot <bertranddrouvot.pg@gmail.com>
0 siblings, 0 replies; 327+ messages in thread
From: Bertrand Drouvot @ 2026-04-23 09:27 UTC (permalink / raw)
getObjectTypeDescription() and getObjectIdentityParts() are missing switch cases
for PropgraphElementLabelRelationId and PropgraphLabelPropertyRelationId, causing
them to hit the default case and error out with "unsupported object class".
During DROP PROPERTY GRAPH, this manifests when an event trigger is active,
because pg_event_trigger_ddl_commands() calls these functions. The same code
paths are also reachable via pg_identify_object() and pg_identify_object_as_address().
This commit adds the missing cases.
Test coverage is added in object_address.sql for these two catalog types and
in create_property_graph.sql covering all property graph object types.
A test in event_trigger.sql verifies that DROP PROPERTY GRAPH works correctly
when an event trigger is active.
Author: Bertrand Drouvot <bertranddrouvot.pg@gmail.com>
Reviewed-by: Michael Paquier <michael@paquier.xyz>
Reviewed-by: Ashutosh Bapat <ashutosh.bapat.oss@gmail.com>
Discussion: https://postgr.es/m/aej1DkLwhyZWmtxJ@bdtpg
---
src/backend/catalog/objectaddress.c | 93 +++++++++++++++++++
.../expected/create_property_graph.out | 78 ++++++++++++++++
src/test/regress/expected/event_trigger.out | 17 ++++
src/test/regress/expected/object_address.out | 10 +-
.../regress/sql/create_property_graph.sql | 23 +++++
src/test/regress/sql/event_trigger.sql | 13 +++
src/test/regress/sql/object_address.sql | 6 +-
7 files changed, 238 insertions(+), 2 deletions(-)
14.7% src/backend/catalog/
75.5% src/test/regress/expected/
9.7% src/test/regress/sql/
diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c
index c1862809577..e2d6d8f71f6 100644
--- a/src/backend/catalog/objectaddress.c
+++ b/src/backend/catalog/objectaddress.c
@@ -4901,10 +4901,18 @@ getObjectTypeDescription(const ObjectAddress *object, bool missing_ok)
appendStringInfoString(&buffer, "policy");
break;
+ case PropgraphElementLabelRelationId:
+ appendStringInfoString(&buffer, "property graph element label");
+ break;
+
case PropgraphElementRelationId:
appendStringInfoString(&buffer, "property graph element");
break;
+ case PropgraphLabelPropertyRelationId:
+ appendStringInfoString(&buffer, "property graph label property");
+ break;
+
case PropgraphLabelRelationId:
appendStringInfoString(&buffer, "property graph label");
break;
@@ -6161,6 +6169,49 @@ getObjectIdentityParts(const ObjectAddress *object,
break;
}
+ case PropgraphElementLabelRelationId:
+ {
+ Relation ellabelDesc;
+ ScanKeyData skey[1];
+ SysScanDesc ellabelscan;
+ HeapTuple tup;
+ Form_pg_propgraph_element_label pgelform;
+ ObjectAddress oa;
+
+ ellabelDesc = table_open(PropgraphElementLabelRelationId, AccessShareLock);
+ ScanKeyInit(&skey[0],
+ Anum_pg_propgraph_element_label_oid,
+ BTEqualStrategyNumber, F_OIDEQ,
+ ObjectIdGetDatum(object->objectId));
+
+ ellabelscan = systable_beginscan(ellabelDesc,
+ PropgraphElementLabelObjectIndexId,
+ true, NULL, 1, skey);
+
+ tup = systable_getnext(ellabelscan);
+ if (!HeapTupleIsValid(tup))
+ {
+ if (!missing_ok)
+ elog(ERROR, "could not find tuple for element label %u",
+ object->objectId);
+
+ systable_endscan(ellabelscan);
+ table_close(ellabelDesc, AccessShareLock);
+ break;
+ }
+
+ pgelform = (Form_pg_propgraph_element_label) GETSTRUCT(tup);
+
+ ObjectAddressSet(oa, PropgraphElementRelationId, pgelform->pgelelid);
+
+ appendStringInfoString(&buffer, getObjectIdentityParts(&oa, objname,
+ objargs, false));
+
+ systable_endscan(ellabelscan);
+ table_close(ellabelDesc, AccessShareLock);
+ break;
+ }
+
case PropgraphElementRelationId:
{
HeapTuple tup;
@@ -6184,6 +6235,48 @@ getObjectIdentityParts(const ObjectAddress *object,
break;
}
+ case PropgraphLabelPropertyRelationId:
+ {
+ Relation lblpropDesc;
+ ScanKeyData skey[1];
+ SysScanDesc lblpropscan;
+ HeapTuple tup;
+ Form_pg_propgraph_label_property plpform;
+ ObjectAddress oa;
+
+ lblpropDesc = table_open(PropgraphLabelPropertyRelationId,
+ AccessShareLock);
+ ScanKeyInit(&skey[0],
+ Anum_pg_propgraph_label_property_oid,
+ BTEqualStrategyNumber, F_OIDEQ,
+ ObjectIdGetDatum(object->objectId));
+
+ lblpropscan = systable_beginscan(lblpropDesc, PropgraphLabelPropertyObjectIndexId,
+ true, NULL, 1, skey);
+
+ tup = systable_getnext(lblpropscan);
+ if (!HeapTupleIsValid(tup))
+ {
+ if (!missing_ok)
+ elog(ERROR, "could not find tuple for label property %u",
+ object->objectId);
+
+ systable_endscan(lblpropscan);
+ table_close(lblpropDesc, AccessShareLock);
+ break;
+ }
+
+ plpform = (Form_pg_propgraph_label_property) GETSTRUCT(tup);
+
+ ObjectAddressSet(oa, PropgraphElementLabelRelationId, plpform->plpellabelid);
+ appendStringInfoString(&buffer, getObjectIdentityParts(&oa, objname,
+ objargs, false));
+
+ systable_endscan(lblpropscan);
+ table_close(lblpropDesc, AccessShareLock);
+ break;
+ }
+
case PropgraphLabelRelationId:
{
HeapTuple tup;
diff --git a/src/test/regress/expected/create_property_graph.out b/src/test/regress/expected/create_property_graph.out
index bc9a596ec89..eb9e17fb727 100644
--- a/src/test/regress/expected/create_property_graph.out
+++ b/src/test/regress/expected/create_property_graph.out
@@ -752,6 +752,84 @@ SELECT (pg_identify_object(classid, objid, objsubid)).*
type | create_property_graph_tests | g2 | create_property_graph_tests.g2
(21 rows)
+-- test object address functions with recursive dependency walk
+-- covers all property graph object types including indirect dependents
+SELECT *
+FROM (
+ WITH RECURSIVE deps (classid, objid, objsubid, refclassid, refobjid, refobjsubid) AS (
+ SELECT classid, objid, objsubid,
+ refclassid, refobjid, refobjsubid
+ FROM pg_depend
+ WHERE refclassid = 'pg_class'::regclass AND
+ refobjid = 'create_property_graph_tests.gt'::regclass
+ UNION ALL
+ SELECT d.classid, d.objid, d.objsubid,
+ d.refclassid, d.refobjid, d.refobjsubid
+ FROM pg_depend d
+ JOIN deps dp ON d.refclassid = dp.classid AND d.refobjid = dp.objid AND d.refobjsubid = dp.objsubid
+ )
+ SELECT pg_describe_object(classid, objid, objsubid) as obj,
+ pg_identify_object(classid, objid, objsubid) as ident,
+ pg_identify_object_as_address(classid, objid, objsubid) as addr
+ FROM deps
+) s
+ORDER BY obj COLLATE "C", ident::text COLLATE "C";
+ obj | ident | addr
+----------------------------------------------------------+----------------------------------------------------------------------------+----------------------------------------------------------------------------
+ edge e of property graph gt | ("property graph element",,,"e of create_property_graph_tests.gt") | ("property graph element","{create_property_graph_tests,gt,e}",{})
+ edge e of property graph gt | ("property graph element",,,"e of create_property_graph_tests.gt") | ("property graph element","{create_property_graph_tests,gt,e}",{})
+ edge e of property graph gt | ("property graph element",,,"e of create_property_graph_tests.gt") | ("property graph element","{create_property_graph_tests,gt,e}",{})
+ label e of edge e of property graph gt | ("property graph element label",,,"e of create_property_graph_tests.gt") | ("property graph element label","{create_property_graph_tests,gt,e}",{})
+ label e of edge e of property graph gt | ("property graph element label",,,"e of create_property_graph_tests.gt") | ("property graph element label","{create_property_graph_tests,gt,e}",{})
+ label e of edge e of property graph gt | ("property graph element label",,,"e of create_property_graph_tests.gt") | ("property graph element label","{create_property_graph_tests,gt,e}",{})
+ label e of edge e of property graph gt | ("property graph element label",,,"e of create_property_graph_tests.gt") | ("property graph element label","{create_property_graph_tests,gt,e}",{})
+ label e of property graph gt | ("property graph label",,,"e of create_property_graph_tests.gt") | ("property graph label","{create_property_graph_tests,gt,e}",{})
+ label v1 of property graph gt | ("property graph label",,,"v1 of create_property_graph_tests.gt") | ("property graph label","{create_property_graph_tests,gt,v1}",{})
+ label v1 of vertex v1 of property graph gt | ("property graph element label",,,"v1 of create_property_graph_tests.gt") | ("property graph element label","{create_property_graph_tests,gt,v1}",{})
+ label v1 of vertex v1 of property graph gt | ("property graph element label",,,"v1 of create_property_graph_tests.gt") | ("property graph element label","{create_property_graph_tests,gt,v1}",{})
+ label v2 of property graph gt | ("property graph label",,,"v2 of create_property_graph_tests.gt") | ("property graph label","{create_property_graph_tests,gt,v2}",{})
+ label v2 of vertex v2 of property graph gt | ("property graph element label",,,"v2 of create_property_graph_tests.gt") | ("property graph element label","{create_property_graph_tests,gt,v2}",{})
+ label v2 of vertex v2 of property graph gt | ("property graph element label",,,"v2 of create_property_graph_tests.gt") | ("property graph element label","{create_property_graph_tests,gt,v2}",{})
+ property a of label v1 of vertex v1 of property graph gt | ("property graph label property",,,"v1 of create_property_graph_tests.gt") | ("property graph label property","{create_property_graph_tests,gt,v1}",{})
+ property a of label v1 of vertex v1 of property graph gt | ("property graph label property",,,"v1 of create_property_graph_tests.gt") | ("property graph label property","{create_property_graph_tests,gt,v1}",{})
+ property a of label v1 of vertex v1 of property graph gt | ("property graph label property",,,"v1 of create_property_graph_tests.gt") | ("property graph label property","{create_property_graph_tests,gt,v1}",{})
+ property a of property graph gt | ("property graph property",,,"a of create_property_graph_tests.gt") | ("property graph property","{create_property_graph_tests,gt,a}",{})
+ property b of label v1 of vertex v1 of property graph gt | ("property graph label property",,,"v1 of create_property_graph_tests.gt") | ("property graph label property","{create_property_graph_tests,gt,v1}",{})
+ property b of label v1 of vertex v1 of property graph gt | ("property graph label property",,,"v1 of create_property_graph_tests.gt") | ("property graph label property","{create_property_graph_tests,gt,v1}",{})
+ property b of label v1 of vertex v1 of property graph gt | ("property graph label property",,,"v1 of create_property_graph_tests.gt") | ("property graph label property","{create_property_graph_tests,gt,v1}",{})
+ property b of property graph gt | ("property graph property",,,"b of create_property_graph_tests.gt") | ("property graph property","{create_property_graph_tests,gt,b}",{})
+ property c of label e of edge e of property graph gt | ("property graph label property",,,"e of create_property_graph_tests.gt") | ("property graph label property","{create_property_graph_tests,gt,e}",{})
+ property c of label e of edge e of property graph gt | ("property graph label property",,,"e of create_property_graph_tests.gt") | ("property graph label property","{create_property_graph_tests,gt,e}",{})
+ property c of label e of edge e of property graph gt | ("property graph label property",,,"e of create_property_graph_tests.gt") | ("property graph label property","{create_property_graph_tests,gt,e}",{})
+ property c of label e of edge e of property graph gt | ("property graph label property",,,"e of create_property_graph_tests.gt") | ("property graph label property","{create_property_graph_tests,gt,e}",{})
+ property c of label e of edge e of property graph gt | ("property graph label property",,,"e of create_property_graph_tests.gt") | ("property graph label property","{create_property_graph_tests,gt,e}",{})
+ property c of property graph gt | ("property graph property",,,"c of create_property_graph_tests.gt") | ("property graph property","{create_property_graph_tests,gt,c}",{})
+ property k1 of label e of edge e of property graph gt | ("property graph label property",,,"e of create_property_graph_tests.gt") | ("property graph label property","{create_property_graph_tests,gt,e}",{})
+ property k1 of label e of edge e of property graph gt | ("property graph label property",,,"e of create_property_graph_tests.gt") | ("property graph label property","{create_property_graph_tests,gt,e}",{})
+ property k1 of label e of edge e of property graph gt | ("property graph label property",,,"e of create_property_graph_tests.gt") | ("property graph label property","{create_property_graph_tests,gt,e}",{})
+ property k1 of label e of edge e of property graph gt | ("property graph label property",,,"e of create_property_graph_tests.gt") | ("property graph label property","{create_property_graph_tests,gt,e}",{})
+ property k1 of label e of edge e of property graph gt | ("property graph label property",,,"e of create_property_graph_tests.gt") | ("property graph label property","{create_property_graph_tests,gt,e}",{})
+ property k1 of property graph gt | ("property graph property",,,"k1 of create_property_graph_tests.gt") | ("property graph property","{create_property_graph_tests,gt,k1}",{})
+ property k2 of label e of edge e of property graph gt | ("property graph label property",,,"e of create_property_graph_tests.gt") | ("property graph label property","{create_property_graph_tests,gt,e}",{})
+ property k2 of label e of edge e of property graph gt | ("property graph label property",,,"e of create_property_graph_tests.gt") | ("property graph label property","{create_property_graph_tests,gt,e}",{})
+ property k2 of label e of edge e of property graph gt | ("property graph label property",,,"e of create_property_graph_tests.gt") | ("property graph label property","{create_property_graph_tests,gt,e}",{})
+ property k2 of label e of edge e of property graph gt | ("property graph label property",,,"e of create_property_graph_tests.gt") | ("property graph label property","{create_property_graph_tests,gt,e}",{})
+ property k2 of label e of edge e of property graph gt | ("property graph label property",,,"e of create_property_graph_tests.gt") | ("property graph label property","{create_property_graph_tests,gt,e}",{})
+ property k2 of property graph gt | ("property graph property",,,"k2 of create_property_graph_tests.gt") | ("property graph property","{create_property_graph_tests,gt,k2}",{})
+ property m of label v2 of vertex v2 of property graph gt | ("property graph label property",,,"v2 of create_property_graph_tests.gt") | ("property graph label property","{create_property_graph_tests,gt,v2}",{})
+ property m of label v2 of vertex v2 of property graph gt | ("property graph label property",,,"v2 of create_property_graph_tests.gt") | ("property graph label property","{create_property_graph_tests,gt,v2}",{})
+ property m of label v2 of vertex v2 of property graph gt | ("property graph label property",,,"v2 of create_property_graph_tests.gt") | ("property graph label property","{create_property_graph_tests,gt,v2}",{})
+ property m of property graph gt | ("property graph property",,,"m of create_property_graph_tests.gt") | ("property graph property","{create_property_graph_tests,gt,m}",{})
+ property n of label v2 of vertex v2 of property graph gt | ("property graph label property",,,"v2 of create_property_graph_tests.gt") | ("property graph label property","{create_property_graph_tests,gt,v2}",{})
+ property n of label v2 of vertex v2 of property graph gt | ("property graph label property",,,"v2 of create_property_graph_tests.gt") | ("property graph label property","{create_property_graph_tests,gt,v2}",{})
+ property n of label v2 of vertex v2 of property graph gt | ("property graph label property",,,"v2 of create_property_graph_tests.gt") | ("property graph label property","{create_property_graph_tests,gt,v2}",{})
+ property n of property graph gt | ("property graph property",,,"n of create_property_graph_tests.gt") | ("property graph property","{create_property_graph_tests,gt,n}",{})
+ type gt | (type,create_property_graph_tests,gt,create_property_graph_tests.gt) | (type,{create_property_graph_tests.gt},{})
+ type gt[] | (type,create_property_graph_tests,_gt,create_property_graph_tests.gt[]) | (type,{create_property_graph_tests.gt[]},{})
+ vertex v1 of property graph gt | ("property graph element",,,"v1 of create_property_graph_tests.gt") | ("property graph element","{create_property_graph_tests,gt,v1}",{})
+ vertex v2 of property graph gt | ("property graph element",,,"v2 of create_property_graph_tests.gt") | ("property graph element","{create_property_graph_tests,gt,v2}",{})
+(52 rows)
+
\a\t
SELECT pg_get_propgraphdef('g2'::regclass);
CREATE PROPERTY GRAPH create_property_graph_tests.g2
diff --git a/src/test/regress/expected/event_trigger.out b/src/test/regress/expected/event_trigger.out
index 065f586310f..ed8d5df397e 100644
--- a/src/test/regress/expected/event_trigger.out
+++ b/src/test/regress/expected/event_trigger.out
@@ -173,6 +173,23 @@ NOTICE: test_event_trigger: ddl_command_end CREATE USER MAPPING
alter default privileges for role regress_evt_user
revoke delete on tables from regress_evt_user;
NOTICE: test_event_trigger: ddl_command_end ALTER DEFAULT PRIVILEGES
+-- DROP PROPERTY GRAPH should work with event trigger in place
+CREATE TABLE t1x (a int PRIMARY KEY, b text);
+NOTICE: test_event_trigger: ddl_command_start CREATE TABLE
+NOTICE: test_event_trigger: ddl_command_end CREATE TABLE
+CREATE TABLE t2x (i int PRIMARY KEY, j text);
+NOTICE: test_event_trigger: ddl_command_start CREATE TABLE
+NOTICE: test_event_trigger: ddl_command_end CREATE TABLE
+CREATE PROPERTY GRAPH gx
+ VERTEX TABLES (
+ t1x KEY (a) LABEL l1 PROPERTIES (b AS p1),
+ t2x KEY (i) LABEL l2 PROPERTIES (j AS p1)
+);
+NOTICE: test_event_trigger: ddl_command_end CREATE PROPERTY GRAPH
+DROP PROPERTY GRAPH gx;
+NOTICE: test_event_trigger: ddl_command_end DROP PROPERTY GRAPH
+DROP TABLE t1x, t2x;
+NOTICE: test_event_trigger: ddl_command_end DROP TABLE
-- alter owner to non-superuser should fail
alter event trigger regress_event_trigger owner to regress_evt_user;
ERROR: permission denied to change owner of event trigger "regress_event_trigger"
diff --git a/src/test/regress/expected/object_address.out b/src/test/regress/expected/object_address.out
index 97227d67a54..5e53f0b092e 100644
--- a/src/test/regress/expected/object_address.out
+++ b/src/test/regress/expected/object_address.out
@@ -67,7 +67,9 @@ DECLARE
BEGIN
FOR objtype IN VALUES ('toast table'), ('index column'), ('sequence column'),
('toast table column'), ('view column'), ('materialized view column'),
- ('property graph element'), ('property graph label'), ('property graph property')
+ ('property graph element'), ('property graph element label'),
+ ('property graph label'), ('property graph label property'),
+ ('property graph property')
LOOP
BEGIN
PERFORM pg_get_object_address(objtype, '{one}', '{}');
@@ -84,7 +86,9 @@ WARNING: error for toast table column: unsupported object type "toast table col
WARNING: error for view column: unsupported object type "view column"
WARNING: error for materialized view column: unsupported object type "materialized view column"
WARNING: error for property graph element: unsupported object type "property graph element"
+WARNING: error for property graph element label: unrecognized object type "property graph element label"
WARNING: error for property graph label: unsupported object type "property graph label"
+WARNING: error for property graph label property: unrecognized object type "property graph label property"
WARNING: error for property graph property: unsupported object type "property graph property"
-- miscellaneous other errors
select * from pg_get_object_address('operator of access method', '{btree,integer_ops,1}', '{int4,bool}');
@@ -593,7 +597,9 @@ WITH objects (classid, objid, objsubid) AS (VALUES
('pg_parameter_acl'::regclass, 0, 0), -- no parameter ACL
('pg_policy'::regclass, 0, 0), -- no policy
('pg_propgraph_element'::regclass, 0, 0), -- no property graph element
+ ('pg_propgraph_element_label'::regclass, 0, 0), -- no property graph element label
('pg_propgraph_label'::regclass, 0, 0), -- no property graph label
+ ('pg_propgraph_label_property'::regclass, 0, 0), -- no property graph label property
('pg_propgraph_property'::regclass, 0, 0), -- no property graph property
('pg_publication'::regclass, 0, 0), -- no publication
('pg_publication_namespace'::regclass, 0, 0), -- no publication namespace
@@ -653,6 +659,8 @@ ORDER BY objects.classid, objects.objid, objects.objsubid;
("(""parameter ACL"",,,)")|("(""parameter ACL"",,)")|NULL
("(""property graph element"",,,)")|("(""property graph element"",,)")|NULL
("(""property graph label"",,,)")|("(""property graph label"",,)")|NULL
+("(""property graph element label"",,,)")|("(""property graph element label"",,)")|NULL
("(""property graph property"",,,)")|("(""property graph property"",,)")|NULL
+("(""property graph label property"",,,)")|("(""property graph label property"",,)")|NULL
-- restore normal output mode
\a\t
diff --git a/src/test/regress/sql/create_property_graph.sql b/src/test/regress/sql/create_property_graph.sql
index 241f93df302..9608dd5c4af 100644
--- a/src/test/regress/sql/create_property_graph.sql
+++ b/src/test/regress/sql/create_property_graph.sql
@@ -298,6 +298,29 @@ SELECT (pg_identify_object(classid, objid, objsubid)).*
refobjid = 'create_property_graph_tests.g2'::regclass
ORDER BY 1, 2, 3, 4;
+-- test object address functions with recursive dependency walk
+-- covers all property graph object types including indirect dependents
+SELECT *
+FROM (
+ WITH RECURSIVE deps (classid, objid, objsubid, refclassid, refobjid, refobjsubid) AS (
+ SELECT classid, objid, objsubid,
+ refclassid, refobjid, refobjsubid
+ FROM pg_depend
+ WHERE refclassid = 'pg_class'::regclass AND
+ refobjid = 'create_property_graph_tests.gt'::regclass
+ UNION ALL
+ SELECT d.classid, d.objid, d.objsubid,
+ d.refclassid, d.refobjid, d.refobjsubid
+ FROM pg_depend d
+ JOIN deps dp ON d.refclassid = dp.classid AND d.refobjid = dp.objid AND d.refobjsubid = dp.objsubid
+ )
+ SELECT pg_describe_object(classid, objid, objsubid) as obj,
+ pg_identify_object(classid, objid, objsubid) as ident,
+ pg_identify_object_as_address(classid, objid, objsubid) as addr
+ FROM deps
+) s
+ORDER BY obj COLLATE "C", ident::text COLLATE "C";
+
\a\t
SELECT pg_get_propgraphdef('g2'::regclass);
SELECT pg_get_propgraphdef('g3'::regclass);
diff --git a/src/test/regress/sql/event_trigger.sql b/src/test/regress/sql/event_trigger.sql
index 32e9bb58c5e..271f443378b 100644
--- a/src/test/regress/sql/event_trigger.sql
+++ b/src/test/regress/sql/event_trigger.sql
@@ -143,6 +143,19 @@ create user mapping for regress_evt_user server useless_server;
alter default privileges for role regress_evt_user
revoke delete on tables from regress_evt_user;
+-- DROP PROPERTY GRAPH should work with event trigger in place
+CREATE TABLE t1x (a int PRIMARY KEY, b text);
+CREATE TABLE t2x (i int PRIMARY KEY, j text);
+
+CREATE PROPERTY GRAPH gx
+ VERTEX TABLES (
+ t1x KEY (a) LABEL l1 PROPERTIES (b AS p1),
+ t2x KEY (i) LABEL l2 PROPERTIES (j AS p1)
+);
+
+DROP PROPERTY GRAPH gx;
+DROP TABLE t1x, t2x;
+
-- alter owner to non-superuser should fail
alter event trigger regress_event_trigger owner to regress_evt_user;
diff --git a/src/test/regress/sql/object_address.sql b/src/test/regress/sql/object_address.sql
index 1bbe9457c1c..27109d421c7 100644
--- a/src/test/regress/sql/object_address.sql
+++ b/src/test/regress/sql/object_address.sql
@@ -67,7 +67,9 @@ DECLARE
BEGIN
FOR objtype IN VALUES ('toast table'), ('index column'), ('sequence column'),
('toast table column'), ('view column'), ('materialized view column'),
- ('property graph element'), ('property graph label'), ('property graph property')
+ ('property graph element'), ('property graph element label'),
+ ('property graph label'), ('property graph label property'),
+ ('property graph property')
LOOP
BEGIN
PERFORM pg_get_object_address(objtype, '{one}', '{}');
@@ -282,7 +284,9 @@ WITH objects (classid, objid, objsubid) AS (VALUES
('pg_parameter_acl'::regclass, 0, 0), -- no parameter ACL
('pg_policy'::regclass, 0, 0), -- no policy
('pg_propgraph_element'::regclass, 0, 0), -- no property graph element
+ ('pg_propgraph_element_label'::regclass, 0, 0), -- no property graph element label
('pg_propgraph_label'::regclass, 0, 0), -- no property graph label
+ ('pg_propgraph_label_property'::regclass, 0, 0), -- no property graph label property
('pg_propgraph_property'::regclass, 0, 0), -- no property graph property
('pg_publication'::regclass, 0, 0), -- no publication
('pg_publication_namespace'::regclass, 0, 0), -- no publication namespace
--
2.34.1
--R84XrR4Hgw0dH3Ec--
^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* [PATCH v1 1/1] remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 327+ 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] 327+ messages in thread
* remove WaitEventCustomCounterData
@ 2026-07-09 02:50 Nathan Bossart <nathandbossart@gmail.com>
0 siblings, 1 reply; 327+ messages in thread
From: Nathan Bossart @ 2026-07-09 02:50 UTC (permalink / raw)
To: pgsql-hackers; +Cc: michael@paquier.xyz
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] 327+ messages in thread
* Re: remove WaitEventCustomCounterData
@ 2026-07-09 04:04 Michael Paquier <michael@paquier.xyz>
parent: Nathan Bossart <nathandbossart@gmail.com>
0 siblings, 1 reply; 327+ messages in thread
From: Michael Paquier @ 2026-07-09 04:04 UTC (permalink / raw)
To: Nathan Bossart <nathandbossart@gmail.com>; +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, ../../ak8d1aEHqtAdHi7k@paquier.xyz/2-signature.asc)
download
^ permalink raw reply [nested|flat] 327+ messages in thread
* Re: remove WaitEventCustomCounterData
@ 2026-07-09 04:22 Fujii Masao <masao.fujii@gmail.com>
parent: Michael Paquier <michael@paquier.xyz>
0 siblings, 1 reply; 327+ messages in thread
From: Fujii Masao @ 2026-07-09 04:22 UTC (permalink / raw)
To: Michael Paquier <michael@paquier.xyz>; +Cc: Nathan Bossart <nathandbossart@gmail.com>; pgsql-hackers
On Thu, Jul 9, 2026 at 1:04 PM Michael Paquier <michael@paquier.xyz> 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] 327+ messages in thread
* Re: remove WaitEventCustomCounterData
@ 2026-07-09 16:10 Nathan Bossart <nathandbossart@gmail.com>
parent: Fujii Masao <masao.fujii@gmail.com>
0 siblings, 0 replies; 327+ messages in thread
From: Nathan Bossart @ 2026-07-09 16:10 UTC (permalink / raw)
To: Fujii Masao <masao.fujii@gmail.com>; +Cc: Michael Paquier <michael@paquier.xyz>; 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] 327+ messages in thread
end of thread, other threads:[~2026-07-09 16:10 UTC | newest]
Thread overview: 327+ messages (download: mbox mbox.gz follow: Atom feed)
-- links below jump to the message on this page --
2026-04-23 09:27 [PATCH v3] Fix DROP PROPERTY GRAPH "unsupported object class" error Bertrand Drouvot <bertranddrouvot.pg@gmail.com>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 [PATCH v1 1/1] remove WaitEventCustomCounterData Nathan Bossart <nathan@postgresql.org>
2026-07-09 02:50 remove WaitEventCustomCounterData Nathan Bossart <nathandbossart@gmail.com>
2026-07-09 04:04 ` Re: remove WaitEventCustomCounterData Michael Paquier <michael@paquier.xyz>
2026-07-09 04:22 ` Re: remove WaitEventCustomCounterData Fujii Masao <masao.fujii@gmail.com>
2026-07-09 16:10 ` Re: remove WaitEventCustomCounterData Nathan Bossart <nathandbossart@gmail.com>
This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox