svn commit: r254693 - in stable/8/sys: gdb kern sys vm
Andriy Gapon
avg at FreeBSD.org
Fri Aug 23 13:22:16 UTC 2013
Author: avg
Date: Fri Aug 23 13:22:14 2013
New Revision: 254693
URL: http://svnweb.freebsd.org/changeset/base/254693
Log:
MFC r253604: rename scheduler->swapper and SI_SUB_RUN_SCHEDULER->SI_SUB_LAST
Modified:
stable/8/sys/gdb/gdb_cons.c
stable/8/sys/kern/init_main.c
stable/8/sys/kern/kern_ntptime.c
stable/8/sys/kern/sched_4bsd.c
stable/8/sys/sys/kernel.h
stable/8/sys/sys/sched.h
stable/8/sys/vm/vm.h
stable/8/sys/vm/vm_glue.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/gdb/ (props changed)
stable/8/sys/kern/ (props changed)
stable/8/sys/sys/ (props changed)
stable/8/sys/vm/ (props changed)
Modified: stable/8/sys/gdb/gdb_cons.c
==============================================================================
--- stable/8/sys/gdb/gdb_cons.c Fri Aug 23 13:20:11 2013 (r254692)
+++ stable/8/sys/gdb/gdb_cons.c Fri Aug 23 13:22:14 2013 (r254693)
@@ -126,7 +126,7 @@ oktousecallout(void *data __unused)
{
calloutok = 1;
}
-SYSINIT(gdbhack, SI_SUB_RUN_SCHEDULER, SI_ORDER_MIDDLE, oktousecallout, NULL);
+SYSINIT(gdbhack, SI_SUB_LAST, SI_ORDER_MIDDLE, oktousecallout, NULL);
static void
gdb_cnputc(struct consdev *cp, int c)
Modified: stable/8/sys/kern/init_main.c
==============================================================================
--- stable/8/sys/kern/init_main.c Fri Aug 23 13:20:11 2013 (r254692)
+++ stable/8/sys/kern/init_main.c Fri Aug 23 13:22:14 2013 (r254693)
@@ -214,9 +214,6 @@ restart:
/*
* Traverse the (now) ordered list of system initialization tasks.
* Perform each task, and continue on to the next task.
- *
- * The last item on the list is expected to be the scheduler,
- * which will not return.
*/
for (sipp = sysinit; sipp < sysinit_end; sipp++) {
@@ -273,7 +270,13 @@ restart:
}
}
- panic("Shouldn't get here!");
+ mtx_assert(&Giant, MA_OWNED | MA_NOTRECURSED);
+ mtx_unlock(&Giant);
+
+ /*
+ * Now hand over this thread to swapper.
+ */
+ swapper();
/* NOTREACHED*/
}
@@ -316,7 +319,7 @@ static char wit_warn[] =
"WARNING: WITNESS option enabled, expect reduced performance.\n";
SYSINIT(witwarn, SI_SUB_COPYRIGHT, SI_ORDER_THIRD + 1,
print_caddr_t, wit_warn);
-SYSINIT(witwarn2, SI_SUB_RUN_SCHEDULER, SI_ORDER_THIRD + 1,
+SYSINIT(witwarn2, SI_SUB_LAST, SI_ORDER_THIRD + 1,
print_caddr_t, wit_warn);
#endif
@@ -325,7 +328,7 @@ static char diag_warn[] =
"WARNING: DIAGNOSTIC option enabled, expect reduced performance.\n";
SYSINIT(diagwarn, SI_SUB_COPYRIGHT, SI_ORDER_THIRD + 2,
print_caddr_t, diag_warn);
-SYSINIT(diagwarn2, SI_SUB_RUN_SCHEDULER, SI_ORDER_THIRD + 2,
+SYSINIT(diagwarn2, SI_SUB_LAST, SI_ORDER_THIRD + 2,
print_caddr_t, diag_warn);
#endif
Modified: stable/8/sys/kern/kern_ntptime.c
==============================================================================
--- stable/8/sys/kern/kern_ntptime.c Fri Aug 23 13:20:11 2013 (r254692)
+++ stable/8/sys/kern/kern_ntptime.c Fri Aug 23 13:22:14 2013 (r254693)
@@ -1035,5 +1035,5 @@ start_periodic_resettodr(void *arg __unu
periodic_resettodr, NULL);
}
-SYSINIT(periodic_resettodr, SI_SUB_RUN_SCHEDULER, SI_ORDER_MIDDLE,
+SYSINIT(periodic_resettodr, SI_SUB_LAST, SI_ORDER_MIDDLE,
start_periodic_resettodr, NULL);
Modified: stable/8/sys/kern/sched_4bsd.c
==============================================================================
--- stable/8/sys/kern/sched_4bsd.c Fri Aug 23 13:20:11 2013 (r254692)
+++ stable/8/sys/kern/sched_4bsd.c Fri Aug 23 13:22:14 2013 (r254693)
@@ -143,7 +143,7 @@ static struct kproc_desc sched_kp = {
schedcpu_thread,
NULL
};
-SYSINIT(schedcpu, SI_SUB_RUN_SCHEDULER, SI_ORDER_FIRST, kproc_start,
+SYSINIT(schedcpu, SI_SUB_LAST, SI_ORDER_FIRST, kproc_start,
&sched_kp);
SYSINIT(sched_setup, SI_SUB_RUN_QUEUE, SI_ORDER_FIRST, sched_setup, NULL);
Modified: stable/8/sys/sys/kernel.h
==============================================================================
--- stable/8/sys/sys/kernel.h Fri Aug 23 13:20:11 2013 (r254692)
+++ stable/8/sys/sys/kernel.h Fri Aug 23 13:22:14 2013 (r254693)
@@ -79,7 +79,7 @@ extern volatile int ticks;
* enumeration values are explicit rather than implicit to provide
* for binary compatibility with inserted elements.
*
- * The SI_SUB_RUN_SCHEDULER value must have the highest lexical value.
+ * The SI_SUB_LAST value must have the highest lexical value.
*
* The SI_SUB_SWAP values represent a value used by
* the BSD 4.4Lite but not by FreeBSD; it is maintained in dependent
@@ -169,7 +169,7 @@ enum sysinit_sub_id {
SI_SUB_KTHREAD_UPDATE = 0xec00000, /* update daemon*/
SI_SUB_KTHREAD_IDLE = 0xee00000, /* idle procs*/
SI_SUB_SMP = 0xf000000, /* start the APs*/
- SI_SUB_RUN_SCHEDULER = 0xfffffff /* scheduler*/
+ SI_SUB_LAST = 0xfffffff /* final initialization */
};
Modified: stable/8/sys/sys/sched.h
==============================================================================
--- stable/8/sys/sys/sched.h Fri Aug 23 13:20:11 2013 (r254692)
+++ stable/8/sys/sys/sched.h Fri Aug 23 13:22:14 2013 (r254693)
@@ -176,7 +176,7 @@ static void name ## _add_proc(void *dumm
#name, CTLTYPE_LONG|CTLFLAG_RD|CTLFLAG_MPSAFE, \
ptr, 0, sysctl_dpcpu_long, "LU", descr); \
} \
-SYSINIT(name, SI_SUB_RUN_SCHEDULER, SI_ORDER_MIDDLE, name ## _add_proc, NULL);
+SYSINIT(name, SI_SUB_LAST, SI_ORDER_MIDDLE, name ## _add_proc, NULL);
#define SCHED_STAT_DEFINE(name, descr) \
DPCPU_DEFINE(unsigned long, name); \
Modified: stable/8/sys/vm/vm.h
==============================================================================
--- stable/8/sys/vm/vm.h Fri Aug 23 13:20:11 2013 (r254692)
+++ stable/8/sys/vm/vm.h Fri Aug 23 13:22:14 2013 (r254693)
@@ -147,6 +147,7 @@ int swap_reserve_by_uid(vm_ooffset_t inc
void swap_reserve_force(vm_ooffset_t incr);
void swap_release(vm_ooffset_t decr);
void swap_release_by_uid(vm_ooffset_t decr, struct uidinfo *uip);
+void swapper(void);
#endif /* VM_H */
Modified: stable/8/sys/vm/vm_glue.c
==============================================================================
--- stable/8/sys/vm/vm_glue.c Fri Aug 23 13:20:11 2013 (r254692)
+++ stable/8/sys/vm/vm_glue.c Fri Aug 23 13:22:14 2013 (r254693)
@@ -104,14 +104,6 @@ extern int maxslp;
static void vm_init_limits(void *);
SYSINIT(vm_limits, SI_SUB_VM_CONF, SI_ORDER_FIRST, vm_init_limits, &proc0);
-/*
- * THIS MUST BE THE LAST INITIALIZATION ITEM!!!
- *
- * Note: run scheduling should be divorced from the vm system.
- */
-static void scheduler(void *);
-SYSINIT(scheduler, SI_SUB_RUN_SCHEDULER, SI_ORDER_ANY, scheduler, NULL);
-
#ifndef NO_SWAPPING
static int swapout(struct proc *);
static void swapclear(struct proc *);
@@ -731,10 +723,8 @@ faultin(p)
*
* Giant is held on entry.
*/
-/* ARGSUSED*/
-static void
-scheduler(dummy)
- void *dummy;
+void
+swapper(void)
{
struct proc *p;
struct thread *td;
@@ -744,9 +734,6 @@ scheduler(dummy)
int ppri;
int pri;
- mtx_assert(&Giant, MA_OWNED | MA_NOTRECURSED);
- mtx_unlock(&Giant);
-
loop:
if (vm_page_count_min()) {
VM_WAIT;
@@ -797,7 +784,7 @@ loop:
* Nothing to do, back to sleep.
*/
if ((p = pp) == NULL) {
- tsleep(&proc0, PVM, "sched", maxslp * hz / 2);
+ tsleep(&proc0, PVM, "swapin", maxslp * hz / 2);
goto loop;
}
PROC_LOCK(p);
More information about the svn-src-all
mailing list