From 25200a43631b664859ed256dea20b6db2ef97d66 Mon Sep 17 00:00:00 2001 From: Mike Palmiotto Date: Tue, 17 Mar 2020 18:39:30 +0000 Subject: [PATCH 11/11] Get rid of st_beckendType and use MySubprocess --- src/backend/postmaster/pgstat.c | 103 +--------------------------- src/backend/postmaster/postmaster.c | 3 +- src/backend/utils/adt/pgstatfuncs.c | 9 +-- src/include/pgstat.h | 3 - 4 files changed, 10 insertions(+), 108 deletions(-) diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c index 648b5eadb5..b1356a28df 100644 --- a/src/backend/postmaster/pgstat.c +++ b/src/backend/postmaster/pgstat.c @@ -2821,61 +2821,6 @@ pgstat_bestart(void) */ lbeentry.st_procpid = MyProcPid; - if (MyBackendId != InvalidBackendId) - { - if (IsAutoVacuumLauncherProcess()) - { - /* Autovacuum Launcher */ - lbeentry.st_backendType = B_AUTOVAC_LAUNCHER; - } - else if (IsAutoVacuumWorkerProcess()) - { - /* Autovacuum Worker */ - lbeentry.st_backendType = B_AUTOVAC_WORKER; - } - else if (am_walsender) - { - /* Wal sender */ - lbeentry.st_backendType = B_WAL_SENDER; - } - else if (IsBackgroundWorker) - { - /* bgworker */ - lbeentry.st_backendType = B_BG_WORKER; - } - else - { - /* client-backend */ - lbeentry.st_backendType = B_BACKEND; - } - } - else - { - /* Must be an auxiliary process */ - Assert(MyAuxProcType != NotAnAuxProcess); - switch (MyAuxProcType) - { - case StartupProcess: - lbeentry.st_backendType = B_STARTUP; - break; - case BgWriterProcess: - lbeentry.st_backendType = B_BG_WRITER; - break; - case CheckpointerProcess: - lbeentry.st_backendType = B_CHECKPOINTER; - break; - case WalWriterProcess: - lbeentry.st_backendType = B_WAL_WRITER; - break; - case WalReceiverProcess: - lbeentry.st_backendType = B_WAL_RECEIVER; - break; - default: - elog(FATAL, "unrecognized process type: %d", - (int) MyAuxProcType); - } - } - lbeentry.st_proc_start_timestamp = MyStartTimestamp; lbeentry.st_activity_start_timestamp = 0; lbeentry.st_state_start_timestamp = 0; @@ -2883,9 +2828,9 @@ pgstat_bestart(void) lbeentry.st_databaseid = MyDatabaseId; /* We have userid for client-backends, wal-sender and bgworker processes */ - if (lbeentry.st_backendType == B_BACKEND - || lbeentry.st_backendType == B_WAL_SENDER - || lbeentry.st_backendType == B_BG_WORKER) + if (MySubprocessType == ClientBackendType + || MySubprocessType == WalSenderType + || MySubprocessType == BgWorkerType) lbeentry.st_userid = GetSessionUserId(); else lbeentry.st_userid = InvalidOid; @@ -4197,48 +4142,6 @@ pgstat_get_crashed_backend_activity(int pid, char *buffer, int buflen) return NULL; } -const char * -pgstat_get_backend_desc(BackendType backendType) -{ - const char *backendDesc = "unknown process type"; - - switch (backendType) - { - case B_AUTOVAC_LAUNCHER: - backendDesc = "autovacuum launcher"; - break; - case B_AUTOVAC_WORKER: - backendDesc = "autovacuum worker"; - break; - case B_BACKEND: - backendDesc = "client backend"; - break; - case B_BG_WORKER: - backendDesc = "background worker"; - break; - case B_BG_WRITER: - backendDesc = "background writer"; - break; - case B_CHECKPOINTER: - backendDesc = "checkpointer"; - break; - case B_STARTUP: - backendDesc = "startup"; - break; - case B_WAL_RECEIVER: - backendDesc = "walreceiver"; - break; - case B_WAL_SENDER: - backendDesc = "walsender"; - break; - case B_WAL_WRITER: - backendDesc = "walwriter"; - break; - } - - return backendDesc; -} - /* ------------------------------------------------------------ * Local support functions follow * ------------------------------------------------------------ diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 09f8bbb298..65b8c120b5 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -2085,6 +2085,7 @@ retry1: */ if (strcmp(valptr, "database") == 0) { + InitMySubprocess(WalSenderType); am_walsender = true; am_db_walsender = true; } @@ -4436,7 +4437,7 @@ BackendInitialize(Port *port) * init_ps_display() to avoid abusing the parameters like this. */ if (am_walsender) - init_ps_display(pgstat_get_backend_desc(B_WAL_SENDER), port->user_name, remote_ps_data, + init_ps_display(MySubprocess->desc, port->user_name, remote_ps_data, update_process_title ? "authentication" : ""); else init_ps_display(port->user_name, port->database_name, remote_ps_data, diff --git a/src/backend/utils/adt/pgstatfuncs.c b/src/backend/utils/adt/pgstatfuncs.c index 54d2673254..b5692676d6 100644 --- a/src/backend/utils/adt/pgstatfuncs.c +++ b/src/backend/utils/adt/pgstatfuncs.c @@ -24,6 +24,7 @@ #include "pgstat.h" #include "postmaster/bgworker_internals.h" #include "postmaster/postmaster.h" +#include "postmaster/subprocess.h" #include "storage/proc.h" #include "storage/procarray.h" #include "utils/acl.h" @@ -693,7 +694,7 @@ pg_stat_get_activity(PG_FUNCTION_ARGS) proc = BackendPidGetProc(beentry->st_procpid); - if (proc == NULL && (beentry->st_backendType != B_BACKEND)) + if (proc == NULL && (MySubprocessType != ClientBackendType)) { /* * For an auxiliary process, retrieve process info from @@ -741,7 +742,7 @@ pg_stat_get_activity(PG_FUNCTION_ARGS) * date. */ if (beentry->st_xact_start_timestamp != 0 && - beentry->st_backendType != B_WAL_SENDER) + MySubprocessType != WalSenderType) values[8] = TimestampTzGetDatum(beentry->st_xact_start_timestamp); else nulls[8] = true; @@ -829,7 +830,7 @@ pg_stat_get_activity(PG_FUNCTION_ARGS) } } /* Add backend type */ - if (beentry->st_backendType == B_BG_WORKER) + if (MySubprocessType == BgWorkerType) { const char *bgw_type; @@ -841,7 +842,7 @@ pg_stat_get_activity(PG_FUNCTION_ARGS) } else values[17] = - CStringGetTextDatum(pgstat_get_backend_desc(beentry->st_backendType)); + CStringGetTextDatum(MySubprocess->desc); /* SSL information */ if (beentry->st_ssl) diff --git a/src/include/pgstat.h b/src/include/pgstat.h index c7ddfaecc2..97c1683e47 100644 --- a/src/include/pgstat.h +++ b/src/include/pgstat.h @@ -1049,9 +1049,6 @@ typedef struct PgBackendStatus /* The entry is valid iff st_procpid > 0, unused if st_procpid == 0 */ int st_procpid; - /* Type of backends */ - BackendType st_backendType; - /* Times when current backend, transaction, and activity started */ TimestampTz st_proc_start_timestamp; TimestampTz st_xact_start_timestamp; -- 2.21.1