diff options
| author | Richard PALO <richard@NetBSD.org> | 2016-05-24 15:02:53 +0200 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2016-06-06 08:00:22 -0700 |
| commit | a90d75b828f0c01a350c4ecfc3924fd6456fffaf (patch) | |
| tree | 183d7d361aea6ed3d3e282aaa4e2a4dbb05bcf3b /usr/src/lib/libc | |
| parent | 565657ca18725b8f8dbe5b93704cc1d173be9d65 (diff) | |
| download | illumos-joyent-a90d75b828f0c01a350c4ecfc3924fd6456fffaf.tar.gz | |
6993 DEFAULT_TYPE should be probably be removed from pthread.h
Reviewed by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Robert Mustacchi <rm@joyent.com>
Diffstat (limited to 'usr/src/lib/libc')
| -rw-r--r-- | usr/src/lib/libc/port/threads/pthr_barrier.c | 4 | ||||
| -rw-r--r-- | usr/src/lib/libc/port/threads/pthr_cond.c | 6 | ||||
| -rw-r--r-- | usr/src/lib/libc/port/threads/pthr_mutex.c | 4 | ||||
| -rw-r--r-- | usr/src/lib/libc/port/threads/pthr_rwlock.c | 6 |
4 files changed, 7 insertions, 13 deletions
diff --git a/usr/src/lib/libc/port/threads/pthr_barrier.c b/usr/src/lib/libc/port/threads/pthr_barrier.c index 3a76abb2b8..6f4f75445f 100644 --- a/usr/src/lib/libc/port/threads/pthr_barrier.c +++ b/usr/src/lib/libc/port/threads/pthr_barrier.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include "lint.h" #include "thr_uberdata.h" #include <pthread.h> @@ -94,7 +92,7 @@ pthread_barrier_init(pthread_barrier_t *barrier, int type; if (attr == NULL) - type = DEFAULT_TYPE; + type = PTHREAD_PROCESS_PRIVATE; else if ((ap = attr->__pthread_barrierattrp) != NULL) type = ap->pshared; else diff --git a/usr/src/lib/libc/port/threads/pthr_cond.c b/usr/src/lib/libc/port/threads/pthr_cond.c index b22bc27cf2..22f81af8ff 100644 --- a/usr/src/lib/libc/port/threads/pthr_cond.c +++ b/usr/src/lib/libc/port/threads/pthr_cond.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include "lint.h" #include "thr_uberdata.h" @@ -41,7 +39,7 @@ pthread_condattr_init(pthread_condattr_t *attr) if ((ap = lmalloc(sizeof (cvattr_t))) == NULL) return (ENOMEM); - ap->pshared = DEFAULT_TYPE; + ap->pshared = PTHREAD_PROCESS_PRIVATE; ap->clockid = CLOCK_REALTIME; attr->__pthread_condattrp = ap; return (0); @@ -143,7 +141,7 @@ pthread_cond_init(pthread_cond_t *cond, const pthread_condattr_t *attr) int error; if (attr == NULL) { - type = DEFAULT_TYPE; + type = PTHREAD_PROCESS_PRIVATE; clock_id = CLOCK_REALTIME; } else if ((ap = attr->__pthread_condattrp) != NULL) { type = ap->pshared; diff --git a/usr/src/lib/libc/port/threads/pthr_mutex.c b/usr/src/lib/libc/port/threads/pthr_mutex.c index f8134ef1a4..1f70725677 100644 --- a/usr/src/lib/libc/port/threads/pthr_mutex.c +++ b/usr/src/lib/libc/port/threads/pthr_mutex.c @@ -40,7 +40,7 @@ pthread_mutexattr_init(pthread_mutexattr_t *attr) if ((ap = lmalloc(sizeof (mattr_t))) == NULL) return (ENOMEM); - ap->pshared = DEFAULT_TYPE; + ap->pshared = PTHREAD_PROCESS_PRIVATE; ap->type = PTHREAD_MUTEX_DEFAULT; ap->protocol = PTHREAD_PRIO_NONE; ap->robustness = PTHREAD_MUTEX_STALLED; @@ -222,7 +222,7 @@ pthread_mutex_init(pthread_mutex_t *_RESTRICT_KYWD mutex, if (ap->protocol == PTHREAD_PRIO_PROTECT) prioceiling = ap->prioceiling; } else { - type = DEFAULT_TYPE | PTHREAD_MUTEX_DEFAULT | + type = PTHREAD_PROCESS_PRIVATE | PTHREAD_MUTEX_DEFAULT | PTHREAD_PRIO_NONE | PTHREAD_MUTEX_STALLED; } diff --git a/usr/src/lib/libc/port/threads/pthr_rwlock.c b/usr/src/lib/libc/port/threads/pthr_rwlock.c index 39883d7934..44be459259 100644 --- a/usr/src/lib/libc/port/threads/pthr_rwlock.c +++ b/usr/src/lib/libc/port/threads/pthr_rwlock.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include "lint.h" #include "thr_uberdata.h" @@ -41,7 +39,7 @@ pthread_rwlockattr_init(pthread_rwlockattr_t *attr) if ((ap = lmalloc(sizeof (rwlattr_t))) == NULL) return (ENOMEM); - ap->pshared = DEFAULT_TYPE; + ap->pshared = PTHREAD_PROCESS_PRIVATE; attr->__pthread_rwlockattrp = ap; return (0); } @@ -109,7 +107,7 @@ pthread_rwlock_init(pthread_rwlock_t *_RESTRICT_KYWD rwlock, int type; if (attr == NULL) - type = DEFAULT_TYPE; + type = PTHREAD_PROCESS_PRIVATE; else if ((ap = attr->__pthread_rwlockattrp) != NULL) type = ap->pshared; else |