Skip to content

X
xv6-public
提交 c576c80d 创建 作者: Silas Boyd-Wickizer's avatar Silas Boyd-Wickizer
浏览文件
操作

pread syscall scheduling crud

上级 1934d0a3
隐藏空白字符变更
内嵌 并排
正在显示 包含 7 行增加 和 6 行删除
kernlet.c
浏览文件 @ c576c80d
...@@ -32,6 +32,8 @@ pread_work(struct work *w, void *a0, void *a1, void *a2, void *a3) ...@@ -32,6 +32,8 @@ pread_work(struct work *w, void *a0, void *a1, void *a2, void *a3)
ipc->result = r; ipc->result = r;
barrier(); barrier();
ipc->done = 1; ipc->done = 1;
iput(ip);
} }
static struct work * static struct work *
...@@ -63,10 +65,14 @@ sys_kernlet(int fd, size_t count, off_t off) ...@@ -63,10 +65,14 @@ sys_kernlet(int fd, size_t count, off_t off)
if(f->type != FD_INODE) if(f->type != FD_INODE)
return -1; return -1;
fetchadd(&f->ip->ref, 1);
w = pread_allocwork(f->ip, myproc()->vmap->kshared, count, off); w = pread_allocwork(f->ip, myproc()->vmap->kshared, count, off);
if (w == NULL) if (w == NULL) {
iput(f->ip);
return -1; return -1;
}
if (wq_push(w) < 0) { if (wq_push(w) < 0) {
iput(f->ip);
freework(w); freework(w);
return -1; return -1;
} }
......
preadtest.cc
浏览文件 @ c576c80d
...@@ -42,11 +42,6 @@ main(int ac, char **av) ...@@ -42,11 +42,6 @@ main(int ac, char **av)
t0 = rdtsc(); t0 = rdtsc();
for (k = 0; k < FSIZE; k+=PSIZE) { for (k = 0; k < FSIZE; k+=PSIZE) {
kernlet_pread(fd, PSIZE, k); kernlet_pread(fd, PSIZE, k);
while (ipcctl->done == 0)
nop_pause();
die("preadtest: %d\n", (int)ipcctl->result);
for (i = k; i < k+PSIZE; i+=BSIZE) for (i = k; i < k+PSIZE; i+=BSIZE)
if (pread(fd, buf, BSIZE, i) != BSIZE) if (pread(fd, buf, BSIZE, i) != BSIZE)
......
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论