Skip to content

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

uwq tweaks

上级 8c6d5d22
显示空白字符变更
内嵌 并排
正在显示 包含 50 行增加 和 39 行删除
include/uwq.hh
浏览文件 @ e8b5d13d
...@@ -9,13 +9,16 @@ struct padded_length { ...@@ -9,13 +9,16 @@ struct padded_length {
struct uwq; struct uwq;
struct uwq_worker { struct uwq_worker {
uwq_worker(uwq*, proc*);
long wait(); long wait();
uwq* uwq; uwq* uwq_;
bool running; proc *proc_;
proc *proc; bool running_;
struct spinlock lock; struct spinlock lock_;
struct condvar cv; struct condvar cv_;
NEW_DELETE_OPS(uwq_worker);
}; };
struct uwq : public referenced, public rcu_freed { struct uwq : public referenced, public rcu_freed {
...@@ -51,7 +54,7 @@ private: ...@@ -51,7 +54,7 @@ private:
uptr ustack_; uptr ustack_;
std::atomic<u64> uref_; std::atomic<u64> uref_;
uwq_worker worker_[NCPU]; uwq_worker* worker_[NCPU];
}; };
int uwq_trywork(void); int uwq_trywork(void);
......
kernel/uwq.cc
浏览文件 @ e8b5d13d
...@@ -65,15 +65,22 @@ sys_wqwait(void) ...@@ -65,15 +65,22 @@ sys_wqwait(void)
// //
// uwq_worker // uwq_worker
// //
uwq_worker::uwq_worker(uwq* u, proc* p)
: uwq_(u), proc_(p), running_(false)
{
initlock(&lock_, "worker_lock", 0);
initcondvar(&cv_, "worker_cv");
}
long long
uwq_worker::wait(void) uwq_worker::wait(void)
{ {
acquire(&lock); acquire(&lock_);
uwq->tryexit(this); uwq_->tryexit(this);
running = false; running_ = false;
cv_sleep(&cv, &lock); cv_sleep(&cv_, &lock_);
uwq->tryexit(this); uwq_->tryexit(this);
release(&lock); release(&lock_);
return 0; return 0;
} }
...@@ -122,15 +129,7 @@ uwq::uwq(vmap* vmap, filetable *ftable, padded_length *len) ...@@ -122,15 +129,7 @@ uwq::uwq(vmap* vmap, filetable *ftable, padded_length *len)
len_[i].v_ = 0; len_[i].v_ = 0;
initlock(&lock_, "uwq_lock", 0); initlock(&lock_, "uwq_lock", 0);
memset(worker_, 0, sizeof(worker_));
// XXX(sbw) move to uwq_worker constructor
for (int i = 0; i < NCPU; i++) {
initlock(&worker_[i].lock, "worker_lock", 0);
initcondvar(&worker_[i].cv, "worker_cv");
worker_[i].uwq = this;
worker_[i].running = false;
worker_[i].proc = nullptr;
}
} }
uwq::~uwq(void) uwq::~uwq(void)
...@@ -147,8 +146,8 @@ uwq::tryexit(uwq_worker *w) ...@@ -147,8 +146,8 @@ uwq::tryexit(uwq_worker *w)
if (ref() == 0) { if (ref() == 0) {
if (--uref_ == 0) if (--uref_ == 0)
gc_delayed(this); gc_delayed(this);
release(&w->lock); release(&w->lock_);
w->proc = nullptr; delete w;
exit(); exit();
} }
} }
...@@ -177,38 +176,46 @@ uwq::trywork(void) ...@@ -177,38 +176,46 @@ uwq::trywork(void)
int slot = -1; int slot = -1;
for (int i = 0; i < NCPU; i++) { for (int i = 0; i < NCPU; i++) {
if (worker_[i].running) if (worker_[i] == nullptr) {
if (slot == -1)
slot = i;
continue;
}
uwq_worker *w = worker_[i];
if (w->running_)
continue; continue;
else if (worker_[i].proc != nullptr) { else {
scoped_acquire lock1(&worker_[i].lock); scoped_acquire lock1(&w->lock_);
proc* p = worker_[i].proc; proc* p = w->proc_;
//cprintf("uwq::trywork: untested\n"); cprintf("uwq::trywork: untested\n");
acquire(&p->lock); acquire(&p->lock);
p->cpuid = mycpuid(); p->cpuid = mycpuid();
release(&p->lock); release(&p->lock);
worker_[i].running = true; w->running_ = true;
cv_wakeup(&worker_[i].cv); cv_wakeup(&w->cv_);
return true; return true;
} else if (slot == -1) {
slot = i;
} }
} }
if (slot != -1) { if (slot != -1) {
proc* p = allocworker(); proc* p = allocworker();
if (p != nullptr) { if (p != nullptr) {
uwq_worker* w = new uwq_worker(this, p);
assert(w != nullptr);
++uref_; ++uref_;
p->worker = &worker_[slot]; p->worker = w;
worker_[slot].proc = p; w->running_ = true;
worker_[slot].running = true;
acquire(&p->lock); acquire(&p->lock);
p->cpuid = mycpuid(); p->cpuid = mycpuid();
addrun(p); addrun(p);
release(&p->lock); release(&p->lock);
worker_[slot] = w;
return true; return true;
} }
} }
...@@ -223,11 +230,12 @@ uwq::finish(void) ...@@ -223,11 +230,12 @@ uwq::finish(void)
scoped_acquire lock0(&lock_); scoped_acquire lock0(&lock_);
for (int i = 0; i < NCPU; i++) { for (int i = 0; i < NCPU; i++) {
if (worker_[i].proc != nullptr) { if (worker_[i] != nullptr) {
uwq_worker* w = worker_[i];
gcnow = false; gcnow = false;
acquire(&worker_[i].lock); acquire(&w->lock_);
cv_wakeup(&worker_[i].cv); cv_wakeup(&w->cv_);
release(&worker_[i].lock); release(&w->lock_);
} }
} }
......
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论