Skip to content

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

Oops, was starting one too many workers

上级 e8b5d13d
隐藏空白字符变更
内嵌 并排
正在显示 包含 8 行增加 和 4 行删除
include/uwq.hh
浏览文件 @ 6fb6add0
...@@ -6,6 +6,8 @@ struct padded_length { ...@@ -6,6 +6,8 @@ struct padded_length {
}; };
#if defined (XV6_KERNEL) #if defined (XV6_KERNEL)
#define NWORKERS (NCPU-1)
struct uwq; struct uwq;
struct uwq_worker { struct uwq_worker {
......
include/wquser.hh
浏览文件 @ 6fb6add0
...@@ -72,6 +72,8 @@ initworker(void) ...@@ -72,6 +72,8 @@ initworker(void)
int id; int id;
forkt_setup(0); forkt_setup(0);
id = nextid++; id = nextid++;
if (id >= NCPU)
die("initworker: to man IDs");
pthread_setspecific(idkey, (void*)(u64)id); pthread_setspecific(idkey, (void*)(u64)id);
while (1) { while (1) {
if (!wq_trywork()) if (!wq_trywork())
...@@ -86,7 +88,8 @@ wqarch_init(void) ...@@ -86,7 +88,8 @@ wqarch_init(void)
if (pthread_key_create(&idkey, 0)) if (pthread_key_create(&idkey, 0))
die("wqarch_init: pthread_key_create"); die("wqarch_init: pthread_key_create");
pthread_setspecific(idkey, 0); int id = nextid++;
pthread_setspecific(idkey, (void*)(u64)id);
} }
static inline void static inline void
......
kernel/uwq.cc
浏览文件 @ 6fb6add0
...@@ -175,7 +175,7 @@ uwq::trywork(void) ...@@ -175,7 +175,7 @@ uwq::trywork(void)
return false; return false;
int slot = -1; int slot = -1;
for (int i = 0; i < NCPU; i++) { for (int i = 0; i < NWORKERS; i++) {
if (worker_[i] == nullptr) { if (worker_[i] == nullptr) {
if (slot == -1) if (slot == -1)
slot = i; slot = i;
...@@ -189,7 +189,6 @@ uwq::trywork(void) ...@@ -189,7 +189,6 @@ uwq::trywork(void)
scoped_acquire lock1(&w->lock_); scoped_acquire lock1(&w->lock_);
proc* p = w->proc_; proc* p = w->proc_;
cprintf("uwq::trywork: untested\n");
acquire(&p->lock); acquire(&p->lock);
p->cpuid = mycpuid(); p->cpuid = mycpuid();
release(&p->lock); release(&p->lock);
...@@ -229,7 +228,7 @@ uwq::finish(void) ...@@ -229,7 +228,7 @@ uwq::finish(void)
bool gcnow = true; bool gcnow = true;
scoped_acquire lock0(&lock_); scoped_acquire lock0(&lock_);
for (int i = 0; i < NCPU; i++) { for (int i = 0; i < NWORKERS; i++) {
if (worker_[i] != nullptr) { if (worker_[i] != nullptr) {
uwq_worker* w = worker_[i]; uwq_worker* w = worker_[i];
gcnow = false; gcnow = false;
......
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论