diff options
| author | Egor Duda <deo@logos-m.ru> | 2001-11-15 11:10:38 +0000 |
|---|---|---|
| committer | Egor Duda <deo@logos-m.ru> | 2001-11-15 11:10:38 +0000 |
| commit | f38ac9b70c69408b011797cf5b86579e60c5b7df (patch) | |
| tree | caf67ea04476231ef37a8f5542089cd4796cfb87 /winsup/cygwin/thread.cc | |
| parent | e2b3dc25804ce3688ac69a7249323e90ae82305e (diff) | |
| download | cygnal-f38ac9b70c69408b011797cf5b86579e60c5b7df.tar.gz cygnal-f38ac9b70c69408b011797cf5b86579e60c5b7df.tar.bz2 cygnal-f38ac9b70c69408b011797cf5b86579e60c5b7df.zip | |
* include/pthread.h (PTHREAD_COND_INITIALIZER): Define.
* thread.cc (__pthread_cond_destroy): Add support for
PTHREAD_COND_INITIALIZER.
(__pthread_cond_init): Ditto.
(__pthread_cond_broadcast): Ditto.
(__pthread_cond_signal): Ditto.
(__pthread_cond_dowait): Ditto.
(__pthread_mutex_init): Handle PTHREAD_MUTEX_INITIALIZER correctly,
don't return error when it's passed as parameter.
* winsup.h (check_null_invalid_struct): Call correct function.
Diffstat (limited to 'winsup/cygwin/thread.cc')
| -rw-r--r-- | winsup/cygwin/thread.cc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/winsup/cygwin/thread.cc b/winsup/cygwin/thread.cc index 87e926d96..4b8867993 100644 --- a/winsup/cygwin/thread.cc +++ b/winsup/cygwin/thread.cc @@ -1676,6 +1676,8 @@ __pthread_getspecific (pthread_key_t key) int __pthread_cond_destroy (pthread_cond_t *cond) { + if (check_valid_pointer (cond) && (*cond == PTHREAD_COND_INITIALIZER)) + return 0; if (verifyable_object_isvalid (cond, PTHREAD_COND_MAGIC) != VALID_OBJECT) return EINVAL; @@ -1695,7 +1697,7 @@ __pthread_cond_init (pthread_cond_t *cond, const pthread_condattr_t *attr) if (attr && verifyable_object_isvalid (attr, PTHREAD_CONDATTR_MAGIC) != VALID_OBJECT) return EINVAL; - if (verifyable_object_isvalid (cond, PTHREAD_COND_MAGIC) != INVALID_OBJECT) + if (verifyable_object_isvalid (cond, PTHREAD_COND_MAGIC, PTHREAD_COND_INITIALIZER) == VALID_OBJECT) return EBUSY; *cond = new pthread_cond (attr ? (*attr) : NULL); @@ -1713,6 +1715,8 @@ __pthread_cond_init (pthread_cond_t *cond, const pthread_condattr_t *attr) int __pthread_cond_broadcast (pthread_cond_t *cond) { + if (*cond == PTHREAD_COND_INITIALIZER) + __pthread_cond_init (cond, NULL); if (verifyable_object_isvalid (cond, PTHREAD_COND_MAGIC) != VALID_OBJECT) return EINVAL; @@ -1724,6 +1728,8 @@ __pthread_cond_broadcast (pthread_cond_t *cond) int __pthread_cond_signal (pthread_cond_t *cond) { + if (*cond == PTHREAD_COND_INITIALIZER) + __pthread_cond_init (cond, NULL); if (verifyable_object_isvalid (cond, PTHREAD_COND_MAGIC) != VALID_OBJECT) return EINVAL; @@ -1743,6 +1749,8 @@ __pthread_cond_dowait (pthread_cond_t *cond, pthread_mutex_t *mutex, if (*mutex == PTHREAD_MUTEX_INITIALIZER) __pthread_mutex_init (mutex, NULL); themutex = mutex; + if (*cond == PTHREAD_COND_INITIALIZER) + __pthread_cond_init (cond, NULL); if (verifyable_object_isvalid (themutex, PTHREAD_MUTEX_MAGIC) != VALID_OBJECT) return EINVAL; @@ -1920,7 +1928,7 @@ __pthread_mutex_init (pthread_mutex_t *mutex, if (attr && verifyable_object_isvalid (attr, PTHREAD_MUTEXATTR_MAGIC) != VALID_OBJECT || check_valid_pointer (mutex)) return EINVAL; - if (verifyable_object_isvalid (mutex, PTHREAD_MUTEX_MAGIC, PTHREAD_MUTEX_INITIALIZER) != INVALID_OBJECT) + if (verifyable_object_isvalid (mutex, PTHREAD_MUTEX_MAGIC, PTHREAD_MUTEX_INITIALIZER) == VALID_OBJECT) return EBUSY; *mutex = new pthread_mutex (attr ? (*attr) : NULL); |