Skip to content

Commit fc548b2

Browse files
tglsfdctglsfdc
committed
Remove support for using wait3() in place of waitpid().
All Unix-oid platforms that we currently support should have waitpid(), since it's in V2 of the Single Unix Spec. Our git history shows that the wait3 code was added to support NextStep, which we officially dropped support for as of 9.2. So get rid of the configure test, and simplify the macro spaghetti in reaper(). Per suggestion from Fujii Masao.
1 parent 666d494 commit fc548b2

File tree

5 files changed

+12
-33
lines changed

5 files changed

+12
-33
lines changed

‎configure

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19254,8 +19254,7 @@ fi
1925419254

1925519255

1925619256

19257-
19258-
for ac_func in cbrt dlopen fdatasync getifaddrs getpeerucred getrlimit memmove poll pstat readlink setproctitle setsid sigprocmask symlink towlower utime utimes waitpid wcstombs wcstombs_l
19257+
for ac_func in cbrt dlopen fdatasync getifaddrs getpeerucred getrlimit memmove poll pstat readlink setproctitle setsid sigprocmask symlink towlower utime utimes wcstombs wcstombs_l
1925919258
do
1926019259
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
1926119260
{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5

‎configure.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1207,7 +1207,7 @@ PGAC_VAR_INT_TIMEZONE
12071207
AC_FUNC_ACCEPT_ARGTYPES
12081208
PGAC_FUNC_GETTIMEOFDAY_1ARG
12091209

1210-
AC_CHECK_FUNCS([cbrt dlopen fdatasync getifaddrs getpeerucred getrlimit memmove poll pstat readlink setproctitle setsid sigprocmask symlink towlower utime utimes waitpid wcstombs wcstombs_l])
1210+
AC_CHECK_FUNCS([cbrt dlopen fdatasync getifaddrs getpeerucred getrlimit memmove poll pstat readlink setproctitle setsid sigprocmask symlink towlower utime utimes wcstombs wcstombs_l])
12111211

12121212
AC_REPLACE_FUNCS(fseeko)
12131213
case $host_os in

‎src/backend/postmaster/postmaster.c

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,9 @@ static void InitPostmasterDeathWatchHandle(void);
377377
#ifdef EXEC_BACKEND
378378

379379
#ifdef WIN32
380-
static pid_t win32_waitpid(int *exitstatus);
380+
#define WNOHANG 0 /* ignored, so any integer value will do */
381+
382+
static pid_t waitpid(pid_t pid, int *exitstatus, int options);
381383
static void WINAPI pgwin32_deadchild_callback(PVOID lpParameter, BOOLEAN TimerOrWaitFired);
382384

383385
static HANDLE win32ChildQueue;
@@ -388,7 +390,7 @@ typedef struct
388390
HANDLE procHandle;
389391
DWORD procId;
390392
} win32_deadchild_waitinfo;
391-
#endif
393+
#endif /* WIN32 */
392394

393395
static pid_t backend_forkexec(Port *port);
394396
static pid_t internal_forkexec(int argc, char *argv[], Port *port);
@@ -2268,33 +2270,13 @@ reaper(SIGNAL_ARGS)
22682270
int pid; /* process id of dead child process */
22692271
int exitstatus; /* its exit status */
22702272

2271-
/* These macros hide platform variations in getting child status */
2272-
#ifdef HAVE_WAITPID
2273-
int status; /* child exit status */
2274-
2275-
#define LOOPTEST() ((pid = waitpid(-1, &status, WNOHANG)) > 0)
2276-
#define LOOPHEADER() (exitstatus = status)
2277-
#else /* !HAVE_WAITPID */
2278-
#ifndef WIN32
2279-
union wait status; /* child exit status */
2280-
2281-
#define LOOPTEST() ((pid = wait3(&status, WNOHANG, NULL)) > 0)
2282-
#define LOOPHEADER() (exitstatus = status.w_status)
2283-
#else /* WIN32 */
2284-
#define LOOPTEST() ((pid = win32_waitpid(&exitstatus)) > 0)
2285-
#define LOOPHEADER()
2286-
#endif /* WIN32 */
2287-
#endif /* HAVE_WAITPID */
2288-
22892273
PG_SETMASK(&BlockSig);
22902274

22912275
ereport(DEBUG4,
22922276
(errmsg_internal("reaping dead processes")));
22932277

2294-
while (LOOPTEST())
2278+
while ((pid = waitpid(-1, &exitstatus, WNOHANG)) > 0)
22952279
{
2296-
LOOPHEADER();
2297-
22982280
/*
22992281
* Check if this child was a startup process.
23002282
*/
@@ -5045,8 +5027,12 @@ ShmemBackendArrayRemove(Backend *bn)
50455027

50465028
#ifdef WIN32
50475029

5030+
/*
5031+
* Subset implementation of waitpid() for Windows. We assume pid is -1
5032+
* (that is, check all child processes) and options is WNOHANG (don't wait).
5033+
*/
50485034
static pid_t
5049-
win32_waitpid(int *exitstatus)
5035+
waitpid(pid_t pid, int *exitstatus, int options)
50505036
{
50515037
DWORD dwd;
50525038
ULONG_PTR key;

‎src/include/pg_config.h.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -614,9 +614,6 @@
614614
/* Define to 1 if you have the `vsnprintf' function. */
615615
#undef HAVE_VSNPRINTF
616616

617-
/* Define to 1 if you have the `waitpid' function. */
618-
#undef HAVE_WAITPID
619-
620617
/* Define to 1 if you have the <wchar.h> header file. */
621618
#undef HAVE_WCHAR_H
622619

‎src/include/pg_config.h.win32

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -505,9 +505,6 @@
505505
/* Define to 1 if you have the `vsnprintf' function. */
506506
#define HAVE_VSNPRINTF 1
507507

508-
/* Define to 1 if you have the `waitpid' function. */
509-
/* #undef HAVE_WAITPID */
510-
511508
/* Define to 1 if you have the <wchar.h> header file. */
512509
#define HAVE_WCHAR_H 1
513510

0 commit comments

Comments
 (0)