From e2fd6e2de322cc12d9153da548ab76379049c11c Mon Sep 17 00:00:00 2001 From: rpj Date: Tue, 25 Jul 2000 16:14:23 +0000 Subject: 2000-07-25 Ross Johnson * sched.c (sched_get_priority_max): Handle different WinCE and Win32 priority values together. (sched_get_priority_min): Ditto. - Tristan Savatier * create.c (pthread_create): Force new threads to wait until pthread_create has the new thread's handle; we also retain a local copy of the handle for internal use until pthread_create returns. * private.c (_pthread_threadStart): Initialise ei[]. (_pthread_threadStart): When beginthread is used to start the thread, force waiting until the creator thread had the thread handle. * cancel.c (_pthread_cancel_thread): Include context switch code for defined(_X86_) environments in addition to _M_IX86. * rwlock.c (pthread_rwlock_destroy): Assignment changed to avoid compiler warning. * private.c (_pthread_get_exception_services_code): Cast NULL return value to avoid compiler warning. * cleanup.c (pthread_pop_cleanup): Initialise "cleanup" variable to avoid compiler warnings. * misc.c (_pthread_new): Change "new" variable to "t" to avoid confusion with the C++ keyword of the same name. * condvar.c (cond_wait_cleanup): Initialise lastWaiter variable. (cond_timedwait): Remove unused local variables. to avoid compiler warnings. * dll.c (dllMain): Remove 2000-07-21 change - problem appears to be in pthread_create(). 2000-07-22 Ross Johnson * tsd.c (pthread_key_create): If a destructor was given and the pthread_mutex_init failed, then would try to reference a NULL pointer (*key); eliminate this section of code by using a dynamically initialised mutex (PTHREAD_MUTEX_INITIALIZER). * tsd.c (pthread_setspecific): Return an error if unable to set the value; simplify cryptic conditional. * tsd.c (pthread_key_delete): Locking threadsLock relied on mutex_lock returning an error if the key has no destructor. ThreadsLock is only initialised if the key has a destructor. Making this mutex a static could reduce the number of mutexes used by an application since it is actually created only at first use and it's often destroyed soon after. 2000-07-22 Ross Johnson * FAQ: Added Q5 and Q6. tests/ChangeLog: 2000-07-25 Ross Johnson * runtest.bat: modified to work under W98. * runall.bat: Add new tests; modified to work under W98. It was ok under NT. * Makefile: Add new tests. * exception1.c: New; Test passing exceptions back to the application and retaining library internal exceptions. * join0.c: New; Test a single join. --- cleanup.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'cleanup.c') diff --git a/cleanup.c b/cleanup.c index b92d502..14ed0af 100644 --- a/cleanup.c +++ b/cleanup.c @@ -2,8 +2,9 @@ * cleanup.c * * Description: - * This translation unit implements routines associated cleaning up - * threads. + * This translation unit implements routines associated + * with cleaning up threads. + * * * Pthreads-win32 - POSIX Threads Library for Win32 * Copyright (C) 1998 @@ -33,6 +34,12 @@ #include "pthread.h" #include "implement.h" +/* + * The functions pthread_pop_cleanup and pthread_push_cleanup + * are implemented here for applications written in C with no + * SEH or C++ destructor support. + */ + _pthread_cleanup_t * pthread_pop_cleanup (int execute) /* @@ -60,7 +67,7 @@ pthread_pop_cleanup (int execute) * ------------------------------------------------------ */ { - _pthread_cleanup_t *cleanup; + _pthread_cleanup_t *cleanup = NULL; cleanup = (_pthread_cleanup_t *) pthread_getspecific (_pthread_cleanupKey); @@ -69,7 +76,7 @@ pthread_pop_cleanup (int execute) if (execute && (cleanup->routine != NULL)) { -#ifdef _MSC_VER +#if defined(_MSC_VER) && !defined(__cplusplus) __try { @@ -87,7 +94,7 @@ pthread_pop_cleanup (int execute) */ } -#else /* _MSC_VER */ +#else /* _MSC_VER && ! __cplusplus */ #ifdef __cplusplus @@ -114,7 +121,7 @@ pthread_pop_cleanup (int execute) */ (*cleanup->routine) (cleanup->arg); -#endif /* __cplusplus */ +#endif /* __cplusplus && ! __cplusplus */ #endif /* _MSC_VER */ -- cgit v1.2.3