Skip to content

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

lockstat tweaks

上级 34b8eecf
显示空白字符变更
内嵌 并排
正在显示 包含 34 行增加 和 6 行删除
lockstat.c
浏览文件 @ 21daa928
...@@ -24,7 +24,7 @@ stats(void) ...@@ -24,7 +24,7 @@ stats(void)
if (fd < 0) if (fd < 0)
die("lockstat: open failed"); die("lockstat: open failed");
printf(1, "## name cycles acquires\n"); printf(1, "## name acquires locking locked\n");
while (1) { while (1) {
r = read(fd, &ls, sz); r = read(fd, &ls, sz);
if (r < 0) if (r < 0)
...@@ -34,13 +34,16 @@ stats(void) ...@@ -34,13 +34,16 @@ stats(void)
if (r != sz) if (r != sz)
die("lockstat: unexpected read"); die("lockstat: unexpected read");
u64 cycles = 0, acquires = 0; u64 acquires = 0, locking = 0, locked = 0;
for (int i = 0; i < NCPU; i++) { for (int i = 0; i < NCPU; i++) {
cycles += ls.cpu[i].cycles;
acquires += ls.cpu[i].acquires; acquires += ls.cpu[i].acquires;
locking += ls.cpu[i].locking;
locked += ls.cpu[i].locked;
} }
printf(1, "%s %lu %lu\n", ls.name, cycles, acquires); if (acquires > 0)
printf(1, "%s %lu %lu %lu\n",
ls.name, acquires, locking, locked);
} }
} }
......
lockstat.h
浏览文件 @ 21daa928
...@@ -2,7 +2,10 @@ ...@@ -2,7 +2,10 @@
struct cpulockstat { struct cpulockstat {
u64 acquires; u64 acquires;
u64 cycles; u64 locking;
u64 locked;
u64 locking_ts;
u64 locked_ts;
__padout__; __padout__;
} __mpalign__; } __mpalign__;
......
spinlock.c
浏览文件 @ 21daa928
...@@ -13,6 +13,12 @@ ...@@ -13,6 +13,12 @@
#if LOCKSTAT #if LOCKSTAT
static int lockstat_enable; static int lockstat_enable;
static inline struct cpulockstat *
mylockstat(struct spinlock *lk)
{
return &lk->stat->s.cpu[cpunum()];
}
#endif #endif
static inline void static inline void
...@@ -25,6 +31,11 @@ locking(struct spinlock *lk) ...@@ -25,6 +31,11 @@ locking(struct spinlock *lk)
} }
#endif #endif
#if LOCKSTAT
if (lockstat_enable && lk->stat != NULL)
mylockstat(lk)->locking_ts = rdtsc();
#endif
mtlock(lk); mtlock(lk);
} }
...@@ -41,7 +52,9 @@ locked(struct spinlock *lk) ...@@ -41,7 +52,9 @@ locked(struct spinlock *lk)
#if LOCKSTAT #if LOCKSTAT
if (lockstat_enable && lk->stat != NULL) { if (lockstat_enable && lk->stat != NULL) {
lk->stat->s.cpu[cpunum()].acquires++; struct cpulockstat *s = mylockstat(lk);
s->acquires++;
s->locked_ts = rdtsc();
} }
#endif #endif
} }
...@@ -62,6 +75,15 @@ releasing(struct spinlock *lk) ...@@ -62,6 +75,15 @@ releasing(struct spinlock *lk)
lk->pcs[0] = 0; lk->pcs[0] = 0;
lk->cpu = 0; lk->cpu = 0;
#endif #endif
#if LOCKSTAT
if (lockstat_enable && lk->stat != NULL) {
struct cpulockstat *s = mylockstat(lk);
u64 ts = rdtsc();
s->locking += ts - s->locking_ts;
s->locked += ts - s->locked_ts;
}
#endif
} }
// Check whether this cpu is holding the lock. // Check whether this cpu is holding the lock.
......
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论