d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add key type TYPE_SEM.

Browse Source
This commit is contained in:
David Xu 2010-01-09 06:05:31 +00:00
parent a455039e3a
commit 2c3b3fef36
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=201885
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/kern/kern_umtx.c
View File

@ -59,12 +59,13 @@ __FBSDID("$FreeBSD$");
#endif #endif
#define TYPE_SIMPLE_WAIT 0 #define TYPE_SIMPLE_WAIT 0
#define TYPE_CV 1 #define TYPE_CV (TYPE_SIMPLE_WAIT+1)
#define TYPE_SIMPLE_LOCK 2 #define TYPE_SEM (TYPE_CV+1)
#define TYPE_NORMAL_UMUTEX 3 #define TYPE_SIMPLE_LOCK (TYPE_SEM+1)
#define TYPE_PI_UMUTEX 4 #define TYPE_NORMAL_UMUTEX (TYPE_SIMPLE_LOCK+1)
#define TYPE_PP_UMUTEX 5 #define TYPE_PI_UMUTEX (TYPE_NORMAL_UMUTEX+1)
#define TYPE_RWLOCK 6 #define TYPE_PP_UMUTEX (TYPE_PI_UMUTEX+1)
#define TYPE_RWLOCK (TYPE_PP_UMUTEX+1)
#define _UMUTEX_TRY 1 #define _UMUTEX_TRY 1
#define _UMUTEX_WAIT 2 #define _UMUTEX_WAIT 2
@ -2770,7 +2771,7 @@ do_sem_wait(struct thread *td, struct _usem *sem, struct timespec *timeout)
uq = td->td_umtxq; uq = td->td_umtxq;
flags = fuword32(&sem->_flags); flags = fuword32(&sem->_flags);
error = umtx_key_get(sem, TYPE_CV, GET_SHARE(flags), &uq->uq_key); error = umtx_key_get(sem, TYPE_SEM, GET_SHARE(flags), &uq->uq_key);
if (error != 0) if (error != 0)
return (error); return (error);
umtxq_lock(&uq->uq_key); umtxq_lock(&uq->uq_key);
@ -2845,7 +2846,7 @@ do_sem_wake(struct thread *td, struct _usem *sem)
uint32_t flags; uint32_t flags;
flags = fuword32(&sem->_flags); flags = fuword32(&sem->_flags);
if ((error = umtx_key_get(sem, TYPE_CV, GET_SHARE(flags), &key)) != 0) if ((error = umtx_key_get(sem, TYPE_SEM, GET_SHARE(flags), &key)) != 0)
return (error); return (error);
umtxq_lock(&key); umtxq_lock(&key);
umtxq_busy(&key); umtxq_busy(&key);