mirror of
https://github.com/postgres/postgres.git
synced 2025-11-07 19:06:32 +03:00
Revert "Consistently test for in-use shared memory."
This reverts commits2f932f71d9,16ee6eaf80and6f0e190056. The buildfarm has revealed several bugs. Back-patch like the original commits. Discussion: https://postgr.es/m/20190404145319.GA1720877@rfd.leadboat.com
This commit is contained in:
@@ -2604,7 +2604,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);
|
||||
}
|
||||
|
||||
|
||||
@@ -4945,7 +4945,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 */
|
||||
@@ -4959,7 +4959,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 */
|
||||
}
|
||||
@@ -4972,7 +4972,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 */
|
||||
}
|
||||
@@ -4985,7 +4985,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 */
|
||||
}
|
||||
@@ -5003,7 +5003,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);
|
||||
|
||||
Reference in New Issue
Block a user