2007-11-20 Neal H. Walfield <neal@gnu.org>

	* sysdeps/l4/pt-thread-dealloc.c: New file.
	* Makefile.am (libpthread_a_SOURCES): Add pt-thread-dealloc.c.

	* sysdeps/l4/hurd/pt-sysdep.h (PTHREAD_STACK_DEFAULT): Change to
	2MB.

	* sysdeps/l4/hurd/pt-sysdep.c (sched_yield): New function.
	(sigprocmask): Likewise.
	(init_routine): Only call __pthread_initialize once.  Update
	comments.

6 files changed, 66 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 92e6af6..a43390c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2007-11-20  Neal H. Walfield  <neal@gnu.org>
 
+	* sysdeps/l4/pt-thread-dealloc.c: New file.
+	* Makefile.am (libpthread_a_SOURCES): Add pt-thread-dealloc.c.
+
+	* sysdeps/l4/hurd/pt-sysdep.h (PTHREAD_STACK_DEFAULT): Change to
+	2MB.
+
+	* sysdeps/l4/hurd/pt-sysdep.c (sched_yield): New function.
+	(sigprocmask): Likewise.
+	(init_routine): Only call __pthread_initialize once.  Update
+	comments.
+
+2007-11-20  Neal H. Walfield  <neal@gnu.org>
+
 	* Makefile.am (libpthread_a_SOURCES): Remove pt-create-np.c.
 	* sysdeps/l4/pt-create-np.c: Remove file.
 	* sysdeps/l4/pt-pool-np.c (pthread_pool_add_np): Change tid from
diff --git a/Makefile.am b/Makefile.am
index a1db8f4..9249d93 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -107,6 +107,7 @@ libpthread_a_SOURCES = pt-attr.c pt-attr-destroy.c pt-attr-getdetachstate.c \
 	pt-cond-timedwait.c						    \
 	pt-stack-alloc.c						    \
 	pt-thread-alloc.c						    \
+	pt-thread-dealloc.c						    \
 	pt-thread-start.c						    \
 	pt-thread-halt.c						    \
 	pt-getconcurrency.c pt-setconcurrency.c				    \
diff --git a/sysdeps/l4/hurd/pt-sysdep.c b/sysdeps/l4/hurd/pt-sysdep.c
index 265592c..a05eb0a 100644
--- a/sysdeps/l4/hurd/pt-sysdep.c
+++ b/sysdeps/l4/hurd/pt-sysdep.c
@@ -23,6 +23,20 @@
 
 #include <pt-internal.h>
 
+int
+sched_yield (void)
+{
+  l4_yield ();
+  return 0;
+}
+
+int
+sigprocmask (int HOW, const sigset_t *restrict SET, sigset_t *restrict OLDSET)
+{
+  /* Just ignore for now.  */
+  return 0;
+}
+
 /* Forward.  */
 static void *init_routine (void);
 
@@ -36,23 +50,15 @@ void *(*_pthread_init_routine)(void) = &init_routine;
 static void * 
 init_routine (void)
 {
-  struct __pthread *thread;
-  int err;
-
   /* Initialize the library.  */
   __pthread_initialize ();
 
+  struct __pthread *thread;
+  int err;
+
   /* Create the pthread structure for the main thread (i.e. us).  */
   err = __pthread_create_internal (&thread, 0, 0, 0);
   assert_perror (err);
 
-  __pthread_initialize ();
-
-  /* Decrease the number of threads, to take into account that the
-     signal thread (which will be created by the startup code when we
-     return from here) shouldn't be seen as a user thread.  */
-#warning Need to implement the signal thread.
-  // __pthread_total--;
-
   return (void *) thread->mcontext.sp;
 }
diff --git a/sysdeps/l4/hurd/pt-sysdep.h b/sysdeps/l4/hurd/pt-sysdep.h
index 0b5abb7..ca2c901 100644
--- a/sysdeps/l4/hurd/pt-sysdep.h
+++ b/sysdeps/l4/hurd/pt-sysdep.h
@@ -25,8 +25,8 @@
 /* XXX */
 #define _POSIX_THREAD_THREADS_MAX	64
 
-/* The default stack size.  */
-#define PTHREAD_STACK_DEFAULT	4096
+/* The default stack size: 2MB.  */
+#define PTHREAD_STACK_DEFAULT	(2 * 1024 * 1024)
 
 #define PTHREAD_SYSDEP_MEMBERS \
   l4_thread_id_t threadid; \
diff --git a/sysdeps/l4/pt-thread-dealloc.c b/sysdeps/l4/pt-thread-dealloc.c
new file mode 100644
index 0000000..c09e486
--- /dev/null
+++ b/sysdeps/l4/pt-thread-dealloc.c
@@ -0,0 +1,32 @@
+/* Deallocate the kernel thread resources.  L4 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 <l4.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)
+{
+}
diff --git a/sysdeps/l4/pt-thread-start.c b/sysdeps/l4/pt-thread-start.c
index 538d044..144c58b 100644
--- a/sysdeps/l4/pt-thread-start.c
+++ b/sysdeps/l4/pt-thread-start.c
@@ -27,8 +27,8 @@
 int
 __pthread_thread_start (struct __pthread *thread)
 {
-  /* The main thread is already running of course.  */
   if (__pthread_num_threads == 1)
+    /* The main thread is already running of course.  */
     {
       assert (__pthread_total == 1);
       assert (l4_is_thread_equal (l4_myself (), thread->threadid));