lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-01 10:06:57 +03:00
Code Activity

Consolidate wait3 implementations

Browse Source 
The generic one calls wait4.

Checked on x86_64-linux-gnu.
This commit is contained in:
Adhemerval Zanella
2019-11-14 11:37:10 -03:00
parent 848791557b
commit 442d9c9c67
4 changed files with 1 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
posix/wait3.c
View File

@ -15,7 +15,6 @@
License along with the GNU C Library; if not, see License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */ <https://www.gnu.org/licenses/>. */
#include <errno.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <sys/types.h> #include <sys/types.h>
@ -27,15 +26,7 @@
pid_t pid_t
__wait3 (int *stat_loc, int options, struct rusage *usage) __wait3 (int *stat_loc, int options, struct rusage *usage)
{ {
if ((options & ~(WNOHANG|WUNTRACED)) != 0) return __wait4 (WAIT_ANY, stat_loc, options, usage);
{
__set_errno (EINVAL);
return (pid_t) -1;
} }
__set_errno (ENOSYS);
return (pid_t) -1;
}
stub_warning (wait3)
weak_alias (__wait3, wait3) weak_alias (__wait3, wait3)

39
sysdeps/posix/wait3.c
View File

@ -1,39 +0,0 @@
/* Copyright (C) 1992-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
#include <errno.h>
#include <sys/wait.h>
#include <sys/types.h>
#include <stddef.h>
/* Wait for a child to exit. When one does, put its status in *STAT_LOC and
return its process ID. For errors return (pid_t) -1. If USAGE is not nil,
store information about the child's resource usage (as a `struct rusage')
there. If the WUNTRACED bit is set in OPTIONS, return status for stopped
children; otherwise don't. */
pid_t
__wait3 (int *stat_loc, int options, struct rusage *usage)
{
if (usage != NULL)
{
__set_errno (ENOSYS);
return (pid_t) -1;
}
return __waitpid (WAIT_ANY, stat_loc, options);
}
weak_alias (__wait3, wait3)

33
sysdeps/unix/bsd/wait3.c
View File

@ -1,33 +0,0 @@
/* Copyright (C) 1991-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
#include <errno.h>
#include <sys/wait.h>
#include <sys/types.h>
/* Wait for a child to exit. When one does, put its status in *STAT_LOC and
return its process ID. For errors return (pid_t) -1. If USAGE is not nil,
store information about the child's resource usage (as a `struct rusage')
there. If the WUNTRACED bit is set in OPTIONS, return status for stopped
children; otherwise don't. */
pid_t
__wait3 (int *stat_loc, int options, struct rusage *usage)
{
return __wait4 (WAIT_ANY, stat_loc, options, usage);
}
weak_alias (__wait3, wait3)

1
sysdeps/unix/sysv/linux/wait3.c
View File

@ -1 +0,0 @@
#include <sysdeps/unix/bsd/wait3.c>