Skip to content

X
xv6-public
提交 cd61c6de 创建 作者: Robert Morris's avatar Robert Morris
浏览文件
操作

Merge branch 'scale' of git+ssh://pdos.csail.mit.edu/home/am0/6.828/xv6 into scale

上级 8cb44655 326974a8
隐藏空白字符变更
内嵌 并排
正在显示 包含 19 行增加 和 45 行删除
proc.c
浏览文件 @ cd61c6de
......@@ -9,7 +9,6 @@
#include "proc.h"
#include "xv6-mtrace.h"
struct ptable ptables[NCPU];
struct runq runqs[NCPU];
int idle[NCPU];
static struct proc *initproc;
......@@ -28,13 +27,7 @@ pinit(void)
panic("pinit");
for (c = 0; c < NCPU; c++) {
idle[c] = 1;
ptables[c].nextpid = (c << 16) | (1);
ptables[c].name[0] = (char) (c + '0');
safestrcpy(ptables[c].name+1, "ptable", MAXNAME-1);
initlock(&ptables[c].lock, ptables[c].name);
runqs[c].name[0] = (char) (c + '0');
safestrcpy(runqs[c].name+1, "runq", MAXNAME-1);
initlock(&runqs[c].lock, runqs[c].name);
......@@ -61,7 +54,6 @@ allocproc(void)
initcondvar(&p->cv, "proc");
p->state = EMBRYO;
// p->pid = ptable->nextpid++;
p->pid = ns_allockey(nspid);
if (ns_insert(nspid, p->pid, (void *) p) < 0)
panic("allocproc: ns_insert");
......@@ -487,9 +479,7 @@ scheduler(void)
struct proc *p;
int pid;
acquire(&ptable->lock);
pid = ptable->nextpid++;
release(&ptable->lock);
pid = ns_allockey(nspid);
// Enabling mtrace calls in scheduler generates many mtrace_call_entrys.
// mtrace_call_set(1, cpunum());
......
proc.h
浏览文件 @ cd61c6de
......@@ -37,7 +37,6 @@ struct vmnode {
uint npages;
char *page[128];
uint ref;
uint alloc; // in use?
enum vmntype type;
struct inode *ip;
uint offset;
......@@ -110,7 +109,6 @@ struct cpu {
// Cpu-local storage variables; see below
struct cpu *cpu;
struct proc *proc; // The currently-running process.
struct ptable *ptable; // The per-core proc table
struct kmem *kmem; // The per-core memory table
struct runq *runq; // The per-core runq
};
......@@ -121,20 +119,12 @@ struct runq {
STAILQ_HEAD(runlist, proc) runq;
};
struct ptable {
char name[MAXNAME];
struct spinlock lock;
struct proc *runq;
int nextpid;
};
struct condtab {
char name[MAXNAME];
struct spinlock lock;
struct condvar condtab[NPROC];
};
extern struct ptable ptables[NCPU];
extern struct cpu cpus[NCPU];
extern struct runq runqs[NCPU];
extern struct condtab condtabs[NCPU];
......@@ -150,6 +140,5 @@ extern int ncpu;
// in thread libraries such as Linux pthreads.
extern struct cpu *cpu __asm("%gs:0"); // &cpus[cpunum()]
extern struct proc *proc __asm("%gs:4"); // cpus[cpunum()].proc
extern struct ptable *ptable __asm("%gs:8"); // &ptables[cpunum()]
extern struct kmem *kmem __asm("%gs:12"); // &kmems[cpunum()]
extern struct runq *runq __asm("%gs:16"); // &runqs[cpunum()]
extern struct kmem *kmem __asm("%gs:8"); // &kmems[cpunum()]
extern struct runq *runq __asm("%gs:12"); // &runqs[cpunum()]
vm.c
浏览文件 @ cd61c6de
......@@ -31,8 +31,8 @@ seginit(void)
c->gdt[SEG_UCODE] = SEG(STA_X|STA_R, 0, 0xffffffff, DPL_USER);
c->gdt[SEG_UDATA] = SEG(STA_W, 0, 0xffffffff, DPL_USER);
// Map cpu, curproc, ptable, kmem, runq
c->gdt[SEG_KCPU] = SEG(STA_W, &c->cpu, 20, 0);
// Map cpu, curproc, kmem, runq
c->gdt[SEG_KCPU] = SEG(STA_W, &c->cpu, 16, 0);
lgdt(c->gdt, sizeof(c->gdt));
loadgs(SEG_KCPU << 3);
......@@ -40,7 +40,6 @@ seginit(void)
// Initialize cpu-local storage.
cpu = c;
proc = 0;
ptable = &ptables[cpunum()];
kmem = &kmems[cpunum()];
runq = &runqs[cpunum()];
}
......@@ -259,22 +258,19 @@ struct {
struct vmnode *
vmn_alloc(uint npg, uint type)
{
for(uint i = 0; i < NELEM(vmnodes.n); i++) {
struct vmnode *n = &vmnodes.n[i];
if(n->alloc == 0 && __sync_bool_compare_and_swap(&n->alloc, 0, 1)) {
if(npg > NELEM(n->page)) {
panic("vmnode too big\n");
}
for (uint i = 0; i < NELEM(n->page); i++)
n->page[i] = 0;
n->npages = npg;
n->ref = 0;
n->ip = 0;
n->type = type;
return n;
}
struct vmnode *n = kmalloc(sizeof(struct vmnode));
if (n == 0)
panic("out of vmnodes");
if(npg > NELEM(n->page)) {
panic("vmnode too big\n");
}
panic("out of vmnodes");
for (uint i = 0; i < NELEM(n->page); i++)
n->page[i] = 0;
n->npages = npg;
n->ref = 0;
n->ip = 0;
n->type = type;
return n;
}
static int
......@@ -311,7 +307,7 @@ vmn_free(struct vmnode *n)
if (n->ip)
iput(n->ip);
n->ip = 0;
n->alloc = 0;
kmfree(n);
}
void
......@@ -449,8 +445,7 @@ vmap_remove(struct vmap *m, uint va_start, uint len)
cprintf("vmap_remove: partial unmap unsupported\n");
return -1;
}
__sync_fetch_and_sub(&m->e[i].n->ref, 1); // XXX shouldn't use vmn_decref?
vmn_decref(m->e[i].n);
m->e[i].n = 0;
}
}
......
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论