[7/7] Consolidate wait3 implementations

Message ID 20191114144704.19002-7-adhemerval.zanella@linaro.org
State Accepted
Commit 442d9c9c677804287a54b10d5fa5e58a9cdd338d
Headers show
Series
  • [1/7] Remove __waitpid_nocancel
Related show

Commit Message

Adhemerval Zanella Nov. 14, 2019, 2:47 p.m.
The generic one calls wait4.

Checked on x86_64-linux-gnu.
---
 posix/wait3.c                   | 14 +++---------
 sysdeps/posix/wait3.c           | 39 ---------------------------------
 sysdeps/unix/bsd/wait3.c        | 33 ----------------------------
 sysdeps/unix/sysv/linux/wait3.c |  1 -
 4 files changed, 3 insertions(+), 84 deletions(-)
 delete mode 100644 sysdeps/posix/wait3.c
 delete mode 100644 sysdeps/unix/bsd/wait3.c
 delete mode 100644 sysdeps/unix/sysv/linux/wait3.c

-- 
2.17.1

Comments

Alistair Francis Nov. 14, 2019, 3:44 p.m. | #1
On Thu, Nov 14, 2019 at 6:47 AM Adhemerval Zanella
<adhemerval.zanella@linaro.org> wrote:
>

> The generic one calls wait4.

>

> Checked on x86_64-linux-gnu.

> ---


Thanks for doing this! This whole series looks good to me.

Alistair

>  posix/wait3.c                   | 14 +++---------

>  sysdeps/posix/wait3.c           | 39 ---------------------------------

>  sysdeps/unix/bsd/wait3.c        | 33 ----------------------------

>  sysdeps/unix/sysv/linux/wait3.c |  1 -

>  4 files changed, 3 insertions(+), 84 deletions(-)

>  delete mode 100644 sysdeps/posix/wait3.c

>  delete mode 100644 sysdeps/unix/bsd/wait3.c

>  delete mode 100644 sysdeps/unix/sysv/linux/wait3.c

>

> diff --git a/posix/wait3.c b/posix/wait3.c

> index 6b6e3a500d..f0abf24e31 100644

> --- a/posix/wait3.c

> +++ b/posix/wait3.c

> @@ -1,4 +1,5 @@

> -/* Copyright (C) 1991-2019 Free Software Foundation, Inc.

> +/* Wait for process to change state.

> +   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

> @@ -15,7 +16,6 @@

>     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>

>

> @@ -27,15 +27,7 @@

>  pid_t

>  __wait3 (int *stat_loc, int options, struct rusage *usage)

>  {

> -  if ((options & ~(WNOHANG|WUNTRACED)) != 0)

> -    {

> -      __set_errno (EINVAL);

> -      return (pid_t) -1;

> -    }

> -

> -  __set_errno (ENOSYS);

> -  return (pid_t) -1;

> +  return __wait4 (WAIT_ANY, stat_loc, options, usage);

>  }

> -stub_warning (wait3)

>

>  weak_alias (__wait3, wait3)

> diff --git a/sysdeps/posix/wait3.c b/sysdeps/posix/wait3.c

> deleted file mode 100644

> index daba36c6dc..0000000000

> --- a/sysdeps/posix/wait3.c

> +++ /dev/null

> @@ -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)

> diff --git a/sysdeps/unix/bsd/wait3.c b/sysdeps/unix/bsd/wait3.c

> deleted file mode 100644

> index d7fa7e4496..0000000000

> --- a/sysdeps/unix/bsd/wait3.c

> +++ /dev/null

> @@ -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)

> diff --git a/sysdeps/unix/sysv/linux/wait3.c b/sysdeps/unix/sysv/linux/wait3.c

> deleted file mode 100644

> index 2ff027f0e1..0000000000

> --- a/sysdeps/unix/sysv/linux/wait3.c

> +++ /dev/null

> @@ -1 +0,0 @@

> -#include <sysdeps/unix/bsd/wait3.c>

> --

> 2.17.1

>
Adhemerval Zanella Dec. 19, 2019, 3:33 p.m. | #2
On 14/11/2019 12:44, Alistair Francis wrote:
> On Thu, Nov 14, 2019 at 6:47 AM Adhemerval Zanella

> <adhemerval.zanella@linaro.org> wrote:

>>

>> The generic one calls wait4.

>>

>> Checked on x86_64-linux-gnu.

>> ---

> 

> Thanks for doing this! This whole series looks good to me.

> 

> Alistair


I am running full check on x86, i386, powerpc*, aarch64, arm,
sparc*, and s390* and I plan to commit this shortly.

I also rebase the "ptl: Move wait implementation to libc"
on top of 0487ebed22, so there is changes on nptl/libpthread-compat.c
anymore.

Patch

diff --git a/posix/wait3.c b/posix/wait3.c
index 6b6e3a500d..f0abf24e31 100644
--- a/posix/wait3.c
+++ b/posix/wait3.c
@@ -1,4 +1,5 @@ 
-/* Copyright (C) 1991-2019 Free Software Foundation, Inc.
+/* Wait for process to change state.
+   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
@@ -15,7 +16,6 @@ 
    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>
 
@@ -27,15 +27,7 @@ 
 pid_t
 __wait3 (int *stat_loc, int options, struct rusage *usage)
 {
-  if ((options & ~(WNOHANG|WUNTRACED)) != 0)
-    {
-      __set_errno (EINVAL);
-      return (pid_t) -1;
-    }
-
-  __set_errno (ENOSYS);
-  return (pid_t) -1;
+  return __wait4 (WAIT_ANY, stat_loc, options, usage);
 }
-stub_warning (wait3)
 
 weak_alias (__wait3, wait3)
diff --git a/sysdeps/posix/wait3.c b/sysdeps/posix/wait3.c
deleted file mode 100644
index daba36c6dc..0000000000
--- a/sysdeps/posix/wait3.c
+++ /dev/null
@@ -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)
diff --git a/sysdeps/unix/bsd/wait3.c b/sysdeps/unix/bsd/wait3.c
deleted file mode 100644
index d7fa7e4496..0000000000
--- a/sysdeps/unix/bsd/wait3.c
+++ /dev/null
@@ -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)
diff --git a/sysdeps/unix/sysv/linux/wait3.c b/sysdeps/unix/sysv/linux/wait3.c
deleted file mode 100644
index 2ff027f0e1..0000000000
--- a/sysdeps/unix/sysv/linux/wait3.c
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <sysdeps/unix/bsd/wait3.c>