Skip to content

X
xv6-public
提交 a7d18bb6 创建 作者: rsc's avatar rsc
浏览文件
操作

comment tweaks; more informative process list

上级 7366e042
显示空白字符变更
内嵌 并排
正在显示 包含 17 行增加 和 3 行删除
proc.c
浏览文件 @ a7d18bb6
...@@ -163,7 +163,7 @@ copyproc(struct proc *p) ...@@ -163,7 +163,7 @@ copyproc(struct proc *p)
// - choose a process to run // - choose a process to run
// - longjmp to start running that process // - longjmp to start running that process
// - eventually that process transfers control back // - eventually that process transfers control back
// via longjmp back to the top of scheduler. // via longjmp back to the scheduler.
void void
scheduler(void) scheduler(void)
{ {
...@@ -229,7 +229,7 @@ yield(void) ...@@ -229,7 +229,7 @@ yield(void)
} }
// A fork child's very first scheduling by scheduler() // A fork child's very first scheduling by scheduler()
// will longjmp here. "return" to user space. // will longjmp here. "Return" to user space.
void void
forkret(void) forkret(void)
{ {
...@@ -390,6 +390,7 @@ proc_wait(void) ...@@ -390,6 +390,7 @@ proc_wait(void)
p->state = UNUSED; p->state = UNUSED;
p->pid = 0; p->pid = 0;
p->ppid = 0; p->ppid = 0;
p->name[0] = 0;
release(&proc_table_lock); release(&proc_table_lock);
return pid; return pid;
} }
...@@ -414,14 +415,27 @@ proc_wait(void) ...@@ -414,14 +415,27 @@ proc_wait(void)
void void
procdump(void) procdump(void)
{ {
static char *states[] = {
"unused",
"embryo",
"sleep ",
"runble",
"run ",
"zombie"
};
int i; int i;
struct proc *p; struct proc *p;
char *state;
for(i = 0; i < NPROC; i++) { for(i = 0; i < NPROC; i++) {
p = &proc[i]; p = &proc[i];
if(p->state == UNUSED) if(p->state == UNUSED)
continue; continue;
cprintf("%d %d %p\n", p->pid, p->state); if(p->state < 0 || p->state > ZOMBIE)
state = "???";
else
state = states[p->state];
cprintf("%d %s %s\n", p->pid, state, p->name);
} }
} }
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论