Basic VM and other minor improvements.
Not complete, probably not fully debugged or optimized.
This commit is contained in:
@@ -6,12 +6,13 @@
|
||||
#include "kernel.h"
|
||||
#include "proc.h"
|
||||
#include "debug.h"
|
||||
#include <limits.h>
|
||||
|
||||
#if DEBUG_TIME_LOCKS /* only include code if enabled */
|
||||
#include <minix/sysutil.h>
|
||||
#include <limits.h>
|
||||
#include <string.h>
|
||||
|
||||
|
||||
/* Data structures to store lock() timing data. */
|
||||
struct lock_timingdata timingdata[TIMING_CATEGORIES];
|
||||
static unsigned long starttimes[TIMING_CATEGORIES][2];
|
||||
|
||||
#define HIGHCOUNT 0
|
||||
@@ -100,69 +101,75 @@ void timer_end(int cat)
|
||||
return;
|
||||
}
|
||||
|
||||
#endif /* DEBUG_TIME_LOCKS */
|
||||
|
||||
#if DEBUG_SCHED_CHECK /* only include code if enabled */
|
||||
|
||||
#define MAX_LOOP (NR_PROCS + NR_TASKS)
|
||||
|
||||
PUBLIC void
|
||||
check_runqueues(char *when)
|
||||
check_runqueues_f(char *file, int line)
|
||||
{
|
||||
int q, l = 0;
|
||||
register struct proc *xp;
|
||||
#define MYPANIC(msg) { \
|
||||
static char buf[100]; \
|
||||
strcpy(buf, file); \
|
||||
strcat(buf, ": "); \
|
||||
util_nstrcat(buf, line);\
|
||||
strcat(buf, ": "); \
|
||||
strcat(buf, msg); \
|
||||
minix_panic(buf, NO_NUM); \
|
||||
}
|
||||
|
||||
for (xp = BEG_PROC_ADDR; xp < END_PROC_ADDR; ++xp) {
|
||||
xp->p_found = 0;
|
||||
if (l++ > MAX_LOOP) { panic("check error", NO_NUM); }
|
||||
if (l++ > MAX_LOOP) { MYPANIC("check error"); }
|
||||
}
|
||||
|
||||
for (q=l=0; q < NR_SCHED_QUEUES; q++) {
|
||||
if (rdy_head[q] && !rdy_tail[q]) {
|
||||
kprintf("head but no tail in %d: %s", q, when);
|
||||
panic("scheduling error", NO_NUM);
|
||||
kprintf("head but no tail in %d\n", q);
|
||||
MYPANIC("scheduling error");
|
||||
}
|
||||
if (!rdy_head[q] && rdy_tail[q]) {
|
||||
kprintf("tail but no head in %d: %s", q, when);
|
||||
panic("scheduling error", NO_NUM);
|
||||
kprintf("tail but no head in %d\n", q);
|
||||
MYPANIC("scheduling error");
|
||||
}
|
||||
if (rdy_tail[q] && rdy_tail[q]->p_nextready != NIL_PROC) {
|
||||
kprintf("tail and tail->next not null in %d: %s", q, when);
|
||||
panic("scheduling error", NO_NUM);
|
||||
kprintf("tail and tail->next not null in %d\n", q);
|
||||
MYPANIC("scheduling error");
|
||||
}
|
||||
for(xp = rdy_head[q]; xp != NIL_PROC; xp = xp->p_nextready) {
|
||||
if (!xp->p_ready) {
|
||||
kprintf("scheduling error: unready on runq %d proc %d: %s\n",
|
||||
q, xp->p_nr, when);
|
||||
panic("found unready process on run queue", NO_NUM);
|
||||
kprintf("scheduling error: unready on runq %d proc %d\n",
|
||||
q, xp->p_nr);
|
||||
MYPANIC("found unready process on run queue");
|
||||
}
|
||||
if (xp->p_priority != q) {
|
||||
kprintf("scheduling error: wrong priority q %d proc %d: %s\n",
|
||||
q, xp->p_nr, when);
|
||||
panic("wrong priority", NO_NUM);
|
||||
kprintf("scheduling error: wrong priority q %d proc %d\n",
|
||||
q, xp->p_nr);
|
||||
MYPANIC("wrong priority");
|
||||
}
|
||||
if (xp->p_found) {
|
||||
kprintf("scheduling error: double sched q %d proc %d: %s\n",
|
||||
q, xp->p_nr, when);
|
||||
panic("proc more than once on scheduling queue", NO_NUM);
|
||||
kprintf("scheduling error: double sched q %d proc %d\n",
|
||||
q, xp->p_nr);
|
||||
MYPANIC("proc more than once on scheduling queue");
|
||||
}
|
||||
xp->p_found = 1;
|
||||
if (xp->p_nextready == NIL_PROC && rdy_tail[q] != xp) {
|
||||
kprintf("sched err: last element not tail q %d proc %d: %s\n",
|
||||
q, xp->p_nr, when);
|
||||
panic("scheduling error", NO_NUM);
|
||||
kprintf("sched err: last element not tail q %d proc %d\n",
|
||||
q, xp->p_nr);
|
||||
MYPANIC("scheduling error");
|
||||
}
|
||||
if (l++ > MAX_LOOP) panic("loop in schedule queue?", NO_NUM);
|
||||
if (l++ > MAX_LOOP) MYPANIC("loop in schedule queue?");
|
||||
}
|
||||
}
|
||||
|
||||
l = 0;
|
||||
for (xp = BEG_PROC_ADDR; xp < END_PROC_ADDR; ++xp) {
|
||||
if (! isemptyp(xp) && xp->p_ready && ! xp->p_found) {
|
||||
kprintf("sched error: ready proc %d not on queue: %s\n",
|
||||
xp->p_nr, when);
|
||||
panic("ready proc not on scheduling queue", NO_NUM);
|
||||
if (l++ > MAX_LOOP) { panic("loop in proc.t?", NO_NUM); }
|
||||
kprintf("sched error: ready proc %d not on queue\n", xp->p_nr);
|
||||
MYPANIC("ready proc not on scheduling queue");
|
||||
if (l++ > MAX_LOOP) { MYPANIC("loop in debug.c?"); }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user