From 71fc3127621f6da6131236423d2ce44385cfbe70 Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Sat, 1 Mar 2025 00:18:03 +0200 Subject: [PATCH v6 1/5] Rename postmaster/interrupt.c to interrupt_handlers.c --- contrib/pg_prewarm/autoprewarm.c | 2 +- src/backend/commands/vacuum.c | 2 +- src/backend/postmaster/Makefile | 2 +- src/backend/postmaster/autovacuum.c | 2 +- src/backend/postmaster/bgwriter.c | 2 +- src/backend/postmaster/checkpointer.c | 2 +- .../postmaster/{interrupt.c => interrupt_handlers.c} | 8 ++++---- src/backend/postmaster/meson.build | 2 +- src/backend/postmaster/pgarch.c | 2 +- src/backend/postmaster/syslogger.c | 2 +- src/backend/postmaster/walsummarizer.c | 2 +- src/backend/postmaster/walwriter.c | 2 +- src/backend/replication/logical/applyparallelworker.c | 2 +- src/backend/replication/logical/launcher.c | 2 +- src/backend/replication/logical/slotsync.c | 2 +- src/backend/replication/logical/worker.c | 2 +- src/backend/replication/slot.c | 2 +- src/backend/replication/walreceiver.c | 2 +- src/backend/replication/walsender.c | 2 +- src/backend/tcop/postgres.c | 2 +- src/backend/utils/init/miscinit.c | 2 +- .../postmaster/{interrupt.h => interrupt_handlers.h} | 10 +++++----- src/test/modules/worker_spi/worker_spi.c | 2 +- 23 files changed, 30 insertions(+), 30 deletions(-) rename src/backend/postmaster/{interrupt.c => interrupt_handlers.c} (94%) rename src/include/postmaster/{interrupt.h => interrupt_handlers.h} (82%) diff --git a/contrib/pg_prewarm/autoprewarm.c b/contrib/pg_prewarm/autoprewarm.c index b45755b3347..1d7facf1f36 100644 --- a/contrib/pg_prewarm/autoprewarm.c +++ b/contrib/pg_prewarm/autoprewarm.c @@ -32,7 +32,7 @@ #include "access/xact.h" #include "pgstat.h" #include "postmaster/bgworker.h" -#include "postmaster/interrupt.h" +#include "postmaster/interrupt_handlers.h" #include "storage/buf_internals.h" #include "storage/dsm.h" #include "storage/dsm_registry.h" diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c index e81c9a8aba3..e25ab97bc71 100644 --- a/src/backend/commands/vacuum.c +++ b/src/backend/commands/vacuum.c @@ -46,7 +46,7 @@ #include "pgstat.h" #include "postmaster/autovacuum.h" #include "postmaster/bgworker_internals.h" -#include "postmaster/interrupt.h" +#include "postmaster/interrupt_handlers.h" #include "storage/bufmgr.h" #include "storage/lmgr.h" #include "storage/pmsignal.h" diff --git a/src/backend/postmaster/Makefile b/src/backend/postmaster/Makefile index 0f4435d2d97..ee43e446c65 100644 --- a/src/backend/postmaster/Makefile +++ b/src/backend/postmaster/Makefile @@ -19,7 +19,7 @@ OBJS = \ bgwriter.o \ checkpointer.o \ fork_process.o \ - interrupt.o \ + interrupt_handlers.o \ launch_backend.o \ pgarch.o \ pmchild.o \ diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c index 800815dfbcc..cdbdc0f3b80 100644 --- a/src/backend/postmaster/autovacuum.c +++ b/src/backend/postmaster/autovacuum.c @@ -86,7 +86,7 @@ #include "nodes/makefuncs.h" #include "pgstat.h" #include "postmaster/autovacuum.h" -#include "postmaster/interrupt.h" +#include "postmaster/interrupt_handlers.h" #include "postmaster/postmaster.h" #include "storage/bufmgr.h" #include "storage/ipc.h" diff --git a/src/backend/postmaster/bgwriter.c b/src/backend/postmaster/bgwriter.c index a688cc5d2a1..4d2165fa998 100644 --- a/src/backend/postmaster/bgwriter.c +++ b/src/backend/postmaster/bgwriter.c @@ -37,7 +37,7 @@ #include "pgstat.h" #include "postmaster/auxprocess.h" #include "postmaster/bgwriter.h" -#include "postmaster/interrupt.h" +#include "postmaster/interrupt_handlers.h" #include "storage/buf_internals.h" #include "storage/bufmgr.h" #include "storage/condition_variable.h" diff --git a/src/backend/postmaster/checkpointer.c b/src/backend/postmaster/checkpointer.c index 0e228d143a0..e3759a7a80b 100644 --- a/src/backend/postmaster/checkpointer.c +++ b/src/backend/postmaster/checkpointer.c @@ -47,7 +47,7 @@ #include "pgstat.h" #include "postmaster/auxprocess.h" #include "postmaster/bgwriter.h" -#include "postmaster/interrupt.h" +#include "postmaster/interrupt_handlers.h" #include "replication/syncrep.h" #include "storage/bufmgr.h" #include "storage/condition_variable.h" diff --git a/src/backend/postmaster/interrupt.c b/src/backend/postmaster/interrupt_handlers.c similarity index 94% rename from src/backend/postmaster/interrupt.c rename to src/backend/postmaster/interrupt_handlers.c index 0ae9bf906ec..14fd74b46d3 100644 --- a/src/backend/postmaster/interrupt.c +++ b/src/backend/postmaster/interrupt_handlers.c @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------- * - * interrupt.c - * Interrupt handling routines. + * interrupt_handlers.c + * Common signal and interrupt handling routines. * * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * src/backend/postmaster/interrupt.c + * src/backend/postmaster/interrupt_handlers.c * *------------------------------------------------------------------------- */ @@ -17,7 +17,7 @@ #include #include "miscadmin.h" -#include "postmaster/interrupt.h" +#include "postmaster/interrupt_handlers.h" #include "storage/ipc.h" #include "storage/latch.h" #include "storage/procsignal.h" diff --git a/src/backend/postmaster/meson.build b/src/backend/postmaster/meson.build index 0008603cfee..94e8a8a9e3f 100644 --- a/src/backend/postmaster/meson.build +++ b/src/backend/postmaster/meson.build @@ -7,7 +7,7 @@ backend_sources += files( 'bgwriter.c', 'checkpointer.c', 'fork_process.c', - 'interrupt.c', + 'interrupt_handlers.c', 'launch_backend.c', 'pgarch.c', 'pmchild.c', diff --git a/src/backend/postmaster/pgarch.c b/src/backend/postmaster/pgarch.c index dbe4e1d426b..1cd2ae87e18 100644 --- a/src/backend/postmaster/pgarch.c +++ b/src/backend/postmaster/pgarch.c @@ -37,7 +37,7 @@ #include "libpq/pqsignal.h" #include "pgstat.h" #include "postmaster/auxprocess.h" -#include "postmaster/interrupt.h" +#include "postmaster/interrupt_handlers.h" #include "postmaster/pgarch.h" #include "storage/condition_variable.h" #include "storage/fd.h" diff --git a/src/backend/postmaster/syslogger.c b/src/backend/postmaster/syslogger.c index 50c2edec1f6..2a61a8b766b 100644 --- a/src/backend/postmaster/syslogger.c +++ b/src/backend/postmaster/syslogger.c @@ -39,7 +39,7 @@ #include "pgstat.h" #include "pgtime.h" #include "port/pg_bitutils.h" -#include "postmaster/interrupt.h" +#include "postmaster/interrupt_handlers.h" #include "postmaster/postmaster.h" #include "postmaster/syslogger.h" #include "storage/dsm.h" diff --git a/src/backend/postmaster/walsummarizer.c b/src/backend/postmaster/walsummarizer.c index ccba0f84e6e..3184961462a 100644 --- a/src/backend/postmaster/walsummarizer.c +++ b/src/backend/postmaster/walsummarizer.c @@ -35,7 +35,7 @@ #include "miscadmin.h" #include "pgstat.h" #include "postmaster/auxprocess.h" -#include "postmaster/interrupt.h" +#include "postmaster/interrupt_handlers.h" #include "postmaster/walsummarizer.h" #include "replication/walreceiver.h" #include "storage/fd.h" diff --git a/src/backend/postmaster/walwriter.c b/src/backend/postmaster/walwriter.c index 0380601bcbb..de16ac4a956 100644 --- a/src/backend/postmaster/walwriter.c +++ b/src/backend/postmaster/walwriter.c @@ -49,7 +49,7 @@ #include "miscadmin.h" #include "pgstat.h" #include "postmaster/auxprocess.h" -#include "postmaster/interrupt.h" +#include "postmaster/interrupt_handlers.h" #include "postmaster/walwriter.h" #include "storage/bufmgr.h" #include "storage/condition_variable.h" diff --git a/src/backend/replication/logical/applyparallelworker.c b/src/backend/replication/logical/applyparallelworker.c index d25085d3515..4d2d3fd2c56 100644 --- a/src/backend/replication/logical/applyparallelworker.c +++ b/src/backend/replication/logical/applyparallelworker.c @@ -160,7 +160,7 @@ #include "libpq/pqformat.h" #include "libpq/pqmq.h" #include "pgstat.h" -#include "postmaster/interrupt.h" +#include "postmaster/interrupt_handlers.h" #include "replication/logicallauncher.h" #include "replication/logicalworker.h" #include "replication/origin.h" diff --git a/src/backend/replication/logical/launcher.c b/src/backend/replication/logical/launcher.c index a3c7adbf1a8..434bb1f6f62 100644 --- a/src/backend/replication/logical/launcher.c +++ b/src/backend/replication/logical/launcher.c @@ -29,7 +29,7 @@ #include "miscadmin.h" #include "pgstat.h" #include "postmaster/bgworker.h" -#include "postmaster/interrupt.h" +#include "postmaster/interrupt_handlers.h" #include "replication/logicallauncher.h" #include "replication/slot.h" #include "replication/walreceiver.h" diff --git a/src/backend/replication/logical/slotsync.c b/src/backend/replication/logical/slotsync.c index 2c0a7439be4..44cc5c6fc37 100644 --- a/src/backend/replication/logical/slotsync.c +++ b/src/backend/replication/logical/slotsync.c @@ -55,7 +55,7 @@ #include "commands/dbcommands.h" #include "libpq/pqsignal.h" #include "pgstat.h" -#include "postmaster/interrupt.h" +#include "postmaster/interrupt_handlers.h" #include "replication/logical.h" #include "replication/slotsync.h" #include "replication/snapbuild.h" diff --git a/src/backend/replication/logical/worker.c b/src/backend/replication/logical/worker.c index 31ab69ea13a..67d0647aa32 100644 --- a/src/backend/replication/logical/worker.c +++ b/src/backend/replication/logical/worker.c @@ -165,7 +165,7 @@ #include "parser/parse_relation.h" #include "pgstat.h" #include "postmaster/bgworker.h" -#include "postmaster/interrupt.h" +#include "postmaster/interrupt_handlers.h" #include "postmaster/walwriter.h" #include "replication/conflict.h" #include "replication/logicallauncher.h" diff --git a/src/backend/replication/slot.c b/src/backend/replication/slot.c index 719e531eb90..ca271330594 100644 --- a/src/backend/replication/slot.c +++ b/src/backend/replication/slot.c @@ -46,7 +46,7 @@ #include "common/string.h" #include "miscadmin.h" #include "pgstat.h" -#include "postmaster/interrupt.h" +#include "postmaster/interrupt_handlers.h" #include "replication/slotsync.h" #include "replication/slot.h" #include "replication/walsender_private.h" diff --git a/src/backend/replication/walreceiver.c b/src/backend/replication/walreceiver.c index 83129cb92af..7392e89767d 100644 --- a/src/backend/replication/walreceiver.c +++ b/src/backend/replication/walreceiver.c @@ -64,7 +64,7 @@ #include "miscadmin.h" #include "pgstat.h" #include "postmaster/auxprocess.h" -#include "postmaster/interrupt.h" +#include "postmaster/interrupt_handlers.h" #include "replication/walreceiver.h" #include "replication/walsender.h" #include "storage/ipc.h" diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c index 446d10c1a7d..ecd96ad7dbc 100644 --- a/src/backend/replication/walsender.c +++ b/src/backend/replication/walsender.c @@ -68,7 +68,7 @@ #include "miscadmin.h" #include "nodes/replnodes.h" #include "pgstat.h" -#include "postmaster/interrupt.h" +#include "postmaster/interrupt_handlers.h" #include "replication/decode.h" #include "replication/logical.h" #include "replication/slotsync.h" diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index 947ffb40421..60ab8cd40c7 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -53,7 +53,7 @@ #include "pg_getopt.h" #include "pg_trace.h" #include "pgstat.h" -#include "postmaster/interrupt.h" +#include "postmaster/interrupt_handlers.h" #include "postmaster/postmaster.h" #include "replication/logicallauncher.h" #include "replication/logicalworker.h" diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c index dc3521457c7..34b8450b53c 100644 --- a/src/backend/utils/init/miscinit.c +++ b/src/backend/utils/init/miscinit.c @@ -38,7 +38,7 @@ #include "miscadmin.h" #include "pgstat.h" #include "postmaster/autovacuum.h" -#include "postmaster/interrupt.h" +#include "postmaster/interrupt_handlers.h" #include "postmaster/postmaster.h" #include "replication/slotsync.h" #include "storage/fd.h" diff --git a/src/include/postmaster/interrupt.h b/src/include/postmaster/interrupt_handlers.h similarity index 82% rename from src/include/postmaster/interrupt.h rename to src/include/postmaster/interrupt_handlers.h index 3bf49320846..b3a8c38353e 100644 --- a/src/include/postmaster/interrupt.h +++ b/src/include/postmaster/interrupt_handlers.h @@ -1,7 +1,7 @@ /*------------------------------------------------------------------------- * - * interrupt.h - * Interrupt handling routines. + * interrupt_handlers.h + * Common signal and interrupt handling routines. * * Responses to interrupts are fairly varied and many types of backends * have their own implementations, but we provide a few generic things @@ -11,13 +11,13 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * src/include/postmaster/interrupt.h + * src/include/postmaster/interrupt_handlers.h * *------------------------------------------------------------------------- */ -#ifndef INTERRUPT_H -#define INTERRUPT_H +#ifndef INTERRUPT_HANDLERS_H +#define INTERRUPT_HANDLERS_H #include diff --git a/src/test/modules/worker_spi/worker_spi.c b/src/test/modules/worker_spi/worker_spi.c index 5b87d4f7038..1e4e813314f 100644 --- a/src/test/modules/worker_spi/worker_spi.c +++ b/src/test/modules/worker_spi/worker_spi.c @@ -25,7 +25,7 @@ /* These are always necessary for a bgworker */ #include "miscadmin.h" #include "postmaster/bgworker.h" -#include "postmaster/interrupt.h" +#include "postmaster/interrupt_handlers.h" #include "storage/latch.h" /* these headers are used by this particular worker's code */ -- 2.39.5