Skip to content

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

schedbench tweaks

上级 e855e8e8
隐藏空白字符变更
内嵌 并排
正在显示 包含 11 行增加 和 4 行删除
bin/schedbench.cc
浏览文件 @ 02d8b289
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include "atomic.hh" #include "atomic.hh"
static volatile std::atomic<u64> waiting; static volatile std::atomic<u64> waiting;
static volatile std::atomic<u64> waking;
static volatile u64 ftx; static volatile u64 ftx;
static int iters; static int iters;
static int nworkers; static int nworkers;
...@@ -15,13 +16,17 @@ static ...@@ -15,13 +16,17 @@ static
void* worker(void* x) void* worker(void* x)
{ {
long r; long r;
int i;
for (int i = 0; i < iters; i++) { for (i = 0; i < iters; i++) {
++waiting; ++waiting;
r = futex((u64*)&ftx, FUTEX_WAIT, (u64)i, 0); r = futex((u64*)&ftx, FUTEX_WAIT, (u64)i, 0);
if (r < 0 && r != -EWOULDBLOCK) if (r < 0 && r != -EWOULDBLOCK)
die("FUTEX_WAIT: %d", r); die("FUTEX_WAIT: %d", r);
while (waking.load() == 1)
nop_pause();
} }
return nullptr; return nullptr;
} }
...@@ -31,13 +36,14 @@ void master(void) ...@@ -31,13 +36,14 @@ void master(void)
long r; long r;
for (int i = 0; i < iters; i++) { for (int i = 0; i < iters; i++) {
while (waiting.load() < nworkers) while (waiting.load() < (i+1)*nworkers)
nop_pause(); nop_pause();
waiting.store(0);
waking.store(1);
ftx = i+1; ftx = i+1;
r = futex((u64*)&ftx, FUTEX_WAKE, nworkers, 0); r = futex((u64*)&ftx, FUTEX_WAKE, nworkers, 0);
assert(r == 0); assert(r == 0);
waking.store(0);
} }
} }
...@@ -48,6 +54,7 @@ main(int ac, char** av) ...@@ -48,6 +54,7 @@ main(int ac, char** av)
if (ac < 3) if (ac < 3)
die("usage: %s iters nworkers", av[0]); die("usage: %s iters nworkers", av[0]);
ftx = 0;
iters = atoi(av[1]); iters = atoi(av[1]);
nworkers = atoi(av[2]); nworkers = atoi(av[2]);
waiting.store(0); waiting.store(0);
......
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论