Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

setrq -> setrunqueue, sched -> scheduler

This commit is contained in:
cgd 1994-05-13 00:50:41 +00:00
parent 99e02e0ff9
commit c6abdc2054
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/arch/i386/i386/locore.s
View File

@ -37,7 +37,7 @@
* SUCH DAMAGE.
*
* from: @(#)locore.s 7.3 (Berkeley) 5/13/91
* $Id: locore.s,v 1.66 1994/05/05 08:44:53 mycroft Exp $
* $Id: locore.s,v 1.67 1994/05/13 00:50:41 cgd Exp $
*/
/*
@ -1385,10 +1385,10 @@ ENTRY(longjmp)
.globl _whichqs,_qs,_cnt,_panic
/*
* setrq(struct proc *p);
* setrunqueue(struct proc *p);
* Insert a process on the appropriate queue. Should be called at splclock().
*/
ENTRY(setrq)
ENTRY(setrunqueue)
movl 4(%esp),%eax
#ifdef DIAGNOSTIC
cmpl $0,P_BACK(%eax) # should not be on q already
@ -1412,7 +1412,7 @@ ENTRY(setrq)
1: pushl $2f
call _panic
/*NOTREACHED*/
2: .asciz "setrq"
2: .asciz "setrunqueue"
#endif
/*

6
sys/arch/i386/i386/trap.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)trap.c 7.4 (Berkeley) 5/13/91
* $Id: trap.c,v 1.39 1994/05/07 00:52:44 cgd Exp $
* $Id: trap.c,v 1.40 1994/05/13 00:50:44 cgd Exp $
*/
/*
@ -91,12 +91,12 @@ userret(p, pc, oticks)
* Since we are curproc, a clock interrupt could
* change our priority without changing run queues
* (the running process is not kept on a run queue).
* If this happened after we setrq ourselves but
* If this happened after we setrunqueue ourselves but
* before we swtch()'ed, we might not be on the queue
* indicated by our priority.
*/
(void) splclock();
setrq(p);
setrunqueue(p);
p->p_stats->p_ru.ru_nivcsw++;
swtch();
(void) spl0();

2
sys/kern/init_main.c
View File

@ -1 +1 @@
revision 1.40 intentionally removed
revision 1.41 intentionally removed

2
sys/kern/kern_fork.c
View File

@ -1 +1 @@
revision 1.14 intentionally removed
revision 1.15 intentionally removed

2
sys/kern/kern_synch.c
View File

@ -1 +1 @@
revision 1.22 intentionally removed
revision 1.23 intentionally removed

12
sys/vm/vm_glue.c
View File

@ -308,7 +308,7 @@ int swapdebug = 0;
* clear some space.
*/
void
sched()
scheduler()
{
register struct proc *p;
register int pri;
@ -336,14 +336,14 @@ loop:
}
#ifdef DEBUG
if (swapdebug & SDB_FOLLOW)
printf("sched: running, procp %x pri %d\n", pp, ppri);
printf("scheduler: running, procp %x pri %d\n", pp, ppri);
noswap:
#endif
/*
* Nothing to do, back to sleep
*/
if ((p = pp) == NULL) {
tsleep((caddr_t)&proc0, PVM, "sched", 0);
tsleep((caddr_t)&proc0, PVM, "scheduler", 0);
goto loop;
}
@ -364,7 +364,7 @@ noswap:
vm_map_pageable(kernel_map, addr, addr+size, FALSE);
(void) splclock();
if (p->p_stat == SRUN)
setrq(p);
setrunqueue(p);
p->p_flag |= P_INMEM;
(void) spl0();
p->p_swtime = 0;
@ -376,7 +376,7 @@ noswap:
*/
#ifdef DEBUG
if (swapdebug & SDB_FOLLOW)
printf("sched: no room for pid %d(%s), free %d\n",
printf("scheduler: no room for pid %d(%s), free %d\n",
p->p_pid, p->p_comm, cnt.v_free_count);
#endif
(void) splhigh();
@ -384,7 +384,7 @@ noswap:
(void) spl0();
#ifdef DEBUG
if (swapdebug & SDB_FOLLOW)
printf("sched: room again, free %d\n", cnt.v_free_count);
printf("scheduler: room again, free %d\n", cnt.v_free_count);
#endif
goto loop;
}