Move code in pg_tde_shmem.h to pg_tde.h

Now that we have removed our shared memory tools the remaining contents
of the header can be moved elsewhere.

Author: jeltz

contrib/pg_tde/Makefile

@@ -44,7 +44,6 @@ src/keyring/keyring_api.o \
 src/catalog/tde_keyring.o \
 src/catalog/tde_keyring_parse_opts.o \
 src/catalog/tde_principal_key.o \
-src/common/pg_tde_shmem.o \
 src/common/pg_tde_utils.o \
 src/smgr/pg_tde_smgr.o \
 src/pg_tde_event_capture.o \

contrib/pg_tde/meson.build

@@ -7,7 +7,6 @@ pg_tde_sources = files(
   'src/catalog/tde_keyring.c',
   'src/catalog/tde_keyring_parse_opts.c',
   'src/catalog/tde_principal_key.c',
-  'src/common/pg_tde_shmem.c',
   'src/common/pg_tde_utils.c',
   'src/encryption/enc_aes.c',
   'src/encryption/enc_tde.c',

contrib/pg_tde/src/catalog/tde_keyring.c

@@ -34,12 +34,13 @@
 
 #ifndef FRONTEND
 #include "access/heapam.h"
+#include "funcapi.h"
+#include "access/relscan.h"
 #include "access/relation.h"
 #include "access/relscan.h"
 #include "catalog/namespace.h"
 #include "executor/spi.h"
 #include "funcapi.h"
-#include "common/pg_tde_shmem.h"
 #else
 #include "fe_utils/simple_list.h"
 #include "pg_tde_fe.h"

contrib/pg_tde/src/catalog/tde_principal_key.c

@@ -44,7 +44,6 @@
 #include "lib/dshash.h"
 #include "storage/lwlock.h"
 #include "storage/shmem.h"
-#include "common/pg_tde_shmem.h"
 #else
 #include "pg_tde_fe.h"
 #endif

contrib/pg_tde/src/common/pg_tde_shmem.c

@@ -14,6 +14,17 @@
 
 #define PG_TDE_DATA_DIR	"pg_tde"
 
+#define TDE_TRANCHE_NAME "pg_tde_tranche"
+
+typedef enum
+{
+	TDE_LWLOCK_ENC_KEY,
+	TDE_LWLOCK_PI_FILES,
+
+	/* Must be the last entry in the enum */
+	TDE_LWLOCK_COUNT
+}			TDELockTypes;
+
 typedef struct XLogExtensionInstall
 {
 	Oid			database_id;

contrib/pg_tde/src/include/common/pg_tde_shmem.h

@@ -30,7 +30,6 @@
 #include "access/pg_tde_xlog_smgr.h"
 #include "catalog/tde_global_space.h"
 #include "catalog/tde_principal_key.h"
-#include "common/pg_tde_shmem.h"
 #include "encryption/enc_aes.h"
 #include "keyring/keyring_api.h"
 #include "keyring/keyring_file.h"
@@ -56,7 +55,6 @@ static void
 tde_shmem_request(void)
 {
 	Size		sz = 0;
-	int			required_locks = TdeRequiredLocksCount();
 
 	sz = add_size(sz, PrincipalKeyShmemSize());
 	sz = add_size(sz, TDEXLogEncryptStateSize());
@@ -65,7 +63,7 @@ tde_shmem_request(void)
 		prev_shmem_request_hook();
 
 	RequestAddinShmemSpace(sz);
-	RequestNamedLWLockTranche(TDE_TRANCHE_NAME, required_locks);
+	RequestNamedLWLockTranche(TDE_TRANCHE_NAME, TDE_LWLOCK_COUNT);
 	ereport(LOG, errmsg("tde_shmem_request: requested %ld bytes", sz));
 }