Tue Jul 28 14:04:29 1998 Ross Johnson <rpj@swan.canberra.edu.au>

        * implement.h: Add _PTHREAD_VALID macro.

        * sync.c (pthread_join): Modify to use the new thread
        type and _pthread_delete_thread(). Rename "target" to "thread".
        Remove extra local variable "target".
        (pthread_detach): Ditto.

        * signal.c (pthread_sigmask): Move init of "us" out of inner block.
        Fix instance of "this" should have been "us". Rename "us" to "thread".

        * sched.c (pthread_setschedparam): Modify to use the new thread
        type.
        (pthread_getschedparam): Ditto.

        * private.c (_pthread_find_thread): Fix return type and arg.

        * implement.h: Remove _PTHREAD_YES and _PTHREAD_NO.
        (_pthread_new_thread): Add prototype.
        (_pthread_find_thread): Ditto.
        (_pthread_delete_thread): Ditto.
        (_pthread_new_thread_entry): Remove prototype.
        (_pthread_find_thread_entry): Ditto.
        (_pthread_delete_thread_entry): Ditto.
        (  _PTHREAD_NEW, _PTHREAD_INUSE, _PTHREAD_EXITED, _PTHREAD_REUSE):
        Add.


        * create.c (pthread_create): Minor rename "us" to "new" (I need
        these cues but it doesn't stop me coming out with some major bugs
        at times).
        Load start_routine and arg into the thread so the wrapper can
        call it.

        * exit.c (pthread_exit): Fix pthread_this should be pthread_self.

        * cancel.c (pthread_setcancelstate): Change
        _pthread_threads_thread_t * to pthread_t and init with
        pthread_this().
        (pthread_setcanceltype): Ditto.

1 files changed, 11 insertions, 4 deletions

diff --git a/misc.c b/misc.c
index 60dbb4a..9834630 100644
--- a/misc.c
+++ b/misc.c
@@ -49,15 +49,22 @@ pthread_self(void)
      that all of the Win32 functions we are going to use only need
      HANDLEs.  The morons. */
 
+  /* FIXME: Need a new lookup method with the new thread allocation
+     scheme.
+
+     We can use the Win32 handle though as a basis (perhaps
+     to look up a table) because pthread_self() will never be called
+     after the Win32 thread has terminated (unless we can raise
+     ourselves from the dead!), and therefore the Win32 handle cannot
+     have been reused yet. */
+
+#if 0
   return GetCurrentThread();
+#endif
 }
 
 int
 pthread_equal(pthread_t t1, pthread_t t2)
 {
-  /* For the time being, assume that HANDLEs can be directly compared.
-     If not, then use the appropriate Win32 function for
-     comparison. */
-
   return (t1 != t2);
 }