0002-Add-views-to-see-shared-memory-allocations.patch
text/x-patch
Filename: 0002-Add-views-to-see-shared-memory-allocations.patch
Type: text/x-patch
Part: 1
Message:
Re: pg_shmem_allocations view
Patch
Format: unified
Series: patch 0002
| File | + | − |
|---|---|---|
| src/backend/catalog/system_views.sql | 6 | 0 |
| src/backend/storage/ipc/dsm.c | 80 | 0 |
| src/backend/storage/ipc/shmem.c | 124 | 0 |
| src/include/catalog/pg_proc.h | 4 | 0 |
| src/include/utils/builtins.h | 5 | 0 |
| src/test/regress/expected/rules.out | 9 | 0 |
>From 24c42133a4017a9b6caf60c0f824b8f8eaed9d51 Mon Sep 17 00:00:00 2001
From: Andres Freund <andres@anarazel.de>
Date: Sun, 4 May 2014 13:37:20 +0200
Subject: [PATCH 2/2] Add views to see shared memory allocations.
---
src/backend/catalog/system_views.sql | 6 ++
src/backend/storage/ipc/dsm.c | 80 ++++++++++++++++++++++
src/backend/storage/ipc/shmem.c | 124 +++++++++++++++++++++++++++++++++++
src/include/catalog/pg_proc.h | 4 ++
src/include/utils/builtins.h | 5 ++
src/test/regress/expected/rules.out | 9 +++
6 files changed, 228 insertions(+)
diff --git a/src/backend/catalog/system_views.sql b/src/backend/catalog/system_views.sql
index 42a4c00..c414260 100644
--- a/src/backend/catalog/system_views.sql
+++ b/src/backend/catalog/system_views.sql
@@ -387,6 +387,12 @@ CREATE VIEW pg_timezone_abbrevs AS
CREATE VIEW pg_timezone_names AS
SELECT * FROM pg_timezone_names();
+CREATE VIEW pg_static_shmem_allocations AS
+ SELECT * FROM pg_get_static_shmem_allocations();
+
+CREATE VIEW pg_dynamic_shmem_allocations AS
+ SELECT * FROM pg_get_dynamic_shmem_allocations();
+
-- Statistics views
CREATE VIEW pg_stat_all_tables AS
diff --git a/src/backend/storage/ipc/dsm.c b/src/backend/storage/ipc/dsm.c
index 66e24f0..a8c6c38 100644
--- a/src/backend/storage/ipc/dsm.c
+++ b/src/backend/storage/ipc/dsm.c
@@ -34,12 +34,15 @@
#endif
#include <sys/stat.h>
+#include "fmgr.h"
+#include "funcapi.h"
#include "lib/ilist.h"
#include "miscadmin.h"
#include "storage/dsm.h"
#include "storage/ipc.h"
#include "storage/lwlock.h"
#include "storage/pg_shmem.h"
+#include "utils/builtins.h"
#include "utils/guc.h"
#include "utils/memutils.h"
#include "utils/resowner_private.h"
@@ -1022,3 +1025,80 @@ dsm_control_bytes_needed(uint32 nitems)
return offsetof(dsm_control_header, item)
+sizeof(dsm_control_item) * (uint64) nitems;
}
+
+/* SQL SRF showing allocated shared memory */
+Datum
+pg_get_dynamic_shmem_allocations(PG_FUNCTION_ARGS)
+{
+#define PG_GET_SHMEM_SIZES_COLS 4
+
+ ReturnSetInfo *rsinfo = (ReturnSetInfo *) fcinfo->resultinfo;
+ TupleDesc tupdesc;
+ Tuplestorestate *tupstore;
+ MemoryContext per_query_ctx;
+ MemoryContext oldcontext;
+ int i;
+
+ /* check to see if caller supports us returning a tuplestore */
+ if (rsinfo == NULL || !IsA(rsinfo, ReturnSetInfo))
+ ereport(ERROR,
+ (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+ errmsg("set-valued function called in context that cannot accept a set")));
+ if (!(rsinfo->allowedModes & SFRM_Materialize))
+ ereport(ERROR,
+ (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+ errmsg("materialize mode required, but it is not " \
+ "allowed in this context")));
+
+ /* Build a tuple descriptor for our result type */
+ if (get_call_result_type(fcinfo, NULL, &tupdesc) != TYPEFUNC_COMPOSITE)
+ elog(ERROR, "return type must be a row type");
+
+ per_query_ctx = rsinfo->econtext->ecxt_per_query_memory;
+ oldcontext = MemoryContextSwitchTo(per_query_ctx);
+
+ tupstore = tuplestore_begin_heap(true, false, work_mem);
+ rsinfo->returnMode = SFRM_Materialize;
+ rsinfo->setResult = tupstore;
+ rsinfo->setDesc = tupdesc;
+
+ MemoryContextSwitchTo(oldcontext);
+
+ LWLockAcquire(DynamicSharedMemoryControlLock, LW_SHARED);
+
+ for (i = 0; i < dsm_control->nitems; ++i)
+ {
+ dsm_control_item *item;
+ Datum values[PG_GET_SHMEM_SIZES_COLS];
+ bool nulls[PG_GET_SHMEM_SIZES_COLS];
+
+ /* don't look at unused or about to be destroyed items */
+ if (dsm_control->item[i].refcnt < 2)
+ continue;
+
+ item = &dsm_control->item[i];
+
+ /* handle */
+ values[0] = Int64GetDatum(item->handle);
+ nulls[0] = false;
+
+ /* name */
+ values[1] = CStringGetTextDatum(item->name);
+ nulls[1] = false;
+
+ /* size */
+ values[2] = Int64GetDatum(item->size);
+ nulls[2] = false;
+
+ /* refcnt */
+ values[3] = Int64GetDatum(item->refcnt - 2);
+ nulls[3] = false;
+
+ tuplestore_putvalues(tupstore, tupdesc, values, nulls);
+ }
+ LWLockRelease(DynamicSharedMemoryControlLock);
+
+ tuplestore_donestoring(tupstore);
+
+ return (Datum) 0;
+}
diff --git a/src/backend/storage/ipc/shmem.c b/src/backend/storage/ipc/shmem.c
index 2ea2216..9f08c4e 100644
--- a/src/backend/storage/ipc/shmem.c
+++ b/src/backend/storage/ipc/shmem.c
@@ -66,11 +66,14 @@
#include "postgres.h"
#include "access/transam.h"
+#include "fmgr.h"
+#include "funcapi.h"
#include "miscadmin.h"
#include "storage/lwlock.h"
#include "storage/pg_shmem.h"
#include "storage/shmem.h"
#include "storage/spin.h"
+#include "utils/builtins.h"
/* shared memory global variables */
@@ -459,3 +462,124 @@ mul_size(Size s1, Size s2)
errmsg("requested shared memory size overflows size_t")));
return result;
}
+
+/* SQL SRF showing allocated shared memory */
+Datum
+pg_get_static_shmem_allocations(PG_FUNCTION_ARGS)
+{
+#define PG_GET_SHMEM_SIZES_COLS 4
+ ReturnSetInfo *rsinfo = (ReturnSetInfo *) fcinfo->resultinfo;
+ TupleDesc tupdesc;
+ Tuplestorestate *tupstore;
+ MemoryContext per_query_ctx;
+ MemoryContext oldcontext;
+ HASH_SEQ_STATUS hstat;
+ ShmemIndexEnt *ent;
+ Size named_allocated = 0;
+
+ /* check to see if caller supports us returning a tuplestore */
+ if (rsinfo == NULL || !IsA(rsinfo, ReturnSetInfo))
+ ereport(ERROR,
+ (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+ errmsg("set-valued function called in context that cannot accept a set")));
+ if (!(rsinfo->allowedModes & SFRM_Materialize))
+ ereport(ERROR,
+ (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+ errmsg("materialize mode required, but it is not " \
+ "allowed in this context")));
+
+ /* Build a tuple descriptor for our result type */
+ if (get_call_result_type(fcinfo, NULL, &tupdesc) != TYPEFUNC_COMPOSITE)
+ elog(ERROR, "return type must be a row type");
+
+ per_query_ctx = rsinfo->econtext->ecxt_per_query_memory;
+ oldcontext = MemoryContextSwitchTo(per_query_ctx);
+
+ tupstore = tuplestore_begin_heap(true, false, work_mem);
+ rsinfo->returnMode = SFRM_Materialize;
+ rsinfo->setResult = tupstore;
+ rsinfo->setDesc = tupdesc;
+
+ MemoryContextSwitchTo(oldcontext);
+
+ hash_seq_init(&hstat, ShmemIndex);
+
+ LWLockAcquire(ShmemIndexLock, LW_SHARED);
+
+ /* output all allocated entries */
+ while ((ent = (ShmemIndexEnt *) hash_seq_search(&hstat)) != NULL)
+ {
+ Datum values[PG_GET_SHMEM_SIZES_COLS];
+ bool nulls[PG_GET_SHMEM_SIZES_COLS];
+
+ /* key */
+ values[0] = CStringGetTextDatum(ent->key);
+ nulls[0] = false;
+
+ /* off */
+ values[1] = Int64GetDatum((char *) ent->location - (char *) ShmemSegHdr);
+ nulls[1] = false;
+
+ /* size */
+ values[2] = Int64GetDatum(ent->size);
+ nulls[2] = false;
+ named_allocated += ent->size;
+
+ /* allocated */
+ values[3] = BoolGetDatum(true);
+ nulls[3] = false;
+
+ tuplestore_putvalues(tupstore, tupdesc, values, nulls);
+ }
+
+ /* output shared memory allocated but not counted via the shmem index */
+ {
+ Datum values[PG_GET_SHMEM_SIZES_COLS];
+ bool nulls[PG_GET_SHMEM_SIZES_COLS];
+
+ /* key, show unnamed as NULL */
+ nulls[0] = true;
+
+ /* off */
+ nulls[1] = true;
+
+ /* size */
+ values[2] = Int64GetDatum(ShmemSegHdr->freeoffset - named_allocated);
+ nulls[2] = false;
+
+ /* allocated */
+ values[3] = BoolGetDatum(true);
+ nulls[3] = false;
+
+ tuplestore_putvalues(tupstore, tupdesc, values, nulls);
+ }
+
+ /* output as-of-yet unused shared memory */
+ {
+ Datum values[PG_GET_SHMEM_SIZES_COLS];
+ bool nulls[PG_GET_SHMEM_SIZES_COLS];
+
+ /* key, show unallocated as NULL */
+ nulls[0] = true;
+
+ /* off */
+ values[1] = Int64GetDatum(ShmemSegHdr->freeoffset);
+ nulls[1] = false;
+
+ /* size */
+ values[2] = Int64GetDatum(ShmemSegHdr->totalsize - ShmemSegHdr->freeoffset);
+ nulls[2] = false;
+
+ /* allocated */
+ values[3] = BoolGetDatum(false);
+ nulls[3] = false;
+
+ tuplestore_putvalues(tupstore, tupdesc, values, nulls);
+ }
+
+ LWLockRelease(ShmemIndexLock);
+
+ tuplestore_donestoring(tupstore);
+
+ return (Datum) 0;
+}
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index e601ccd..b59cfee 100644
--- a/src/include/catalog/pg_proc.h
+++ b/src/include/catalog/pg_proc.h
@@ -3899,6 +3899,10 @@ DATA(insert OID = 3035 ( pg_listening_channels PGNSP PGUID 12 1 10 0 0 f f f f
DESCR("get the channels that the current backend listens to");
DATA(insert OID = 3036 ( pg_notify PGNSP PGUID 12 1 0 0 0 f f f f f f v 2 0 2278 "25 25" _null_ _null_ _null_ _null_ pg_notify _null_ _null_ _null_ ));
DESCR("send a notification event");
+DATA(insert OID = 86 ( pg_get_static_shmem_allocations PGNSP PGUID 12 1 10 0 0 f f f f f t s 0 0 2249 "" "{25,20,20,16}" "{o,o,o,o}" "{key, off, size, allocated}" _null_ pg_get_static_shmem_allocations _null_ _null_ _null_ ));
+DESCR("show static shared memory allocations");
+DATA(insert OID = 87 ( pg_get_dynamic_shmem_allocations PGNSP PGUID 12 1 10 0 0 f f f f f t s 0 0 2249 "" "{20,25,20,20}" "{o,o,o,o}" "{handle, name, size, refcnt}" _null_ pg_get_dynamic_shmem_allocations _null_ _null_ _null_ ));
+DESCR("show dynamic shared memory allocations");
/* non-persistent series generator */
DATA(insert OID = 1066 ( generate_series PGNSP PGUID 12 1 1000 0 0 f f f f t t i 3 0 23 "23 23 23" _null_ _null_ _null_ _null_ generate_series_step_int4 _null_ _null_ _null_ ));
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index bbb5d39..ea91014 100644
--- a/src/include/utils/builtins.h
+++ b/src/include/utils/builtins.h
@@ -1209,4 +1209,9 @@ extern Datum pg_prepared_statement(PG_FUNCTION_ARGS);
/* utils/mmgr/portalmem.c */
extern Datum pg_cursor(PG_FUNCTION_ARGS);
+/* backend/storage/ipc/shmem.c */
+extern Datum pg_get_static_shmem_allocations(PG_FUNCTION_ARGS);
+/* backend/storage/ipc/dsm.c */
+extern Datum pg_get_dynamic_shmem_allocations(PG_FUNCTION_ARGS);
+
#endif /* BUILTINS_H */
diff --git a/src/test/regress/expected/rules.out b/src/test/regress/expected/rules.out
index 87870cf..66937d5 100644
--- a/src/test/regress/expected/rules.out
+++ b/src/test/regress/expected/rules.out
@@ -1308,6 +1308,10 @@ pg_cursors| SELECT c.name,
c.is_scrollable,
c.creation_time
FROM pg_cursor() c(name, statement, is_holdable, is_binary, is_scrollable, creation_time);
+pg_dynamic_shmem_allocations| SELECT pg_get_dynamic_shmem_allocations.key,
+ pg_get_dynamic_shmem_allocations.size,
+ pg_get_dynamic_shmem_allocations.refcnt
+ FROM pg_get_dynamic_shmem_allocations() pg_get_dynamic_shmem_allocations(key, size, refcnt);
pg_group| SELECT pg_authid.rolname AS groname,
pg_authid.oid AS grosysid,
ARRAY( SELECT pg_auth_members.member
@@ -1848,6 +1852,11 @@ pg_stat_xact_user_tables| SELECT pg_stat_xact_all_tables.relid,
pg_stat_xact_all_tables.n_tup_hot_upd
FROM pg_stat_xact_all_tables
WHERE ((pg_stat_xact_all_tables.schemaname <> ALL (ARRAY['pg_catalog'::name, 'information_schema'::name])) AND (pg_stat_xact_all_tables.schemaname !~ '^pg_toast'::text));
+pg_static_shmem_allocations| SELECT pg_get_static_shmem_allocations.key,
+ pg_get_static_shmem_allocations.off,
+ pg_get_static_shmem_allocations.size,
+ pg_get_static_shmem_allocations.allocated
+ FROM pg_get_static_shmem_allocations() pg_get_static_shmem_allocations(key, off, size, allocated);
pg_statio_all_indexes| SELECT c.oid AS relid,
i.oid AS indexrelid,
n.nspname AS schemaname,
--
1.8.5.rc2.dirty