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

- Slightly restructure acquire() so I can add more ktr information and

Browse Source 
an assert to help find two strange bugs.
 - Remove some nearby spls.
This commit is contained in:
Jeff Roberson 2005-04-03 11:49:02 +00:00
parent 41d4783d49
commit 20728d8f63
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=144589
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
sys/kern/kern_lock.c
View File

@ -116,35 +116,31 @@ static int
acquire(struct lock **lkpp, int extflags, int wanted)
{
struct lock *lkp = *lkpp;
int s, error;
int error;
CTR3(KTR_LOCK,
"acquire(): lkp == %p, extflags == 0x%x, wanted == 0x%x",
lkp, extflags, wanted);
if ((extflags & LK_NOWAIT) && (lkp->lk_flags & wanted)) {
if ((extflags & LK_NOWAIT) && (lkp->lk_flags & wanted))
return EBUSY;
}
s = splhigh();
error = 0;
while ((lkp->lk_flags & wanted) != 0) {
CTR2(KTR_LOCK,
"acquire(): lkp == %p, lk_flags == 0x%x sleeping",
lkp, lkp->lk_flags);
lkp->lk_flags |= LK_WAIT_NONZERO;
lkp->lk_waitcount++;
error = msleep(lkp, lkp->lk_interlock, lkp->lk_prio,
lkp->lk_wmesg,
((extflags & LK_TIMELOCK) ? lkp->lk_timo : 0));
if (lkp->lk_waitcount == 1) {
lkp->lk_waitcount--;
if (lkp->lk_waitcount == 0)
lkp->lk_flags &= ~LK_WAIT_NONZERO;
lkp->lk_waitcount = 0;
} else {
lkp->lk_waitcount--;
}
if (error) {
splx(s);
return error;
}
if (error)
break;
if (extflags & LK_SLEEPFAIL) {
splx(s);
return ENOLCK;
error = ENOLCK;
break;
}
if (lkp->lk_newlock != NULL) {
mtx_lock(lkp->lk_newlock->lk_interlock);
@ -154,8 +150,8 @@ acquire(struct lock **lkpp, int extflags, int wanted)
*lkpp = lkp = lkp->lk_newlock;
}
}
splx(s);
return 0;
mtx_assert(lkp->lk_interlock, MA_OWNED);
return (error);
}
/*