Skip to content

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

Linux dirbench fixes

上级 78f3eed9
隐藏空白字符变更
内嵌 并排
正在显示 包含 17 行增加 和 4 行删除
bin/dirbench.cc
浏览文件 @ 5f68e711
...@@ -5,10 +5,21 @@ ...@@ -5,10 +5,21 @@
#include <unistd.h> #include <unistd.h>
#include <assert.h> #include <assert.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/wait.h>
#define O_CREATE O_CREAT #define O_CREATE O_CREAT
#define xfork() fork() #define xfork() fork()
#define xexit() exit(EXIT_SUCCESS) #define xexit() exit(EXIT_SUCCESS)
static inline void xwait()
{
int status;
if (wait(&status) < 0)
edie("wait");
if (!WIFEXITED(status))
die("bad status %u", status);
}
#define xmkdir(pathname) mkdir((pathname), S_IWUSR|S_IRUSR); #define xmkdir(pathname) mkdir((pathname), S_IWUSR|S_IRUSR);
#define xcreat(name) open((name), O_CREATE, S_IRUSR|S_IWUSR)
#define mtenable(x) do { } while(0) #define mtenable(x) do { } while(0)
#define mtdisable(x) do { } while(0) #define mtdisable(x) do { } while(0)
#else #else
...@@ -21,6 +32,8 @@ ...@@ -21,6 +32,8 @@
#define xfork() fork(0) #define xfork() fork(0)
#define xexit() exit() #define xexit() exit()
#define xmkdir(pathname) mkdir((pathname)) #define xmkdir(pathname) mkdir((pathname))
#define xcreat(name) open((name), O_CREATE)
#define xwait() wait()
#endif #endif
static const bool pinit = true; static const bool pinit = true;
...@@ -31,7 +44,7 @@ enum { nlookup = 100 }; ...@@ -31,7 +44,7 @@ enum { nlookup = 100 };
void void
bench(u32 tid, int nloop, const char* path) bench(u32 tid, int nloop, const char* path)
{ {
char pn[MAXNAME]; char pn[32];
if (pinit) if (pinit)
setaffinity(tid); setaffinity(tid);
...@@ -40,7 +53,7 @@ bench(u32 tid, int nloop, const char* path) ...@@ -40,7 +53,7 @@ bench(u32 tid, int nloop, const char* path)
for (u32 i = 0; i < nfile; i++) { for (u32 i = 0; i < nfile; i++) {
snprintf(pn, sizeof(pn), "%s/f:%d:%d", path, tid, i); snprintf(pn, sizeof(pn), "%s/f:%d:%d", path, tid, i);
int fd = open(pn, O_CREATE | O_RDWR); int fd = xcreat(pn);
if (fd < 0) if (fd < 0)
die("create failed\n"); die("create failed\n");
...@@ -51,7 +64,7 @@ bench(u32 tid, int nloop, const char* path) ...@@ -51,7 +64,7 @@ bench(u32 tid, int nloop, const char* path)
snprintf(pn, sizeof(pn), "%s/f:%d:%d", path, tid, (i % nfile)); snprintf(pn, sizeof(pn), "%s/f:%d:%d", path, tid, (i % nfile));
int fd = open(pn, O_RDWR); int fd = open(pn, O_RDWR);
if (fd < 0) if (fd < 0)
die("open failed\n"); die("open failed %s", pn);
close(fd); close(fd);
} }
...@@ -102,7 +115,7 @@ main(int ac, char** av) ...@@ -102,7 +115,7 @@ main(int ac, char** av)
} }
for (u32 i = 0; i < nthread; i++) for (u32 i = 0; i < nthread; i++)
wait(); xwait();
u64 t1 = rdtsc(); u64 t1 = rdtsc();
mtdisable("xv6-dirbench"); mtdisable("xv6-dirbench");
......
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论