diff options
| author | Neil Conway <neilc@samurai.com> | 2004-02-08 22:28:57 +0000 |
|---|---|---|
| committer | Neil Conway <neilc@samurai.com> | 2004-02-08 22:28:57 +0000 |
| commit | f06e79525a57ccbf54ae5d0b673cd904ca978d67 (patch) | |
| tree | 88e84b43a0eaa593dffa0f454bfef23ce49cd9d2 /src/backend/port/sysv_shmem.c | |
| parent | 04e82e500868c3e8582f797d7b54a44fcc750a68 (diff) | |
Win32 signals cleanup. Patch by Magnus Hagander, with input from Claudio
Natoli and Bruce Momjian (and some cosmetic fixes from Neil Conway).
Changes:
- remove duplicate signal definitions from pqsignal.h
- replace pqkill() with kill() and redefine kill() in Win32
- use ereport() in place of fprintf() in some error handling in
pqsignal.c
- export pg_queue_signal() and make use of it where necessary
- add a console control handler for Ctrl-C and similar handling
on Win32
- do WaitForSingleObjectEx() in CHECK_FOR_INTERRUPTS() on Win32;
query cancelling should now work on Win32
- various other fixes and cleanups
Diffstat (limited to 'src/backend/port/sysv_shmem.c')
| -rw-r--r-- | src/backend/port/sysv_shmem.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/backend/port/sysv_shmem.c b/src/backend/port/sysv_shmem.c index 02847698e60..afccd56e376 100644 --- a/src/backend/port/sysv_shmem.c +++ b/src/backend/port/sysv_shmem.c @@ -10,7 +10,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/port/sysv_shmem.c,v 1.30 2004/02/02 00:11:31 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/port/sysv_shmem.c,v 1.31 2004/02/08 22:28:56 neilc Exp $ * *------------------------------------------------------------------------- */ @@ -33,7 +33,6 @@ #include "miscadmin.h" #include "storage/ipc.h" #include "storage/pg_shmem.h" -#include "libpq/pqsignal.h" typedef key_t IpcMemoryKey; /* shared memory key passed to shmget(2) */ @@ -304,7 +303,7 @@ PGSharedMemoryCreate(uint32 size, bool makePrivate, int port) hdr = (PGShmemHeader *) memAddress; if (hdr->creatorPID != getpid()) { - if (pqkill(hdr->creatorPID, 0) == 0 || errno != ESRCH) + if (kill(hdr->creatorPID, 0) == 0 || errno != ESRCH) { shmdt(memAddress); continue; /* segment belongs to a live process */ |