Skip to content

X
xv6-public
提交 3eb536c5 创建 作者: Frans Kaashoek's avatar Frans Kaashoek
浏览文件
操作

remove print statements

上级 5c9fbe15
隐藏空白字符变更
内嵌 并排
正在显示 包含 5 行增加 和 18 行删除
condvar.c
浏览文件 @ 3eb536c5
...@@ -26,8 +26,6 @@ cv_sleep(struct condvar *cv, struct spinlock *lk) ...@@ -26,8 +26,6 @@ cv_sleep(struct condvar *cv, struct spinlock *lk)
// Must acquire cv_lock to avoid sleep/wakeup race // Must acquire cv_lock to avoid sleep/wakeup race
acquire(&cv->lock); acquire(&cv->lock);
cprintf("cv_sleep: 0x%x %s\n", cv, cv->lock.name);
release(lk); release(lk);
if (cv->waiters != 0) if (cv->waiters != 0)
...@@ -53,7 +51,6 @@ cv_sleep(struct condvar *cv, struct spinlock *lk) ...@@ -53,7 +51,6 @@ cv_sleep(struct condvar *cv, struct spinlock *lk)
cv->waiters = 0; cv->waiters = 0;
// Reacquire original lock. // Reacquire original lock.
cprintf("acquire %s\n", lk->name);
acquire(lk); acquire(lk);
release(&cv->lock); release(&cv->lock);
...@@ -64,7 +61,6 @@ cv_wakeup(struct condvar *cv) ...@@ -64,7 +61,6 @@ cv_wakeup(struct condvar *cv)
{ {
acquire(&cv->lock); acquire(&cv->lock);
if (cv->waiters != 0) { if (cv->waiters != 0) {
cprintf("wakeup 0x%x %d\n", cv, cv->waiters->pid);
addrun(cv->waiters); addrun(cv->waiters);
} }
release(&cv->lock); release(&cv->lock);
......
exec.c
浏览文件 @ 3eb536c5
...@@ -20,8 +20,6 @@ exec(char *path, char **argv) ...@@ -20,8 +20,6 @@ exec(char *path, char **argv)
struct proghdr ph; struct proghdr ph;
pde_t *pgdir, *oldpgdir; pde_t *pgdir, *oldpgdir;
cprintf("%d: exec %s\n", cpunum(), path);
if((ip = namei(path)) == 0) if((ip = namei(path)) == 0)
return -1; return -1;
ilock(ip); ilock(ip);
......
param.h
浏览文件 @ 3eb536c5
#define NPROC 64 // maximum number of processes #define NPROC 64 // maximum number of processes
#define KSTACKSIZE 4096 // size of per-process kernel stack #define KSTACKSIZE 4096 // size of per-process kernel stack
#define NCPU 2 // maximum number of CPUs #define NCPU 8 // maximum number of CPUs
#define NOFILE 16 // open files per process #define NOFILE 16 // open files per process
#define NFILE 100 // open files per system #define NFILE 100 // open files per system
#define NBUF 10 // size of disk block cache #define NBUF 10 // size of disk block cache
......
proc.c
浏览文件 @ 3eb536c5
...@@ -29,7 +29,7 @@ pinit(void) ...@@ -29,7 +29,7 @@ pinit(void)
for (i = 0; i < NPROC; i++) { for (i = 0; i < NPROC; i++) {
initlock(&ptables[c].proc[i].lock, ptables[c].proc[i].name); initlock(&ptables[c].proc[i].lock, ptables[c].proc[i].name);
initcondvar(&ptables[c].proc[i].cv, ptables[c].proc[i].name); // XXX cv_init initcondvar(&ptables[c].proc[i].cv, ptables[c].proc[i].name);
} }
runqs[c].name[0] = (char) (c + '0'); runqs[c].name[0] = (char) (c + '0');
...@@ -89,7 +89,6 @@ static void ...@@ -89,7 +89,6 @@ static void
addrun1(struct runq *rq, struct proc *p) addrun1(struct runq *rq, struct proc *p)
{ {
struct proc *q; struct proc *q;
cprintf("%d: add to run %d\n", cpu->id, p->pid);
SLIST_FOREACH(q, &rq->runq, run_next) { SLIST_FOREACH(q, &rq->runq, run_next) {
if (q == p) { if (q == p) {
cprintf("allready on q\n"); cprintf("allready on q\n");
...@@ -105,7 +104,7 @@ void ...@@ -105,7 +104,7 @@ void
addrun(struct proc *p) addrun(struct proc *p)
{ {
acquire(&runq->lock); acquire(&runq->lock);
cprintf("%d: addrun %d\n", cpunum(), p->pid); // cprintf("%d: addrun %d\n", cpunum(), p->pid);
addrun1(runq, p); addrun1(runq, p);
release(&runq->lock); release(&runq->lock);
} }
...@@ -126,7 +125,7 @@ void ...@@ -126,7 +125,7 @@ void
delrun(struct proc *p) delrun(struct proc *p)
{ {
acquire(&runq->lock); acquire(&runq->lock);
cprintf("%d: delrun %d\n", cpunum(), p->pid); // cprintf("%d: delrun %d\n", cpunum(), p->pid);
delrun1(runq, p); delrun1(runq, p);
release(&runq->lock); release(&runq->lock);
} }
...@@ -188,8 +187,6 @@ fork(void) ...@@ -188,8 +187,6 @@ fork(void)
int i, pid; int i, pid;
struct proc *np; struct proc *np;
cprintf("%d: fork\n", cpunum());
// Allocate process. // Allocate process.
if((np = allocproc()) == 0) if((np = allocproc()) == 0)
return -1; return -1;
...@@ -245,8 +242,6 @@ exit(void) ...@@ -245,8 +242,6 @@ exit(void)
iput(proc->cwd); iput(proc->cwd);
proc->cwd = 0; proc->cwd = 0;
cprintf("%d: exit %s(%d)\n", cpunum(), proc->name, proc->pid);
// Pass abandoned children to init. // Pass abandoned children to init.
wakeupinit = 0; wakeupinit = 0;
SLIST_FOREACH_SAFE(p, &proc->childq, child_next, np) { SLIST_FOREACH_SAFE(p, &proc->childq, child_next, np) {
...@@ -283,8 +278,6 @@ wait(void) ...@@ -283,8 +278,6 @@ wait(void)
struct proc *p, *np; struct proc *p, *np;
int havekids, pid; int havekids, pid;
cprintf("wait %d\n", proc->pid);
for(;;){ for(;;){
// Scan children for ZOMBIEs // Scan children for ZOMBIEs
havekids = 0; havekids = 0;
...@@ -384,7 +377,7 @@ scheduler(void) ...@@ -384,7 +377,7 @@ scheduler(void)
proc = p; proc = p;
switchuvm(p); switchuvm(p);
p->state = RUNNING; p->state = RUNNING;
cprintf("%d: running %d\n", cpu->id, p->pid); // cprintf("%d: running %d\n", cpu->id, p->pid);
swtch(&cpu->scheduler, proc->context); swtch(&cpu->scheduler, proc->context);
switchkvm(); switchkvm();
......
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论