libpthread/

2005-05-04  Neal H. Walfield  <neal@gnu.org>

	* Makefile (SRCS): Add pt-thread_dealloc.c.
	* sysdeps/mach/pt-thread-dealloc.c: New file.
	* pthread/pt-internal.h (__pthread_thread_dealloc): New
	declaration.
	(__pthread_thread_halt): Add parameter NEED_DEALLOC.  Update
	callers.
	* sysdeps/mach/pt-thread-halt.c (__pthread_thread_halt): Respect
	new NEED_DEALLOC parameter.  Move code which deallocates kernel
	resources from here ...
	* sysdeps/mach/pt-thread-dealloc.c (__pthread_thread_dealloc):
	...to here.
	* pthread/pt-create.c (__pthread_create_internal): Call
	__pthread_thread_dealloc on failure.
	* pthread/pt-exit.c (pthread_exit): Call __pthread_thread_dealloc.

	* sysdeps/mach/pt-thread-alloc.c (create_wakeupmsg): Call
	__mach_port_destroy to deallocate the receive right.
	__mach_port_deallocate won't do it.

	* pthread/pt-detach.c (pthread_detach): Don't call
	__pthread_thread_halt a second time.

	* sysdeps/mach/hurd/pt-sysdep.c (_cthread_init_routine): Fix
	declaration.
	(init_routine): Update declaration and remove gratuitous cast.

4 files changed, 62 insertions, 16 deletions

diff --git a/sysdeps/mach/hurd/pt-sysdep.c b/sysdeps/mach/hurd/pt-sysdep.c
index b42fe255..5e070067 100644
--- a/sysdeps/mach/hurd/pt-sysdep.c
+++ b/sysdeps/mach/hurd/pt-sysdep.c
@@ -1,5 +1,5 @@
 /* System dependent pthreads code.  Hurd version.
-   Copyright (C) 2000,02 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2005 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
@@ -29,16 +29,16 @@
 #include <pt-internal.h>
 
 /* Forward.  */
-static int init_routine (void);
+static void *init_routine (void);
 
 /* OK, the name of this variable isn't really appropriate, but I don't
    want to change it yet.  */
-int (*_cthread_init_routine)(void) = &init_routine;
+void *(*_cthread_init_routine)(void) = &init_routine;
 
 /* This function is called from the Hurd-specific startup code.  It
    should return a new stack pointer for the main thread.  The caller
    will switch to this new stack before doing anything serious.  */
-static int
+static void *
 init_routine (void)
 {
   struct __pthread *thread;
@@ -68,5 +68,5 @@ init_routine (void)
     = (__pthread_default_attr.stacksize
        - __hurd_threadvar_max * sizeof (uintptr_t));
 
-  return (int) thread->mcontext.sp;
+  return thread->mcontext.sp;
 }
diff --git a/sysdeps/mach/pt-thread-alloc.c b/sysdeps/mach/pt-thread-alloc.c
index a191c712..1acba98a 100644
--- a/sysdeps/mach/pt-thread-alloc.c
+++ b/sysdeps/mach/pt-thread-alloc.c
@@ -1,5 +1,5 @@
 /* Start thread.  Mach version.
-   Copyright (C) 2000,02 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2005 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
@@ -50,8 +50,8 @@ create_wakeupmsg (struct __pthread *thread)
 				  MACH_MSG_TYPE_MAKE_SEND);
   if (err)
     {
-      __mach_port_deallocate (__mach_task_self (),
-			      thread->wakeupmsg.msgh_remote_port);
+      __mach_port_destroy (__mach_task_self (),
+			   thread->wakeupmsg.msgh_remote_port);
       return EAGAIN;
     }
 
@@ -86,7 +86,8 @@ __pthread_thread_alloc (struct __pthread *thread)
     {
       assert (__pthread_total == 0);
       thread->kernel_thread = __mach_thread_self ();
-      /* We implicitly hold a reference.  */
+      /* We implicitly hold a reference drop the one that we just
+	 acquired.  */
       __mach_port_deallocate (__mach_task_self (), thread->kernel_thread);
     }
   else
diff --git a/sysdeps/mach/pt-thread-dealloc.c b/sysdeps/mach/pt-thread-dealloc.c
new file mode 100644
index 00000000..55d8c4d5
--- /dev/null
+++ b/sysdeps/mach/pt-thread-dealloc.c
@@ -0,0 +1,41 @@
+/* Deallocate the kernel thread resources.  Mach version.
+   Copyright (C) 2005 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 Library General Public License as
+   published by the Free Software Foundation; either version 2 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <assert.h>
+#include <errno.h>
+#include <mach.h>
+
+#include <pt-internal.h>
+
+/* Deallocate any kernel resources associated with THREAD except don't
+   halt the thread itself.  On return, the thread will be marked as
+   dead and __pthread_halt will be called.  */
+void
+__pthread_thread_dealloc (struct __pthread *thread)
+{
+  /* Why no assert?  Easy.  When Mach kills a task, it starts by
+     invalidating the task port and then terminating the threads one
+     by one.  But while it is terminating them, they are still
+     eligible to be scheduled.  Imagine we have two threads, one calls
+     exit, one calls pthread_exit.  The second one may run this after
+     the mask port can been destroyed thus gratuitously triggering the
+     assert.  */
+  __mach_port_destroy (__mach_task_self (),
+		       thread->wakeupmsg.msgh_remote_port);
+}
diff --git a/sysdeps/mach/pt-thread-halt.c b/sysdeps/mach/pt-thread-halt.c
index 84e6ac8e..9f860247 100644
--- a/sysdeps/mach/pt-thread-halt.c
+++ b/sysdeps/mach/pt-thread-halt.c
@@ -1,5 +1,5 @@
 /* Deallocate the kernel thread resources.  Mach version.
-   Copyright (C) 2000,02 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2005 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
@@ -23,17 +23,21 @@
 
 #include <pt-internal.h>
 
+/* Stop the kernel thread associated with THREAD.  If NEED_DEALLOC is
+   true, the function must call __pthread_dealloc on THREAD.
 
-/* Deallocate the kernel thread resources associated with THREAD.  */
+   NB: The thread executing this function may be the thread which is
+   being halted, thus the last action should be halting the thread
+   itself.  */
 void
-__pthread_thread_halt (struct __pthread *thread)
+__pthread_thread_halt (struct __pthread *thread, int need_dealloc)
 {
   error_t err;
+  thread_t tid = thread->kernel_thread;
 
-  err = __mach_port_deallocate (__mach_task_self (),
-				thread->wakeupmsg.msgh_remote_port);
-  assert_perror (err);
+  if (need_dealloc)
+    __pthread_dealloc (thread);
 
-  err = __thread_terminate (thread->kernel_thread);
+  err = __thread_terminate (tid);
   assert_perror (err);
 }