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, 15 insertions, 7 deletions

diff --git a/implement.h b/implement.h
index c19e6b9..5ee9ba3 100644
--- a/implement.h
+++ b/implement.h
@@ -9,8 +9,17 @@
 
 #define _PTHREAD_HASH_INDEX(x) (((ULONG) x) % PTHREAD_THREADS_MAX)
 
-#define _PTHREAD_YES 1
-#define _PTHREAD_NO  0
+enum {
+  _PTHREAD_NEW,
+  _PTHREAD_INUSE,
+  _PTHREAD_EXITED,
+  _PTHREAD_REUSE
+};
+
+#define _PTHREAD_VALID(T) \
+  (T) != NULL \
+  && ((T)->ptstatus == _PTHREAD_NEW
+      || (T)->ptstatus == _PTHREAD_INUSE)
 
 /* Handler execution flags. */
 #define _PTHREAD_HANDLER_NOEXECUTE 0
@@ -103,18 +112,17 @@ void _pthread_handler_pop_all(int stack,
 
 /* Primitives to manage threads table entries. */
 
-int _pthread_new_thread_entry(pthread_t thread,
-			      _pthread_threads_thread_t * entry);
+int _pthread_new_thread(pthread_t * thread);
 
-_pthread_threads_thread_t * _pthread_find_thread_entry(pthread_t thread);
+pthread_t _pthread_find_thread(HANDLE win32handle);
 
-void _pthread_delete_thread_entry(_pthread_threads_thread_t * this);
+int _pthread_delete_thread(pthread_t thread);
 
 /* Thread cleanup. */
 
 void _pthread_vacuum(void);
 
-void _pthread_exit(void * value, int return_code);
+void _pthread_exit(pthread_t thread, void * value, int return_code);
 
 #ifdef __cplusplus
 }