diff options
| -rw-r--r-- | ANNOUNCE | 8 | ||||
| -rw-r--r-- | ChangeLog | 31 | ||||
| -rw-r--r-- | create.c | 17 | ||||
| -rw-r--r-- | dll.c | 4 | ||||
| -rw-r--r-- | misc.c | 2 | ||||
| -rw-r--r-- | signal.c | 5 | ||||
| -rw-r--r-- | sync.c | 5 | ||||
| -rw-r--r-- | tsd.c | 15 |
8 files changed, 65 insertions, 22 deletions
@@ -242,14 +242,6 @@ points in applications and libraries: pthreadCancelableWait pthreadCancelableTimedWait -The library includes a non-portable function to force using the much -faster critical sections as the basis for POSIX mutexes when these are -not the default for a particular version of Windows (eg. W9x). - - pthread_mutexattr_setforcecs_np - -For example, if you don't ever use pthread_mutex_trylock() in your -application. Availability ------------ @@ -1,3 +1,34 @@ +2000-07-25 Ross Johnson <rpj@setup1.ise.canberra.edu.au> + + * dll.c (dllMain): Remove 2000-07-21 change - problem + appears to be in pthread_create(). + +2000-07-21 Ross Johnson <rpj@setup1.ise.canberra.edu.au> + + * create.c (pthread_create): Set threadH to 0 (zero) + everywhere. Some assignments were using NULL. Maybe + it should be NULL everywhere - need to check. (I know + they are nearly always the same thing - but not by + definition.) + + * dll.c: Include resource leakage work-around. This is a + partial FIXME which doesn't stop all leakage. The real + problem needs to be found and fixed. + - "David Baggett" <dmb@itasoftware.com> + + * misc.c (pthread_self): Try to catch NULL thread handles + at the point where they might be generated, even though + they should always be valid at this point. + + * tsd.c (pthread_setspecific): return an error value if + pthread_self() returns NULL. + + * sync.c (pthread_join): return an error value if + pthread_self() returns NULL. + + * signal.c (pthread_sigmask): return an error value if + pthread_self() returns NULL. + 2000-01-06 Ross Johnson <rpj@special.ise.canberra.edu.au> * Makefile: Remove inconsistencies in 'cl' args @@ -125,6 +125,7 @@ pthread_create (pthread_t * tid, : PThreadStateSuspended; thread->keys = NULL; + #if ! defined (__MINGW32__) || defined (__MSVCRT__) thread->threadH = (HANDLE) @@ -144,14 +145,20 @@ pthread_create (pthread_t * tid, (unsigned) stackSize, /* default stack size */ parms); - /* Make the return code to match _beginthreadex's. */ + /* + * Make the return code match _beginthreadex's. + */ if (thread->threadH == (HANDLE)-1L) - thread->threadH = NULL; + { + thread->threadH = 0; + } else if (! run) { - /* beginthread does not allow for create flags, so we do it now. - Note that beginthread itself creates the thread in SUSPENDED - mode, and then calls ResumeThread to start it. */ + /* + * beginthread does not allow for create flags, so we do it now. + * Note that beginthread itself creates the thread in SUSPENDED + * mode, and then calls ResumeThread to start it. + */ SuspendThread (thread->threadH); } @@ -152,14 +152,12 @@ DllMain ( /* * Detached threads have their resources automatically - * cleaned up upon exit (others must be 'joined' + * cleaned up upon exit (others must be 'joined'). */ if (self != NULL && self->detachState == PTHREAD_CREATE_DETACHED) { - pthread_setspecific (_pthread_selfThreadKey, NULL); - _pthread_threadDestroy (self); } @@ -175,7 +175,7 @@ pthread_self (void) * NOTE: * GetCurrentThread only returns a pseudo-handle * which is only valid in the current thread context. - * Therefore, you should not use pass the handle to + * Therefore, you should not pass the handle to * other threads for whatever purpose. */ self->threadH = GetCurrentThread(); @@ -35,6 +35,11 @@ pthread_sigmask(int how, sigset_t const *set, sigset_t *oset) { pthread_t thread = pthread_self(); + if (thread == NULL) + { + return ENOENT; + } + /* Validate the `how' argument.*/ if (set != NULL) { @@ -104,6 +104,7 @@ pthread_join (pthread_t thread, void **value_ptr) * 0 'thread' has completed * EINVAL thread is not a joinable thread, * ESRCH no thread could be found with ID 'thread', + * ENOENT thread couldn't find it's own valid handle, * EDEADLK attempt to join thread with self * * ------------------------------------------------------ @@ -113,6 +114,10 @@ pthread_join (pthread_t thread, void **value_ptr) pthread_t self; self = pthread_self (); + if (self == NULL) + { + return ENOENT; + } if (pthread_equal (self, thread) != 0) { @@ -25,11 +25,11 @@ #include "pthread.h" #include "implement.h" -
-/* TLS_OUT_OF_INDEXES not defined on WinCE */
-#ifndef TLS_OUT_OF_INDEXES
-#define TLS_OUT_OF_INDEXES 0xffffffff
-#endif
+ +/* TLS_OUT_OF_INDEXES not defined on WinCE */ +#ifndef TLS_OUT_OF_INDEXES +#define TLS_OUT_OF_INDEXES 0xffffffff +#endif int pthread_key_create (pthread_key_t * key, void (*destructor) (void *)) @@ -212,6 +212,7 @@ pthread_setspecific (pthread_key_t key, const void *value) * ENOSPC a required resource has been exhausted, * ENOSYS semaphores are not supported, * EPERM the process lacks appropriate privilege + * ENOENT the thread couldn't find it's own handle * * ------------------------------------------------------ */ @@ -227,6 +228,10 @@ pthread_setspecific (pthread_key_t key, const void *value) * thread if one wasn't explicitly created */ self = pthread_self (); + if (self == NULL) + { + return ENOENT; + } } else { |