[v2,1/9] nptl: Remove exit-thread.h

Message ID 20210527172823.3461314-2-adhemerval.zanella@linaro.org
State New
Headers show
Series
  • nptl: pthread cancellation refactor
Related show

Commit Message

Noah Goldstein via Libc-alpha May 27, 2021, 5:28 p.m.
No function change.  The code is used only for Linux, besides
being included in generic code.
---
 csu/libc-start.c                      |  1 -
 nptl/pthread_create.c                 |  6 +++--
 sysdeps/generic/exit-thread.h         | 28 --------------------
 sysdeps/nptl/libc_start_call_main.h   |  5 +++-
 sysdeps/unix/sysv/linux/exit-thread.h | 37 ---------------------------
 5 files changed, 8 insertions(+), 69 deletions(-)
 delete mode 100644 sysdeps/generic/exit-thread.h
 delete mode 100644 sysdeps/unix/sysv/linux/exit-thread.h

-- 
2.30.2

Comments

Noah Goldstein via Libc-alpha June 1, 2021, 7:51 a.m. | #1
* Adhemerval Zanella via Libc-alpha:

> diff --git a/nptl/pthread_create.c b/nptl/pthread_create.c

> index 2d2535b07d..aacbba1cac 100644

> --- a/nptl/pthread_create.c

> +++ b/nptl/pthread_create.c

> @@ -30,7 +30,6 @@

>  #include <libc-internal.h>

>  #include <resolv.h>

>  #include <kernel-features.h>

> -#include <exit-thread.h>

>  #include <default-sched.h>

>  #include <futex-internal.h>

>  #include <tls-setup.h>

> @@ -575,7 +574,10 @@ start_thread (void *arg)

>  

>       The exit code is zero since in case all threads exit by calling

>       'pthread_exit' the exit status must be 0 (zero).  */

> -  __exit_thread ();

> +  while (1)

> +    {

> +      INTERNAL_SYSCALL_CALL (exit, 0);

> +    }

>  

>    /* NOTREACHED */

>  }


You could leave off the braces.  But still looks good.

Thanks,
Florian
Noah Goldstein via Libc-alpha June 1, 2021, 12:55 p.m. | #2
On 01/06/2021 04:51, Florian Weimer wrote:
> * Adhemerval Zanella via Libc-alpha:

> 

>> diff --git a/nptl/pthread_create.c b/nptl/pthread_create.c

>> index 2d2535b07d..aacbba1cac 100644

>> --- a/nptl/pthread_create.c

>> +++ b/nptl/pthread_create.c

>> @@ -30,7 +30,6 @@

>>  #include <libc-internal.h>

>>  #include <resolv.h>

>>  #include <kernel-features.h>

>> -#include <exit-thread.h>

>>  #include <default-sched.h>

>>  #include <futex-internal.h>

>>  #include <tls-setup.h>

>> @@ -575,7 +574,10 @@ start_thread (void *arg)

>>  

>>       The exit code is zero since in case all threads exit by calling

>>       'pthread_exit' the exit status must be 0 (zero).  */

>> -  __exit_thread ();

>> +  while (1)

>> +    {

>> +      INTERNAL_SYSCALL_CALL (exit, 0);

>> +    }

>>  

>>    /* NOTREACHED */

>>  }

> 

> You could leave off the braces.  But still looks good.


Ack.

Patch

diff --git a/csu/libc-start.c b/csu/libc-start.c
index 8688cba76d..5b5913e7bf 100644
--- a/csu/libc-start.c
+++ b/csu/libc-start.c
@@ -30,7 +30,6 @@ 
 #include <stdio.h>
 #include <unistd.h>
 #include <ldsodefs.h>
-#include <exit-thread.h>
 #include <libc-diag.h>
 #include <libc-internal.h>
 #include <elf/libc-early-init.h>
diff --git a/nptl/pthread_create.c b/nptl/pthread_create.c
index 2d2535b07d..aacbba1cac 100644
--- a/nptl/pthread_create.c
+++ b/nptl/pthread_create.c
@@ -30,7 +30,6 @@ 
 #include <libc-internal.h>
 #include <resolv.h>
 #include <kernel-features.h>
-#include <exit-thread.h>
 #include <default-sched.h>
 #include <futex-internal.h>
 #include <tls-setup.h>
@@ -575,7 +574,10 @@  start_thread (void *arg)
 
      The exit code is zero since in case all threads exit by calling
      'pthread_exit' the exit status must be 0 (zero).  */
-  __exit_thread ();
+  while (1)
+    {
+      INTERNAL_SYSCALL_CALL (exit, 0);
+    }
 
   /* NOTREACHED */
 }
diff --git a/sysdeps/generic/exit-thread.h b/sysdeps/generic/exit-thread.h
deleted file mode 100644
index 676ef553a5..0000000000
--- a/sysdeps/generic/exit-thread.h
+++ /dev/null
@@ -1,28 +0,0 @@ 
-/* Call to terminate the current thread.  Stub version.
-   Copyright (C) 2014-2021 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/>.  */
-
-/* This causes the current thread to exit, without affecting other
-   threads in the process if there are any.  If there are no other
-   threads left, then this has the effect of _exit (0).  */
-
-static inline void __attribute__ ((noreturn, always_inline, unused))
-__exit_thread (void)
-{
-  while (1)
-    asm ("write me!");
-}
diff --git a/sysdeps/nptl/libc_start_call_main.h b/sysdeps/nptl/libc_start_call_main.h
index c579c65f78..08b1800e83 100644
--- a/sysdeps/nptl/libc_start_call_main.h
+++ b/sysdeps/nptl/libc_start_call_main.h
@@ -67,7 +67,10 @@  __libc_start_call_main (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL),
       result = 0;
       if (! atomic_decrement_and_test (&__nptl_nthreads))
         /* Not much left to do but to exit the thread, not the process.  */
-        __exit_thread ();
+	while (1)
+	  {
+	    INTERNAL_SYSCALL_CALL (exit, 0);
+	  }
     }
 
   exit (result);
diff --git a/sysdeps/unix/sysv/linux/exit-thread.h b/sysdeps/unix/sysv/linux/exit-thread.h
deleted file mode 100644
index 9e1b7f3752..0000000000
--- a/sysdeps/unix/sysv/linux/exit-thread.h
+++ /dev/null
@@ -1,37 +0,0 @@ 
-/* Call to terminate the current thread.  Linux version.
-   Copyright (C) 2014-2021 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 <sysdep.h>
-
-/* This causes the current thread to exit, without affecting other
-   threads in the process if there are any.  If there are no other
-   threads left, then this has the effect of _exit (0).  */
-
-static inline void __attribute__ ((noreturn, always_inline, unused))
-__exit_thread (void)
-{
-  /* Doing this in a loop is mostly just to satisfy the compiler that the
-     function really qualifies as noreturn.  It also means that in some
-     pathological situation where the system call does not get made or does
-     not work, the thread will simply spin rather than running off the end
-     of the caller and doing unexpectedly strange things.  */
-  while (1)
-    {
-      INTERNAL_SYSCALL_CALL (exit, 0);
-    }
-}