Skip to content

X
xv6-public
提交 e9a949ba 创建 作者: Austin Clements's avatar Austin Clements
浏览文件
操作

Make every ascope depend on the thread's kstack, instead of depending on the thread everywhere

上级 febb2ae4
隐藏空白字符变更
内嵌 并排
正在显示 包含 4 行增加 和 6 行删除
include/kmtrace.hh
浏览文件 @ e9a949ba
...@@ -64,6 +64,9 @@ static inline void mtresume(struct proc *p) ...@@ -64,6 +64,9 @@ static inline void mtresume(struct proc *p)
#define mtrec() mtrace_call_set(1, ~0ull) #define mtrec() mtrace_call_set(1, ~0ull)
#define mtign() mtrace_call_set(0, ~0ull) #define mtign() mtrace_call_set(0, ~0ull)
static inline void mtreadavar(const char *fmt, ...);
static inline void mtwriteavar(const char *fmt, ...);
class mt_ascope class mt_ascope
{ {
char name[64]; char name[64];
...@@ -96,6 +99,7 @@ public: ...@@ -96,6 +99,7 @@ public:
{ {
vsnprintf(name, sizeof(name) - 1, fmt, ap); vsnprintf(name, sizeof(name) - 1, fmt, ap);
mtrace_ascope_register(0, name); mtrace_ascope_register(0, name);
mtwriteavar("kstack:%p", myproc()->kstack);
active = true; active = true;
} }
......
kernel/sysfile.cc
浏览文件 @ e9a949ba
...@@ -299,7 +299,6 @@ sys_openat(int dirfd, const char *path, int omode) ...@@ -299,7 +299,6 @@ sys_openat(int dirfd, const char *path, int omode)
// Reads the dirfd FD, dirfd's inode, the inodes of all files in // Reads the dirfd FD, dirfd's inode, the inodes of all files in
// path; writes the returned FD // path; writes the returned FD
mt_ascope ascope("%s(%d,%s,%d)", __func__, dirfd, path, omode); mt_ascope ascope("%s(%d,%s,%d)", __func__, dirfd, path, omode);
mtwriteavar("thread:%x", myproc()->pid);
mtreadavar("inode:%x.%x", cwd->dev, cwd->inum); mtreadavar("inode:%x.%x", cwd->dev, cwd->inum);
if(omode & O_CREATE){ if(omode & O_CREATE){
......
kernel/sysproc.cc
浏览文件 @ e9a949ba
...@@ -105,7 +105,6 @@ sys_map(userptr<void> addr, size_t len) ...@@ -105,7 +105,6 @@ sys_map(userptr<void> addr, size_t len)
#if MTRACE #if MTRACE
mt_ascope ascope("%s(%p,%lx)", __func__, addr, len); mt_ascope ascope("%s(%p,%lx)", __func__, addr, len);
mtwriteavar("thread:%x", myproc()->pid);
for (uptr i = PGROUNDDOWN(addr); i < PGROUNDUP(addr + len); i += PGSIZE) for (uptr i = PGROUNDDOWN(addr); i < PGROUNDUP(addr + len); i += PGSIZE)
mtwriteavar("page:%016x", i); mtwriteavar("page:%016x", i);
#endif #endif
...@@ -131,7 +130,6 @@ sys_unmap(userptr<void> addr, size_t len) ...@@ -131,7 +130,6 @@ sys_unmap(userptr<void> addr, size_t len)
#if MTRACE #if MTRACE
mt_ascope ascope("%s(%p,%lx)", __func__, addr, len); mt_ascope ascope("%s(%p,%lx)", __func__, addr, len);
mtwriteavar("thread:%x", myproc()->pid);
for (uptr i = PGROUNDDOWN(addr); i < PGROUNDUP(addr + len); i += PGSIZE) for (uptr i = PGROUNDDOWN(addr); i < PGROUNDUP(addr + len); i += PGSIZE)
mtwriteavar("page:%016x", i); mtwriteavar("page:%016x", i);
#endif #endif
...@@ -179,7 +177,6 @@ sys_futex(const u64* addr, int op, u64 val, u64 timer) ...@@ -179,7 +177,6 @@ sys_futex(const u64* addr, int op, u64 val, u64 timer)
return -1; return -1;
mt_ascope ascope("%s(%p,%d,%lu,%lu)", __func__, addr, op, val, timer); mt_ascope ascope("%s(%p,%d,%lu,%lu)", __func__, addr, op, val, timer);
mtwriteavar("thread:%x", myproc()->pid);
switch(op) { switch(op) {
case FUTEX_WAIT: case FUTEX_WAIT:
......
kernel/vm.cc
浏览文件 @ e9a949ba
...@@ -637,7 +637,6 @@ pagefault(vmap *vmap, uptr va, u32 err) ...@@ -637,7 +637,6 @@ pagefault(vmap *vmap, uptr va, u32 err)
{ {
#if MTRACE #if MTRACE
mt_ascope ascope("%s(%p)", __func__, va); mt_ascope ascope("%s(%p)", __func__, va);
mtwriteavar("thread:%x", myproc()->pid);
mtwriteavar("page:%p.%016x", vmap, PGROUNDDOWN(va)); mtwriteavar("page:%p.%016x", vmap, PGROUNDDOWN(va));
#endif #endif
...@@ -688,7 +687,6 @@ pagelookup(vmap* vmap, uptr va) ...@@ -688,7 +687,6 @@ pagelookup(vmap* vmap, uptr va)
{ {
#if MTRACE #if MTRACE
mt_ascope ascope("%s(%p)", __func__, va); mt_ascope ascope("%s(%p)", __func__, va);
mtwriteavar("thread:%x", myproc()->pid);
mtwriteavar("page:%p.%016x", vmap, PGROUNDDOWN(va)); mtwriteavar("page:%p.%016x", vmap, PGROUNDDOWN(va));
#endif #endif
......
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论