diff options
| author | Bruce Momjian <bruce@momjian.us> | 2004-01-26 22:54:58 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2004-01-26 22:54:58 +0000 |
| commit | ede3b762a35578ddb81a6e73f629736b248e0197 (patch) | |
| tree | e14ebd0e5d475036d8166cb5be20c77388440bb5 /src/backend/storage/ipc | |
| parent | f4921e5ca38aac1214854e7226e8bb3291d60485 (diff) | |
Back out win32 patch so we can apply it separately.
Diffstat (limited to 'src/backend/storage/ipc')
| -rw-r--r-- | src/backend/storage/ipc/ipci.c | 12 | ||||
| -rw-r--r-- | src/backend/storage/ipc/pmsignal.c | 6 |
2 files changed, 4 insertions, 14 deletions
diff --git a/src/backend/storage/ipc/ipci.c b/src/backend/storage/ipc/ipci.c index 888dd7aeda7..15692684e3b 100644 --- a/src/backend/storage/ipc/ipci.c +++ b/src/backend/storage/ipc/ipci.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/ipc/ipci.c,v 1.61 2004/01/26 22:51:56 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/storage/ipc/ipci.c,v 1.62 2004/01/26 22:54:57 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -63,9 +63,6 @@ CreateSharedMemoryAndSemaphores(bool makePrivate, size += LWLockShmemSize(); size += SInvalShmemSize(maxBackends); size += FreeSpaceShmemSize(); -#ifdef EXEC_BACKEND - size += ShmemBackendArraySize(); -#endif #ifdef STABLE_MEMORY_STORAGE size += MMShmemSize(); #endif @@ -135,13 +132,6 @@ CreateSharedMemoryAndSemaphores(bool makePrivate, * Set up child-to-postmaster signaling mechanism */ PMSignalInit(); - -#ifdef EXEC_BACKEND - /* - * Alloc the win32 shared backend array - */ - ShmemBackendArrayAllocation(); -#endif } diff --git a/src/backend/storage/ipc/pmsignal.c b/src/backend/storage/ipc/pmsignal.c index 2795475cc76..2b15f8d444a 100644 --- a/src/backend/storage/ipc/pmsignal.c +++ b/src/backend/storage/ipc/pmsignal.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/ipc/pmsignal.c,v 1.9 2004/01/26 22:51:56 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/storage/ipc/pmsignal.c,v 1.10 2004/01/26 22:54:57 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -63,8 +63,8 @@ SendPostmasterSignal(PMSignalReason reason) return; /* Atomically set the proper flag */ PMSignalFlags[reason] = true; - /* Send signal to postmaster */ - kill(PostmasterPid, SIGUSR1); + /* Send signal to postmaster (assume it is our direct parent) */ + kill(getppid(), SIGUSR1); } /* |