From 7ca25429c9cbd073eaacd0e767ede4e7a513148a Mon Sep 17 00:00:00 2001 From: Pavel Borisov Date: Fri, 15 Jul 2022 16:39:43 +0400 Subject: [PATCH v2] Remove a wrapper for CreateSharedMemoryAndSemaphores() --- src/backend/postmaster/postmaster.c | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index d7257e4056b..b409beb5250 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -391,7 +391,6 @@ static void getInstallationPaths(const char *argv0); static void checkControlFile(void); static Port *ConnCreate(int serverFd); static void ConnFree(Port *port); -static void reset_shared(void); static void SIGHUP_handler(SIGNAL_ARGS); static void pmdie(SIGNAL_ARGS); static void reaper(SIGNAL_ARGS); @@ -1082,7 +1081,7 @@ PostmasterMain(int argc, char *argv[]) /* * Set up shared memory and semaphores. */ - reset_shared(); + CreateSharedMemoryAndSemaphores(); /* * Estimate number of openable files. This must happen after setting up @@ -2723,23 +2722,6 @@ InitProcessGlobals(void) } -/* - * reset_shared -- reset shared memory and semaphores - */ -static void -reset_shared(void) -{ - /* - * Create or re-create shared memory and semaphores. - * - * Note: in each "cycle of life" we will normally assign the same IPC keys - * (if using SysV shmem and/or semas). This helps ensure that we will - * clean up dead IPC objects if the postmaster crashes and is restarted. - */ - CreateSharedMemoryAndSemaphores(); -} - - /* * SIGHUP -- reread config files, and tell children to do same */ @@ -4022,7 +4004,14 @@ PostmasterStateMachine(void) /* re-read control file into local memory */ LocalProcessControlFile(true); - reset_shared(); + /* + * Create or re-create shared memory and semaphores. + * + * Note: in each "cycle of life" we will normally assign the same IPC keys + * (if using SysV shmem and/or semas). This helps ensure that we will + * clean up dead IPC objects if the postmaster crashes and is restarted. + */ + CreateSharedMemoryAndSemaphores(); StartupPID = StartupDataBase(); Assert(StartupPID != 0); -- 2.24.3 (Apple Git-128)