diff options
Diffstat (limited to 'src/backend/postmaster')
| -rw-r--r-- | src/backend/postmaster/pgstat.c | 11 | ||||
| -rw-r--r-- | src/backend/postmaster/postmaster.c | 20 |
2 files changed, 11 insertions, 20 deletions
diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c index b429275d9f6..86b873ab36b 100644 --- a/src/backend/postmaster/pgstat.c +++ b/src/backend/postmaster/pgstat.c @@ -13,7 +13,7 @@ * * Copyright (c) 2001-2005, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.97 2005/06/28 05:08:59 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.98 2005/06/29 22:51:55 tgl Exp $ * ---------- */ #include "postgres.h" @@ -2026,10 +2026,8 @@ pgstat_add_backend(PgStat_MsgHdr *msg) /* Put this new backend into the slot */ beentry->procpid = msg->m_procpid; - beentry->start_sec = - GetCurrentAbsoluteTimeUsec(&beentry->start_usec); - beentry->activity_start_sec = 0; - beentry->activity_start_usec = 0; + beentry->start_timestamp = GetCurrentTimestamp(); + beentry->activity_start_timestamp = 0; beentry->activity[0] = '\0'; /* @@ -2665,8 +2663,7 @@ pgstat_recv_activity(PgStat_MsgActivity *msg, int len) StrNCpy(entry->activity, msg->m_what, PGSTAT_ACTIVITY_SIZE); - entry->activity_start_sec = - GetCurrentAbsoluteTimeUsec(&entry->activity_start_usec); + entry->activity_start_timestamp = GetCurrentTimestamp(); } diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 27b28b89f54..c1ac2ed5977 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -37,7 +37,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.455 2005/06/28 05:08:59 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.456 2005/06/29 22:51:55 tgl Exp $ * * NOTES * @@ -118,6 +118,7 @@ #include "storage/proc.h" #include "tcop/tcopprot.h" #include "utils/builtins.h" +#include "utils/datetime.h" #include "utils/guc.h" #include "utils/memutils.h" #include "utils/ps_status.h" @@ -222,9 +223,6 @@ static bool FatalError = false; /* T if recovering from backend crash */ bool ClientAuthInProgress = false; /* T during new-client * authentication */ -/* Backend startup time */ -TimestampTz StartTime; - /* * State for assigning random salts and cancel keys. * Also, the global MyCancelKey passes the cancel key assigned to a given @@ -333,7 +331,7 @@ typedef struct InheritableSocket pgStatPipe0; InheritableSocket pgStatPipe1; pid_t PostmasterPid; - TimestampTz StartTime; + TimestampTz PgStartTime; #ifdef WIN32 HANDLE PostmasterHandle; HANDLE initial_signal_pipe; @@ -376,9 +374,6 @@ PostmasterMain(int argc, char *argv[]) char *userDoption = NULL; int i; - AbsoluteTime StartTimeSec; /* integer part */ - int StartTimeUSec; /* microsecond part */ - /* This will call exit() if strdup() fails. */ progname = get_progname(argv[0]); @@ -922,10 +917,9 @@ PostmasterMain(int argc, char *argv[]) StartupPID = StartupDataBase(); /* - * Get start up time + * Remember postmaster startup time */ - StartTimeSec = GetCurrentAbsoluteTimeUsec(&StartTimeUSec); - StartTime = AbsoluteTimeUsecToTimestampTz(StartTimeSec, StartTimeUSec); + PgStartTime = GetCurrentTimestamp(); status = ServerLoop(); @@ -3613,7 +3607,7 @@ save_backend_variables(BackendParameters *param, Port *port, write_inheritable_socket(¶m->pgStatPipe1, pgStatPipe[1], childPid); param->PostmasterPid = PostmasterPid; - param->StartTime = StartTime; + param->PgStartTime = PgStartTime; #ifdef WIN32 param->PostmasterHandle = PostmasterHandle; @@ -3816,7 +3810,7 @@ restore_backend_variables(BackendParameters *param, Port *port) read_inheritable_socket(&pgStatPipe[1], ¶m->pgStatPipe1); PostmasterPid = param->PostmasterPid; - StartTime = param->StartTime; + PgStartTime = param->PgStartTime; #ifdef WIN32 PostmasterHandle = param->PostmasterHandle; |