summaryrefslogtreecommitdiff
path: root/sys/lockdoc/log.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/lockdoc/log.c')
-rw-r--r--sys/lockdoc/log.c48
1 files changed, 6 insertions, 42 deletions
diff --git a/sys/lockdoc/log.c b/sys/lockdoc/log.c
index 84aba0893f5..56815b93d75 100644
--- a/sys/lockdoc/log.c
+++ b/sys/lockdoc/log.c
@@ -79,9 +79,9 @@ void trace_irqs_on(struct trapframe *frame) {
cur_eflags = x86_read_flags();
if ((frame->tf_eflags & (1 << 9)) && !(cur_eflags & (1 << 9))) {
#ifdef DEBUG_TRAPS
- log_lock(V_WRITE, (struct lock_object*)PSEUDOLOCK_ADDR_HARDIRQ, __FILE__, __LINE__, frame->tf_trapno);
+ lockdoc_log_lock(V_WRITE, (struct lock_object*)PSEUDOLOCK_ADDR_HARDIRQ, __FILE__, __LINE__, frame->tf_trapno);
#else
- log_lock(V_WRITE, (struct lock_object*)PSEUDOLOCK_ADDR_HARDIRQ, __FILE__, __LINE__, LOCK_NONE);
+ lockdoc_log_lock(V_WRITE, (struct lock_object*)PSEUDOLOCK_ADDR_HARDIRQ, __FILE__, __LINE__, LOCK_NONE);
#endif
}
}
@@ -91,55 +91,19 @@ void trace_irqs_off(struct trapframe *frame) {
cur_eflags = x86_read_flags();
if ((frame->tf_eflags & (1 << 9)) && !(cur_eflags & (1 << 9))) {
#ifdef DEBUG_TRAPS
- log_lock(P_WRITE, (struct lock_object*)PSEUDOLOCK_ADDR_HARDIRQ, __FILE__, __LINE__, frame->tf_trapno);
+ lockdoc_log_lock(P_WRITE, (struct lock_object*)PSEUDOLOCK_ADDR_HARDIRQ, __FILE__, __LINE__, frame->tf_trapno);
#else
- log_lock(P_WRITE, (struct lock_object*)PSEUDOLOCK_ADDR_HARDIRQ, __FILE__, __LINE__, LOCK_NONE);
+ lockdoc_log_lock(P_WRITE, (struct lock_object*)PSEUDOLOCK_ADDR_HARDIRQ, __FILE__, __LINE__, LOCK_NONE);
#endif
}
}
-void lockdoc_alloc(const char *func, const char *file, size_t line, volatile void *lock, lockops_t *lo, uintptr_t initaddr){
-}
-
-void lockdoc_free(const char *func, const char *file, size_t line, volatile void *lock){
-}
-
-void lockdoc_wantlock(const char *func, const char *file, size_t line, const volatile void *lock, uintptr_t where, int shared){
-}
-
-void lockdoc_locked(const char *func, const char *file, size_t line, volatile void *lock, void *cvlock, uintptr_t where, int shared){
- // shared == 0 means exclusive (write) lock; shared > 0 means shared (read) lock
- if(shared > 0) {
- // TODO Check if LOCK_NONE is appropriate
- log_lock(P_READ, lock, file, line, LOCK_NONE);
- } else if (shared == 0){
- log_lock(P_WRITE, lock, file, line, LOCK_NONE);
- }
-}
-void lockdoc_unlocked(const char *func, const char *file, size_t line, volatile void *lock, uintptr_t where, int shared){
- // shared == 0 means exclusive (write) lock; shared > 0 means shared (read) lock
- if(shared > 0) {
- // TODO Check if LOCK_NONE is appropriate
- log_lock(V_READ, lock, file, line, LOCK_NONE);
- } else if (shared == 0){
- log_lock(V_WRITE, lock, file, line, LOCK_NONE);
- }
-}
-void lockdoc_barrier(const char *func, const char *file, size_t line, volatile void *spinlock, int slplocks){
-}
-
-void lockdoc_mem_check(const char *func, const char *file, size_t line, void *base, size_t sz){
-}
-
-void lockdoc_wakeup(const char *func, const char *file, size_t line, volatile void *lock, uintptr_t where){
-}
-
void __x86_disable_intr(const char *file, int line, const char *func){
u_long eflags;
eflags = x86_read_flags();
if (eflags & (1 << 9)){ // Check if interrupts were enabled in the first place
- log_lock(P_WRITE, (void*)PSEUDOLOCK_ADDR_HARDIRQ, file, line, LOCK_NONE);
+ lockdoc_log_lock(P_WRITE, (void*)PSEUDOLOCK_ADDR_HARDIRQ, file, line, LOCK_NONE);
}
lockdoc_x86_disable_intr();
}
@@ -158,7 +122,7 @@ void __x86_enable_intr(const char *file, int line, const char *func){
eflags = x86_read_flags();
if (!(eflags & (1 << 9))){ // Check if interrupts were disabled in the first place
- log_lock(V_WRITE, (void*)PSEUDOLOCK_ADDR_HARDIRQ, file, line, LOCK_NONE);
+ lockdoc_log_lock(V_WRITE, (void*)PSEUDOLOCK_ADDR_HARDIRQ, file, line, LOCK_NONE);
}
lockdoc_x86_enable_intr();
}