diff options
| author | Noah Misch <noah@leadboat.com> | 2014-07-23 00:35:13 -0400 |
|---|---|---|
| committer | Noah Misch <noah@leadboat.com> | 2014-07-23 00:36:43 -0400 |
| commit | 9f519faf8048d6c17644f5a398733960380aaf6e (patch) | |
| tree | 9d352075751476a62b6dfcc8224dfff5838dca66 /src | |
| parent | f12976ab8393463b2b0815e7412dba26702dd0a3 (diff) | |
| download | postgresql-9f519faf8048d6c17644f5a398733960380aaf6e.tar.gz postgresql-9f519faf8048d6c17644f5a398733960380aaf6e.zip | |
Report success when Windows kill() emulation signals an exiting process.
This is consistent with the POSIX verdict that kill() shall not report
ESRCH for a zombie process. Back-patch to 9.0 (all supported versions).
Test code from commit d7cdf6ee36adeac9233678fb8f2a112e6678a770 depends
on it, and log messages about kill() reporting "Invalid argument" will
cease to appear for this not-unexpected condition.
Diffstat (limited to 'src')
| -rw-r--r-- | src/port/kill.c | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/src/port/kill.c b/src/port/kill.c index 0a810cd2252..546796e1b8e 100644 --- a/src/port/kill.c +++ b/src/port/kill.c @@ -50,13 +50,28 @@ pgkill(int pid, int sig) return 0; } - if (GetLastError() == ERROR_FILE_NOT_FOUND) - errno = ESRCH; - else if (GetLastError() == ERROR_ACCESS_DENIED) - errno = EPERM; - else - errno = EINVAL; - return -1; + switch (GetLastError()) + { + case ERROR_BROKEN_PIPE: + case ERROR_BAD_PIPE: + + /* + * These arise transiently as a process is exiting. Treat them + * like POSIX treats a zombie process, reporting success. + */ + return 0; + + case ERROR_FILE_NOT_FOUND: + /* pipe fully gone, so treat the process as gone */ + errno = ESRCH; + return -1; + case ERROR_ACCESS_DENIED: + errno = EPERM; + return -1; + default: + errno = EINVAL; /* unexpected */ + return -1; + } } #endif |