Skip to content

X
xv6-public
提交 9e5219ae 创建 作者: Nickolai Zeldovich's avatar Nickolai Zeldovich
浏览文件
操作

null spinlock name bug

上级 33d26bc4
显示空白字符变更
内嵌 并排
正在显示 包含 4 行增加 和 6 行删除
spinlock.c
浏览文件 @ 9e5219ae
...@@ -27,14 +27,12 @@ void ...@@ -27,14 +27,12 @@ void
acquire(struct spinlock *lk) acquire(struct spinlock *lk)
{ {
pushcli(); // disable interrupts to avoid deadlock. pushcli(); // disable interrupts to avoid deadlock.
if(holding(lk)) { if(holding(lk))
cprintf("lock: %s\n", lk->name);
panic("acquire"); panic("acquire");
}
mtrace_lock_register(RET_EIP(), mtrace_lock_register(RET_EIP(),
lk, lk,
lk->name, lk->name ?: "null",
mtrace_lockop_acquire, mtrace_lockop_acquire,
0); 0);
...@@ -46,7 +44,7 @@ acquire(struct spinlock *lk) ...@@ -46,7 +44,7 @@ acquire(struct spinlock *lk)
mtrace_lock_register(RET_EIP(), mtrace_lock_register(RET_EIP(),
lk, lk,
lk->name, lk->name ?: "null",
mtrace_lockop_acquired, mtrace_lockop_acquired,
0); 0);
...@@ -66,7 +64,7 @@ release(struct spinlock *lk) ...@@ -66,7 +64,7 @@ release(struct spinlock *lk)
mtrace_lock_register(RET_EIP(), mtrace_lock_register(RET_EIP(),
lk, lk,
lk->name, lk->name ?: "null",
mtrace_lockop_release, mtrace_lockop_release,
0); 0);
......
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论