diff options
| author | Noah Misch <noah@leadboat.com> | 2019-04-05 00:00:52 -0700 |
|---|---|---|
| committer | Noah Misch <noah@leadboat.com> | 2019-04-05 00:00:55 -0700 |
| commit | 7d18a55c90eb5a83c702c7cd8e23ae25c389a636 (patch) | |
| tree | fdfc21a84b4c3b25f64c1af39e0034677457ae32 /src/backend/postmaster/postmaster.c | |
| parent | 4b482e94a006ee3ed6df09aba8c526cdcee84496 (diff) | |
Revert "Consistently test for in-use shared memory."
This reverts commits 2f932f71d9f2963bbd201129d7b971c8f5f077fd,
16ee6eaf80a40007a138b60bb5661660058d0422 and
6f0e190056fe441f7cf788ff19b62b13c94f68f3. The buildfarm has revealed
several bugs. Back-patch like the original commits.
Discussion: https://postgr.es/m/20190404145319.GA1720877@rfd.leadboat.com
Diffstat (limited to 'src/backend/postmaster/postmaster.c')
| -rw-r--r-- | src/backend/postmaster/postmaster.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 1bbe7529020..56d81890bce 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -2558,7 +2558,7 @@ reset_shared(int port) * determine IPC keys. This helps ensure that we will clean up dead IPC * objects if the postmaster crashes and is restarted. */ - CreateSharedMemoryAndSemaphores(port); + CreateSharedMemoryAndSemaphores(false, port); } @@ -4907,7 +4907,7 @@ SubPostmasterMain(int argc, char *argv[]) InitProcess(); /* Attach process to shared data structures */ - CreateSharedMemoryAndSemaphores(0); + CreateSharedMemoryAndSemaphores(false, 0); /* And run the backend */ BackendRun(&port); /* does not return */ @@ -4921,7 +4921,7 @@ SubPostmasterMain(int argc, char *argv[]) InitAuxiliaryProcess(); /* Attach process to shared data structures */ - CreateSharedMemoryAndSemaphores(0); + CreateSharedMemoryAndSemaphores(false, 0); AuxiliaryProcessMain(argc - 2, argv + 2); /* does not return */ } @@ -4934,7 +4934,7 @@ SubPostmasterMain(int argc, char *argv[]) InitProcess(); /* Attach process to shared data structures */ - CreateSharedMemoryAndSemaphores(0); + CreateSharedMemoryAndSemaphores(false, 0); AutoVacLauncherMain(argc - 2, argv + 2); /* does not return */ } @@ -4947,7 +4947,7 @@ SubPostmasterMain(int argc, char *argv[]) InitProcess(); /* Attach process to shared data structures */ - CreateSharedMemoryAndSemaphores(0); + CreateSharedMemoryAndSemaphores(false, 0); AutoVacWorkerMain(argc - 2, argv + 2); /* does not return */ } @@ -4965,7 +4965,7 @@ SubPostmasterMain(int argc, char *argv[]) InitProcess(); /* Attach process to shared data structures */ - CreateSharedMemoryAndSemaphores(0); + CreateSharedMemoryAndSemaphores(false, 0); /* Fetch MyBgworkerEntry from shared memory */ shmem_slot = atoi(argv[1] + 15); |