mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-02 08:42:48 +00:00
Code Issues Releases Activity

Remove the use of lbolt from the VFS syncer.

Browse Source 
It seems we only use `lbolt' inside the VFS syncer and the TTY layer
now.  Because I'm planning to replace the TTY layer next month, there's
no reason to keep `lbolt' if it's only used in a single thread inside
the kernel.

Because the syncer code wanted to wake up the syncer thread before the
timeout, it called sleepq_remove(). Because we now just use a condvar(9)
with a timeout value of `hz', we can wake it up using cv_broadcast()
without waking up any unrelated threads.

Reviewed by:	phk
This commit is contained in:
Ed Schouten 2008-07-30 12:39:18 +00:00
parent 911d490140
commit e7ea30e404
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=180995
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/kern/vfs_subr.c
View File

@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <sys/bio.h>
#include <sys/buf.h>
#include <sys/condvar.h>
#include <sys/conf.h>
#include <sys/dirent.h>
#include <sys/event.h>
@ -236,6 +237,7 @@ static struct synclist *syncer_workitem_pending[2];
* rushjob
*/
static struct mtx sync_mtx;
static struct cv sync_wakeup;
#define SYNCER_MAXDELAY 32
static int syncer_maxdelay = SYNCER_MAXDELAY; /* maximum delay time */
@ -326,6 +328,7 @@ vntblinit(void *dummy __unused)
&syncer_mask);
syncer_maxdelay = syncer_mask + 1;
mtx_init(&sync_mtx, "Syncer mtx", NULL, MTX_DEF);
cv_init(&sync_wakeup, "syncer");
}
SYSINIT(vfs, SI_SUB_VFS, SI_ORDER_FIRST, vntblinit, NULL);
@ -1677,7 +1680,6 @@ sched_sync(void)
struct bufobj *bo;
long starttime;
struct thread *td = curthread;
static int dummychan;
int last_work_seen;
int net_worklist_len;
int syncer_final_iter;
@ -1804,10 +1806,10 @@ sched_sync(void)
* filesystem activity.
*/
if (syncer_state != SYNCER_RUNNING)
msleep(&dummychan, &sync_mtx, PPAUSE, "syncfnl",
cv_timedwait(&sync_wakeup, &sync_mtx,
hz / SYNCER_SHUTDOWN_SPEEDUP);
else if (time_uptime == starttime)
msleep(&lbolt, &sync_mtx, PPAUSE, "syncer", 0);
cv_timedwait(&sync_wakeup, &sync_mtx, hz);
}
}
@ -1819,10 +1821,8 @@ sched_sync(void)
int
speedup_syncer(void)
{
struct thread *td;
int ret = 0;
td = FIRST_THREAD_IN_PROC(updateproc);
mtx_lock(&sync_mtx);
if (rushjob < syncdelay / 2) {
rushjob += 1;
@ -1830,7 +1830,7 @@ speedup_syncer(void)
ret = 1;
}
mtx_unlock(&sync_mtx);
sleepq_remove(td, &lbolt);
cv_broadcast(&sync_wakeup);
return (ret);
}
@ -1841,16 +1841,14 @@ speedup_syncer(void)
static void
syncer_shutdown(void *arg, int howto)
{
struct thread *td;
if (howto & RB_NOSYNC)
return;
td = FIRST_THREAD_IN_PROC(updateproc);
mtx_lock(&sync_mtx);
syncer_state = SYNCER_SHUTTING_DOWN;
rushjob = 0;
mtx_unlock(&sync_mtx);
sleepq_remove(td, &lbolt);
cv_broadcast(&sync_wakeup);
kproc_shutdown(arg, howto);
}