From a619808fb9a4c49f98146efee1829093922bb897 Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Wed, 1 Jun 2016 16:35:34 +0300 Subject: [PATCH] Remove checkpoint.h, and move the definitions in it to bgwriter.h. Having a "checkpoint.h", corresponding to "checkpoint.c", makes perfect sense, but those function definitions are in bgwriter.h in PostgreSQL, and keeping the code as close to upstream as possible trumps the consistency of keeping definitions for "foo.c" in header file called "foo.h". Keeping things close to upstream makes merging easier. --- src/backend/access/transam/xlog.c | 2 +- src/backend/bootstrap/bootstrap.c | 1 - src/backend/cdb/cdbutil.c | 1 - src/backend/commands/dbcommands.c | 1 - src/backend/postmaster/checkpoint.c | 1 - src/backend/postmaster/postmaster.c | 2 +- src/backend/storage/ipc/ipci.c | 1 - src/backend/tcop/utility.c | 2 +- src/backend/utils/misc/faultinjector.c | 2 +- src/backend/utils/misc/guc.c | 1 - src/include/postmaster/bgwriter.h | 8 ++++++++ src/include/postmaster/checkpoint.h | 27 -------------------------- 12 files changed, 12 insertions(+), 37 deletions(-) delete mode 100755 src/include/postmaster/checkpoint.h diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 90601a1b0c..9b2196185d 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -48,8 +48,8 @@ #include "libpq/hba.h" #include "miscadmin.h" #include "pgstat.h" +#include "postmaster/bgwriter.h" #include "postmaster/postmaster.h" -#include "postmaster/checkpoint.h" #include "storage/bufpage.h" #include "storage/fd.h" #include "storage/ipc.h" diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c index 297ae902ed..5b3d32ed69 100644 --- a/src/backend/bootstrap/bootstrap.c +++ b/src/backend/bootstrap/bootstrap.c @@ -36,7 +36,6 @@ #include "miscadmin.h" #include "nodes/makefuncs.h" #include "postmaster/bgwriter.h" -#include "postmaster/checkpoint.h" #include "postmaster/primary_mirror_mode.h" #include "replication/walreceiver.h" #include "storage/freespace.h" diff --git a/src/backend/cdb/cdbutil.c b/src/backend/cdb/cdbutil.c index f5ea4ccbf2..0620a70fe5 100644 --- a/src/backend/cdb/cdbutil.c +++ b/src/backend/cdb/cdbutil.c @@ -39,7 +39,6 @@ #include "cdb/cdbtm.h" #include "cdb/cdbfts.h" #include "libpq/ip.h" -#include "postmaster/checkpoint.h" #include "catalog/indexing.h" #include "utils/faultinjection.h" diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c index fcea891aee..6e059ce633 100644 --- a/src/backend/commands/dbcommands.c +++ b/src/backend/commands/dbcommands.c @@ -46,7 +46,6 @@ #include "mb/pg_wchar.h" #include "miscadmin.h" #include "pgstat.h" -#include "postmaster/checkpoint.h" #include "postmaster/bgwriter.h" #include "storage/freespace.h" #include "storage/ipc.h" diff --git a/src/backend/postmaster/checkpoint.c b/src/backend/postmaster/checkpoint.c index f8969ec7a2..bcf5ac0591 100755 --- a/src/backend/postmaster/checkpoint.c +++ b/src/backend/postmaster/checkpoint.c @@ -42,7 +42,6 @@ #include "access/xlog_internal.h" #include "libpq/pqsignal.h" #include "miscadmin.h" -#include "postmaster/checkpoint.h" #include "postmaster/bgwriter.h" #include "storage/fd.h" #include "storage/freespace.h" diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 2b7a5c0f23..e29feb1883 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -120,11 +120,11 @@ #include "miscadmin.h" #include "pgstat.h" #include "postmaster/autovacuum.h" +#include "postmaster/bgwriter.h" #include "postmaster/fork_process.h" #include "postmaster/pgarch.h" #include "postmaster/postmaster.h" #include "postmaster/seqserver.h" -#include "postmaster/checkpoint.h" #include "postmaster/fts.h" #include "postmaster/perfmon.h" #include "postmaster/primary_mirror_mode.h" diff --git a/src/backend/storage/ipc/ipci.c b/src/backend/storage/ipc/ipci.c index edfb94790f..edccca55aa 100644 --- a/src/backend/storage/ipc/ipci.c +++ b/src/backend/storage/ipc/ipci.c @@ -42,7 +42,6 @@ #include "pgstat.h" #include "postmaster/autovacuum.h" #include "postmaster/bgwriter.h" -#include "postmaster/checkpoint.h" #include "postmaster/postmaster.h" #include "postmaster/primary_mirror_mode.h" #include "postmaster/seqserver.h" diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c index 915f7b2ca2..348cd0e0ce 100644 --- a/src/backend/tcop/utility.c +++ b/src/backend/tcop/utility.c @@ -52,7 +52,7 @@ #include "commands/view.h" #include "miscadmin.h" #include "optimizer/planmain.h" -#include "postmaster/checkpoint.h" +#include "postmaster/bgwriter.h" #include "rewrite/rewriteDefine.h" #include "rewrite/rewriteRemove.h" #include "storage/fd.h" diff --git a/src/backend/utils/misc/faultinjector.c b/src/backend/utils/misc/faultinjector.c index bd6bd7c901..0a774be67e 100644 --- a/src/backend/utils/misc/faultinjector.c +++ b/src/backend/utils/misc/faultinjector.c @@ -24,7 +24,7 @@ #include "cdb/cdbfilerep.h" #include "cdb/cdbfilerepservice.h" #include "cdb/cdbresynchronizechangetracking.h" -#include "postmaster/checkpoint.h" +#include "postmaster/bgwriter.h" #include "cdb/cdbutil.h" #include "postmaster/fts.h" #include "storage/spin.h" diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index c79b6df42d..d98d10fc6d 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -50,7 +50,6 @@ #include "pgstat.h" #include "postmaster/autovacuum.h" #include "postmaster/bgwriter.h" -#include "postmaster/checkpoint.h" #include "postmaster/postmaster.h" #include "postmaster/syslogger.h" #include "replication/walsender.h" diff --git a/src/include/postmaster/bgwriter.h b/src/include/postmaster/bgwriter.h index 9c9dbc7d11..c65904783c 100644 --- a/src/include/postmaster/bgwriter.h +++ b/src/include/postmaster/bgwriter.h @@ -18,8 +18,13 @@ /* GUC options */ extern int BgWriterDelay; +extern int CheckPointTimeout; +extern int CheckPointWarning; extern void BackgroundWriterMain(void); +extern void CheckpointMain(void); + +extern void RequestCheckpoint(bool waitforit, bool warnontime); extern void RequestCheckpointSmgrCloseAll(void); @@ -29,6 +34,9 @@ extern void AbsorbFsyncRequests(void); extern Size BgWriterShmemSize(void); extern void BgWriterShmemInit(void); +extern Size CheckpointShmemSize(void); +extern void CheckpointShmemInit(void); + extern bool AmBackgroundWriterProcess(void); #endif /* _BGWRITER_H */ diff --git a/src/include/postmaster/checkpoint.h b/src/include/postmaster/checkpoint.h deleted file mode 100755 index a46ca47251..0000000000 --- a/src/include/postmaster/checkpoint.h +++ /dev/null @@ -1,27 +0,0 @@ -/*------------------------------------------------------------------------- - * - * checkpoint.h - * Exports from postmaster/checkpoint.c. - * - * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group - * - *------------------------------------------------------------------------- - */ -#ifndef _CHECKPOINT_H -#define _CHECKPOINT_H - -/* GUC options */ -extern int CheckPointTimeout; -extern int CheckPointWarning; - -extern void CheckpointMain(void); - -extern void RequestCheckpoint(bool waitforit, bool warnontime); - -extern Size CheckpointShmemSize(void); -extern void CheckpointShmemInit(void); - -extern int checkpoint_start(void); - -#endif /* _CHECKPOINT_H */ - -- GitLab