upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-11 09:41:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename tsleep to msleep and add a mutex argument, which is

Browse source 
released before sleeping and re-acquired before msleep
returns.  A compatibility cpp macro has been provided for
tsleep to avoid changing all occurences of it in the kernel.

Remove an assertion that the Giant mutex be held before
calling tsleep or asleep.

This is intended to serve the same purpose as condition
variables, but does not preclude their addition in the
future.

Approved by:	jasone
Obtained from:	BSD/OS
This commit is contained in:
Jake Burkholder 2000-09-11 00:20:02 +00:00
parent 62820f25f5
commit 817bf5d4a6
3 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
sys/kern/kern_synch.c
View file

@ -408,10 +408,15 @@ sleepinit(void)
* signal needs to be delivered, ERESTART is returned if the current system
* call should be restarted if possible, and EINTR is returned if the system
* call should be interrupted by the signal (return EINTR).
*
* The mutex argument is exited before the caller is suspended, and
* entered before msleep returns. If priority includes the PDROP
* flag the mutex is not entered before returning.
*/
int
tsleep(ident, priority, wmesg, timo)
msleep(ident, mtx, priority, wmesg, timo)
void *ident;
mtx_t *mtx;
int priority, timo;
const char *wmesg;
{
@ -419,14 +424,22 @@ tsleep(ident, priority, wmesg, timo)
int s, sig, catch = priority & PCATCH;
struct callout_handle thandle;
int rval = 0;
WITNESS_SAVE_DECL(mtx);
#ifdef KTRACE
if (p && KTRPOINT(p, KTR_CSW))
ktrcsw(p->p_tracep, 1, 0);
#endif
mtx_assert(&Giant, MA_OWNED);
WITNESS_SLEEP(0, mtx);
mtx_enter(&sched_lock, MTX_SPIN);
if (mtx != NULL) {
WITNESS_SAVE(mtx, mtx);
mtx_exit(mtx, MTX_DEF | MTX_NOSWITCH);
if (priority & PDROP)
mtx = NULL;
}
s = splhigh();
if (cold || panicstr) {
/*
@ -527,7 +540,10 @@ out:
if (KTRPOINT(p, KTR_CSW))
ktrcsw(p->p_tracep, 0, 0);
#endif
if (mtx != NULL) {
mtx_enter(mtx, MTX_DEF);
WITNESS_RESTORE(mtx, mtx);
}
return (rval);
}
@ -600,7 +616,6 @@ await(int priority, int timo)
int rval = 0;
int s;
mtx_assert(&Giant, MA_OWNED);
mtx_enter(&sched_lock, MTX_SPIN);
s = splhigh();

1
sys/sys/param.h
View file

@ -116,6 +116,7 @@
#define PRIMASK 0x0ff
#define PCATCH 0x100 /* OR'd with pri for tsleep to check signals */
#define PDROP 0x200 /* OR'd with pri to stop re-entry of interlock mutex */
#define NZERO 0 /* default "nice" */

5
sys/sys/systm.h
View file

@ -92,6 +92,7 @@ extern int bootverbose; /* nonzero to print verbose messages */
struct clockframe;
struct malloc_type;
struct mtx;
struct proc;
struct timeval;
struct tty;
@ -318,7 +319,9 @@ extern watchdog_tickle_fn wdog_tickler;
* Common `proc' functions are declared here so that proc.h can be included
* less often.
*/
int tsleep __P((void *chan, int pri, const char *wmesg, int timo));
int msleep __P((void *chan, struct mtx *mtx, int pri, const char *wmesg,
int timo));
#define tsleep(chan, pri, wmesg, timo) msleep(chan, NULL, pri, wmesg, timo)
int asleep __P((void *chan, int pri, const char *wmesg, int timo));
int await __P((int pri, int timo));
void wakeup __P((void *chan));