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 | 392ea22e9b322d790801740f4c7540c53dddf78b (patch) | |
| tree | 42e5a062e1068ff7b863533b6d34e3e7cf78ed96 /src/backend/postmaster/postmaster.c | |
| parent | 064b3fcbdb198f04ee74e01dd48b3d75448b3c4c (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 0f74f243c55..2215ebbb5a5 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -2509,7 +2509,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); } @@ -4877,7 +4877,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 */ @@ -4891,7 +4891,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 */ } @@ -4904,7 +4904,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 */ } @@ -4917,7 +4917,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 */ } @@ -4935,7 +4935,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); |