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

Remove the signal_caught argument from sleepq_timedwait() as it was

Browse Source 
effectively always zero.
This commit is contained in:
John Baldwin 2004-06-28 18:57:06 +00:00
parent 4c0142a129
commit a5471e4ef4
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=131249
4 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/kern/kern_condvar.c
View File

@ -250,7 +250,7 @@ cv_timedwait(struct cv *cvp, struct mtx *mp, int timo)
sleepq_add(sq, cvp, mp, cvp->cv_description, SLEEPQ_CONDVAR);
sleepq_set_timeout(cvp, timo);
rval = sleepq_timedwait(cvp, 0);
rval = sleepq_timedwait(cvp);
#ifdef KTRACE
if (KTRPOINT(td, KTR_CSW))

2
sys/kern/kern_synch.c
View File

@ -236,7 +236,7 @@ msleep(ident, mtx, priority, wmesg, timo)
if (timo && catch)
rval = sleepq_timedwait_sig(ident, sig != 0);
else if (timo)
rval = sleepq_timedwait(ident, sig != 0);
rval = sleepq_timedwait(ident);
else if (catch)
rval = sleepq_wait_sig(ident);
else {

7
sys/kern/subr_sleepqueue.c
View File

@ -499,17 +499,14 @@ sleepq_wait_sig(void *wchan)
* or it times out while waiting.
*/
int
sleepq_timedwait(void *wchan, int signal_caught)
sleepq_timedwait(void *wchan)
{
int rval;
sleepq_switch(wchan);
rval = sleepq_check_timeout();
mtx_unlock_spin(&sched_lock);
if (signal_caught)
return (0);
else
return (rval);
return (rval);
}
/*

2
sys/sys/sleepqueue.h
View File

@ -98,7 +98,7 @@ void sleepq_release(void *);
void sleepq_remove(struct thread *, void *);
void sleepq_signal(void *, int, int);
void sleepq_set_timeout(void *wchan, int timo);
int sleepq_timedwait(void *wchan, int signal_caught);
int sleepq_timedwait(void *wchan);
int sleepq_timedwait_sig(void *wchan, int signal_caught);
void sleepq_wait(void *);
int sleepq_wait_sig(void *wchan);