diff options
author | Tom Lane | 2008-05-04 21:13:36 +0000 |
---|---|---|
committer | Tom Lane | 2008-05-04 21:13:36 +0000 |
commit | 2b9a878c9aba529789ef4ef8ee20d7fc50f44682 (patch) | |
tree | 017c0803c8a081398cd21bd98b719ab77232c52a | |
parent | 3bd17cbf5bfbaa866fffb3ce2158c0b9a6e87fab (diff) |
Add pg_conf_load_time() function to report when the Postgres configuration
files were last loaded.
George Gensure
-rw-r--r-- | doc/src/sgml/func.sgml | 26 | ||||
-rw-r--r-- | src/backend/postmaster/postmaster.c | 3 | ||||
-rw-r--r-- | src/backend/utils/adt/timestamp.c | 10 | ||||
-rw-r--r-- | src/backend/utils/misc/guc-file.l | 3 | ||||
-rw-r--r-- | src/include/catalog/catversion.h | 2 | ||||
-rw-r--r-- | src/include/catalog/pg_proc.h | 5 | ||||
-rw-r--r-- | src/include/utils/timestamp.h | 5 |
7 files changed, 47 insertions, 7 deletions
diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml index 42451d2ec0..41826a678e 100644 --- a/doc/src/sgml/func.sgml +++ b/doc/src/sgml/func.sgml @@ -10892,6 +10892,12 @@ postgres=# select * from unnest2(array[[1,2],[3,4]]); </row> <row> + <entry><literal><function>pg_conf_load_time</function>()</literal></entry> + <entry><type>timestamp with time zone</type></entry> + <entry>configuration load time</entry> + </row> + + <row> <entry><literal><function>session_user</function></literal></entry> <entry><type>name</type></entry> <entry>session user name</entry> @@ -11031,9 +11037,23 @@ SET search_path TO <replaceable>schema</> <optional>, <replaceable>schema</>, .. </indexterm> <para> - <function>pg_postmaster_start_time</function> returns the - <type>timestamp with time zone</type> when the - server started. + <function>pg_postmaster_start_time</function> returns the + <type>timestamp with time zone</type> when the + server started. + </para> + + <indexterm> + <primary>pg_conf_load_time</primary> + </indexterm> + + <para> + <function>pg_conf_load_time</function> returns the + <type>timestamp with time zone</type> when the + server configuration files were last loaded. + (If the current session was alive at the time, this will be the time + when the session itself re-read the configuration files, so the + reading will vary a little in different sessions. Otherwise it is + the time when the postmaster process re-read the configuration files.) </para> <indexterm> diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 5e4b590499..469a79efd6 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -390,6 +390,7 @@ typedef struct InheritableSocket pgStatSock; pid_t PostmasterPid; TimestampTz PgStartTime; + TimestampTz PgReloadTime; bool redirection_done; #ifdef WIN32 HANDLE PostmasterHandle; @@ -4263,6 +4264,7 @@ save_backend_variables(BackendParameters * param, Port *port, param->PostmasterPid = PostmasterPid; param->PgStartTime = PgStartTime; + param->PgReloadTime = PgReloadTime; param->redirection_done = redirection_done; @@ -4468,6 +4470,7 @@ restore_backend_variables(BackendParameters * param, Port *port) PostmasterPid = param->PostmasterPid; PgStartTime = param->PgStartTime; + PgReloadTime = param->PgReloadTime; redirection_done = param->redirection_done; diff --git a/src/backend/utils/adt/timestamp.c b/src/backend/utils/adt/timestamp.c index e1b7cf5c9e..fcd6c36be1 100644 --- a/src/backend/utils/adt/timestamp.c +++ b/src/backend/utils/adt/timestamp.c @@ -42,6 +42,8 @@ /* Set at postmaster start */ TimestampTz PgStartTime; +/* Set at configuration reload */ +TimestampTz PgReloadTime; static TimeOffset time2t(const int hour, const int min, const int sec, const fsec_t fsec); @@ -1157,11 +1159,17 @@ clock_timestamp(PG_FUNCTION_ARGS) } Datum -pgsql_postmaster_start_time(PG_FUNCTION_ARGS) +pg_postmaster_start_time(PG_FUNCTION_ARGS) { PG_RETURN_TIMESTAMPTZ(PgStartTime); } +Datum +pg_conf_load_time(PG_FUNCTION_ARGS) +{ + PG_RETURN_TIMESTAMPTZ(PgReloadTime); +} + /* * GetCurrentTimestamp -- get the current operating system time * diff --git a/src/backend/utils/misc/guc-file.l b/src/backend/utils/misc/guc-file.l index f083f04db6..3a4b63b08c 100644 --- a/src/backend/utils/misc/guc-file.l +++ b/src/backend/utils/misc/guc-file.l @@ -309,6 +309,9 @@ ProcessConfigFile(GucContext context) PGC_S_FILE, GUC_ACTION_SET, true); } + /* Remember when we last successfully loaded the config file. */ + PgReloadTime = GetCurrentTimestamp(); + cleanup_list: free_name_value_list(head); if (cvc) diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h index e787c52632..c5da648e8d 100644 --- a/src/include/catalog/catversion.h +++ b/src/include/catalog/catversion.h @@ -53,6 +53,6 @@ */ /* yyyymmddN */ -#define CATALOG_VERSION_NO 200804292 +#define CATALOG_VERSION_NO 200805041 #endif diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h index a1e5f828d7..927d532d93 100644 --- a/src/include/catalog/pg_proc.h +++ b/src/include/catalog/pg_proc.h @@ -3922,8 +3922,11 @@ DATA(insert OID = 2559 ( lastval PGNSP PGUID 12 1 0 f f t f v 0 20 "" _null DESCR("current value from last used sequence"); /* start time function */ -DATA(insert OID = 2560 ( pg_postmaster_start_time PGNSP PGUID 12 1 0 f f t f s 0 1184 "" _null_ _null_ _null_ pgsql_postmaster_start_time - _null_ _null_ )); +DATA(insert OID = 2560 ( pg_postmaster_start_time PGNSP PGUID 12 1 0 f f t f s 0 1184 "" _null_ _null_ _null_ pg_postmaster_start_time - _null_ _null_ )); DESCR("postmaster start time"); +/* config reload time function */ +DATA(insert OID = 2034 ( pg_conf_load_time PGNSP PGUID 12 1 0 f f t f s 0 1184 "" _null_ _null_ _null_ pg_conf_load_time - _null_ _null_ )); +DESCR("configuration load time"); /* new functions for Y-direction rtree opclasses */ DATA(insert OID = 2562 ( box_below PGNSP PGUID 12 1 0 f f t f i 2 16 "603 603" _null_ _null_ _null_ box_below - _null_ _null_ )); diff --git a/src/include/utils/timestamp.h b/src/include/utils/timestamp.h index 45418e3605..455ce75983 100644 --- a/src/include/utils/timestamp.h +++ b/src/include/utils/timestamp.h @@ -195,6 +195,8 @@ typedef struct /* Set at postmaster start */ extern TimestampTz PgStartTime; +/* Set at configuration reload */ +extern TimestampTz PgReloadTime; /* @@ -303,7 +305,8 @@ extern Datum now(PG_FUNCTION_ARGS); extern Datum statement_timestamp(PG_FUNCTION_ARGS); extern Datum clock_timestamp(PG_FUNCTION_ARGS); -extern Datum pgsql_postmaster_start_time(PG_FUNCTION_ARGS); +extern Datum pg_postmaster_start_time(PG_FUNCTION_ARGS); +extern Datum pg_conf_load_time(PG_FUNCTION_ARGS); /* Internal routines (not fmgr-callable) */ |