From eca19329e11c472df9b62da0a643de6f90bb7f46 Mon Sep 17 00:00:00 2001 From: rpj Date: Tue, 28 Jul 1998 09:29:22 +0000 Subject: Tue Jul 28 14:04:29 1998 Ross Johnson * 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. --- create.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'create.c') diff --git a/create.c b/create.c index 71744c9..d4218d1 100644 --- a/create.c +++ b/create.c @@ -17,7 +17,7 @@ unsigned _pthread_start_call(void * us_arg) { /* We're now in a running thread. Any local variables here are on - this threads private stack so we're safe to leave data in them + this thread's private stack so we're safe to leave data in them until we leave. */ pthread_t us; _pthread_call_t * call; @@ -56,21 +56,21 @@ pthread_create(pthread_t *thread, void * security = NULL; DWORD threadID; pthread_attr_t * attr_copy; - pthread_t us; + pthread_t new; /* Success unless otherwise set. */ int ret; /* CRITICAL SECTION */ pthread_mutex_lock(&_pthread_table_mutex); - ret = _pthread_new_thread(&us); + ret = _pthread_new_thread(&new); pthread_mutex_lock(&_pthread_table_mutex); /* END CRITICAL SECTION */ if (ret == 0) { - attr_copy = &(us->attr); + attr_copy = &(new->attr); /* Map given attributes otherwise just use default values. */ if (attr != NULL) @@ -88,13 +88,17 @@ pthread_create(pthread_t *thread, #endif /* HAVE_SIGSET_T */ } + /* We call a generic wrapper which then calls the start routine. */ + new->call.routine = start_routine; + new->call.arg = arg; + /* Start running, not suspended. */ flags = 0; handle = (HANDLE) _beginthreadex(security, attr_copy->stacksize, _pthread_start_call, - (void *) us, + (void *) new, flags, &threadID); @@ -111,9 +115,9 @@ pthread_create(pthread_t *thread, if (ret == 0) { /* Let the caller know the thread handle. */ - us->win32handle = handle; - us->ptstatus = _PTHREAD_INUSE; - *thread = (pthread_t) us; + new->win32handle = handle; + new->ptstatus = _PTHREAD_INUSE; + *thread = new; } else { @@ -121,7 +125,7 @@ pthread_create(pthread_t *thread, pthread_mutex_lock(&_pthread_table_mutex); /* Remove the failed thread entry. */ - _pthread_delete_thread(us); + _pthread_delete_thread(new); pthread_mutex_lock(&_pthread_table_mutex); /* END CRITICAL SECTION */ -- cgit v1.2.3