Date: Mon, 17 Dec 2012 11:12:10 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r244355 - projects/calloutng/sys/kern Message-ID: <201212171112.qBHBCACx075417@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Mon Dec 17 11:12:09 2012 New Revision: 244355 URL: http://svnweb.freebsd.org/changeset/base/244355 Log: Make loadavg calculation callout direct. There are several reasons for it: - it is very simple and doesn't worth context switch to SWI; - since SWI is no longer used here, we can remove twelve years old hack, excluding this SWI from from the loadavg statistics; - it fixes problem when eventtimer (HPET) shares interrupt with some other device, and that interrupt thread counted as permanent loadavg of 1; now loadavg accounted before that interrupt thread is scheduled. Modified: projects/calloutng/sys/kern/kern_intr.c projects/calloutng/sys/kern/kern_synch.c Modified: projects/calloutng/sys/kern/kern_intr.c ============================================================================== --- projects/calloutng/sys/kern/kern_intr.c Mon Dec 17 11:00:03 2012 (r244354) +++ projects/calloutng/sys/kern/kern_intr.c Mon Dec 17 11:12:09 2012 (r244355) @@ -1103,7 +1103,6 @@ int swi_add(struct intr_event **eventp, const char *name, driver_intr_t handler, void *arg, int pri, enum intr_type flags, void **cookiep) { - struct thread *td; struct intr_event *ie; int error; @@ -1125,15 +1124,7 @@ swi_add(struct intr_event **eventp, cons } error = intr_event_add_handler(ie, name, NULL, handler, arg, PI_SWI(pri), flags, cookiep); - if (error) - return (error); - if (pri == SWI_CLOCK) { - td = ie->ie_thread->it_thread; - thread_lock(td); - td->td_flags |= TDF_NOLOAD; - thread_unlock(td); - } - return (0); + return (error); } /* Modified: projects/calloutng/sys/kern/kern_synch.c ============================================================================== --- projects/calloutng/sys/kern/kern_synch.c Mon Dec 17 11:00:03 2012 (r244354) +++ projects/calloutng/sys/kern/kern_synch.c Mon Dec 17 11:12:09 2012 (r244355) @@ -573,8 +573,9 @@ loadav(void *arg) * random variation to avoid synchronisation with processes that * run at regular intervals. */ - callout_reset(&loadav_callout, hz * 4 + (int)(random() % (hz * 2 + 1)), - loadav, NULL); + callout_reset_flags(&loadav_callout, + hz * 4 + (int)(random() % (hz * 2 + 1)), + loadav, NULL, C_DIRECT_EXEC); } /* ARGSUSED */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212171112.qBHBCACx075417>