diff options
Diffstat (limited to 'src/backend/utils/init/postinit.c')
| -rw-r--r-- | src/backend/utils/init/postinit.c | 37 |
1 files changed, 3 insertions, 34 deletions
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c index 51d1bbef301..420b246fb13 100644 --- a/src/backend/utils/init/postinit.c +++ b/src/backend/utils/init/postinit.c @@ -67,7 +67,6 @@ static HeapTuple GetDatabaseTuple(const char *dbname); static HeapTuple GetDatabaseTupleByOid(Oid dboid); static void PerformAuthentication(Port *port); static void CheckMyDatabase(const char *name, bool am_superuser, bool override_allow_connections); -static void InitCommunication(void); static void ShutdownPostgres(int code, Datum arg); static void StatementTimeoutHandler(void); static void LockTimeoutHandler(void); @@ -417,31 +416,6 @@ CheckMyDatabase(const char *name, bool am_superuser, bool override_allow_connect } - -/* -------------------------------- - * InitCommunication - * - * This routine initializes stuff needed for ipc, locking, etc. - * it should be called something more informative. - * -------------------------------- - */ -static void -InitCommunication(void) -{ - /* - * initialize shared memory and semaphores appropriately. - */ - if (!IsUnderPostmaster) /* postmaster already did this */ - { - /* - * We're running a postgres bootstrap process or a standalone backend, - * so we need to set up shmem. - */ - CreateSharedMemoryAndSemaphores(); - } -} - - /* * pg_split_opts -- split a string of options and append it to an argv array * @@ -536,11 +510,11 @@ InitializeMaxBackends(void) void BaseInit(void) { + Assert(MyProc != NULL); + /* - * Attach to shared memory and semaphores, and initialize our - * input/output/debugging file descriptors. + * Initialize our input/output/debugging file descriptors. */ - InitCommunication(); DebugFileOpen(); /* Do local initialization of file, storage and buffer managers */ @@ -625,11 +599,6 @@ InitPostgres(const char *in_dbname, Oid dboid, const char *username, } /* - * bufmgr needs another initialization call too - */ - InitBufferPoolBackend(); - - /* * Initialize local process's access to XLOG. */ if (IsUnderPostmaster) |