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
	an _L4_thread_id_t to an l4_thread_id_t.
	(pthread_pool_get_np): Return an l4_thread_id_t, not a
	_L4_thread_id_t.
	* sysdeps/l4/bits/pthread-np.h (pthread_create_from_l4_tid_np):
	Remove declaration.
	(pthread_pool_add_np): Change tid from an _L4_thread_id_t to an
	l4_thread_id_t.
	(pthread_pool_get_np): Return an l4_thread_id_t, not a
	_L4_thread_id_t.

	* sysdeps/l4/pt-docancel.c (__pthread_do_cancel): Implement for
	the case that the target thread is not the executing thread.

	* sysdeps/l4/pt-thread-alloc.c (__pthread_thread_alloc): Return
	EAGAIN if pthread_pool_get_np does not return a thread.  Update
	comments.

	* sysdeps/l4/pt-thread-start.c (__pthread_thread_start): Don't set
	the thread's pager.  Assert that if this is the first thread, then
	THREAD->THREADID is designates the running thread.

	* sysdeps/l4/pt-timedblock.c (__pthread_timedblock): Add warning
	about incomplete implementation.

	* Makefile.am (libpthread_a_SOURCES): Remove pt-thread-init.c.
	* sysdeps/l4/pt-thread-init.c: Remove dead file.
	* sysdeps/l4/pt-start.c: Remove dead file.

1 files changed, 2 insertions, 21 deletions

diff --git a/libpthread/sysdeps/l4/pt-thread-alloc.c b/libpthread/sysdeps/l4/pt-thread-alloc.c
index fc2f43b..ec69afb 100644
--- a/libpthread/sysdeps/l4/pt-thread-alloc.c
+++ b/libpthread/sysdeps/l4/pt-thread-alloc.c
@@ -30,33 +30,14 @@ __pthread_thread_alloc (struct __pthread *thread)
 
   /* The main thread is already running of course.  */
   if (__pthread_num_threads == 1)
-    {
-      /* XXX: The initialization code needs to make this consistent.
-	 Right now, we have none and this whole library is a hack
-	 anyways.  */
-#warning __pthread_total is inconsistent.
-#if 0
-      assert (__pthread_total == 1);
-#endif
-      thread->threadid = l4_myself ();
-    }
+    thread->threadid = l4_myself ();
   else
     {
       thread->threadid = pthread_pool_get_np ();
       if (thread->threadid != l4_nilthread)
 	return 0;
 
-#if 0
-      CORBA_Environment env;
-
-      env = idl4_default_environment;
-      err = thread_create (__task_server,
-			   L4_Version (L4_Myself ()),
-			   * (L4_Word_t *) &__system_pager,
-			   (L4_Word_t *) &thread->threadid, &env);
-      if (err)
-#endif
-	return EAGAIN;
+      return EAGAIN;
     }
   return 0;
 }