From c3e9b07936f70388c6f5341b68d6a04d40e07b86 Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Wed, 6 Apr 2022 12:41:29 -0700 Subject: [PATCH] pgstat: move pgstat_report_autovac() to pgstat_database.c. I got the location wrong in 13619598f10. The name did make it sound like it belonged in pgstat_relation.c... --- src/backend/utils/activity/pgstat_database.c | 20 ++++++++++++++++++++ src/backend/utils/activity/pgstat_relation.c | 20 -------------------- src/include/pgstat.h | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/backend/utils/activity/pgstat_database.c b/src/backend/utils/activity/pgstat_database.c index b4fba80835..6c38fe86a4 100644 --- a/src/backend/utils/activity/pgstat_database.c +++ b/src/backend/utils/activity/pgstat_database.c @@ -54,6 +54,26 @@ pgstat_drop_database(Oid databaseid) pgstat_send(&msg, sizeof(msg)); } +/* + * Called from autovacuum.c to report startup of an autovacuum process. + * We are called before InitPostgres is done, so can't rely on MyDatabaseId; + * the db OID must be passed in, instead. + */ +void +pgstat_report_autovac(Oid dboid) +{ + PgStat_MsgAutovacStart msg; + + if (pgStatSock == PGINVALID_SOCKET) + return; + + pgstat_setheader(&msg.m_hdr, PGSTAT_MTYPE_AUTOVAC_START); + msg.m_databaseid = dboid; + msg.m_start_time = GetCurrentTimestamp(); + + pgstat_send(&msg, sizeof(msg)); +} + /* * Tell the collector about a Hot Standby recovery conflict. */ diff --git a/src/backend/utils/activity/pgstat_relation.c b/src/backend/utils/activity/pgstat_relation.c index 74b62c39c0..957f5b858a 100644 --- a/src/backend/utils/activity/pgstat_relation.c +++ b/src/backend/utils/activity/pgstat_relation.c @@ -167,26 +167,6 @@ pgstat_drop_relation(Oid relid) } #endif /* NOT_USED */ -/* - * Called from autovacuum.c to report startup of an autovacuum process. - * We are called before InitPostgres is done, so can't rely on MyDatabaseId; - * the db OID must be passed in, instead. - */ -void -pgstat_report_autovac(Oid dboid) -{ - PgStat_MsgAutovacStart msg; - - if (pgStatSock == PGINVALID_SOCKET) - return; - - pgstat_setheader(&msg.m_hdr, PGSTAT_MTYPE_AUTOVAC_START); - msg.m_databaseid = dboid; - msg.m_start_time = GetCurrentTimestamp(); - - pgstat_send(&msg, sizeof(msg)); -} - /* * Tell the collector about the table we just vacuumed. */ diff --git a/src/include/pgstat.h b/src/include/pgstat.h index 3584078f6e..41fdf5f5a3 100644 --- a/src/include/pgstat.h +++ b/src/include/pgstat.h @@ -1025,6 +1025,7 @@ extern void pgstat_send_checkpointer(void); */ extern void pgstat_drop_database(Oid databaseid); +extern void pgstat_report_autovac(Oid dboid); extern void pgstat_report_recovery_conflict(int reason); extern void pgstat_report_deadlock(void); extern void pgstat_report_checksum_failures_in_db(Oid dboid, int failurecount); @@ -1060,7 +1061,6 @@ extern PgStat_BackendFunctionEntry *find_funcstat_entry(Oid func_id); extern void pgstat_relation_init(Relation rel); -extern void pgstat_report_autovac(Oid dboid); extern void pgstat_report_vacuum(Oid tableoid, bool shared, PgStat_Counter livetuples, PgStat_Counter deadtuples); extern void pgstat_report_analyze(Relation rel,