diff options
| -rw-r--r-- | sys/kern/kern_mutex.c | 26 | ||||
| -rw-r--r-- | sys/sys/mutex.h | 26 |
2 files changed, 27 insertions, 25 deletions
diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c index 9cff711..34f0509 100644 --- a/sys/kern/kern_mutex.c +++ b/sys/kern/kern_mutex.c @@ -213,7 +213,8 @@ _mtx_unlock_flags(struct mtx *m, int opts, const char *file, int line) line); mtx_assert(m, MA_OWNED); - lock_profile_release_lock(&m->lock_object); + if (m->mtx_recurse == 0) + lock_profile_release_lock(&m->lock_object); _rel_sleep_lock(m, curthread, opts, file, line); } @@ -250,7 +251,6 @@ _mtx_unlock_spin_flags(struct mtx *m, int opts, const char *file, int line) line); mtx_assert(m, MA_OWNED); - lock_profile_release_lock(&m->lock_object); _rel_spin_lock(m); } @@ -309,6 +309,8 @@ _mtx_lock_sleep(struct mtx *m, uintptr_t tid, int opts, const char *file, #ifdef KTR int cont_logged = 0; #endif + int contested = 0; + uint64_t waittime = 0; uintptr_t v; if (mtx_owned(m)) { @@ -322,6 +324,8 @@ _mtx_lock_sleep(struct mtx *m, uintptr_t tid, int opts, const char *file, return; } + lock_profile_obtain_lock_failed(&m->lock_object, + &contested, &waittime); if (LOCK_LOG_TEST(&m->lock_object, opts)) CTR4(KTR_LOCK, "_mtx_lock_sleep: %s contested (lock=%p) at %s:%d", @@ -418,7 +422,8 @@ _mtx_lock_sleep(struct mtx *m, uintptr_t tid, int opts, const char *file, m->lock_object.lo_name, (void *)tid, file, line); } #endif - return; + lock_profile_obtain_lock_success(&m->lock_object, contested, + waittime, (file), (line)); } #ifdef SMP @@ -432,12 +437,14 @@ void _mtx_lock_spin(struct mtx *m, uintptr_t tid, int opts, const char *file, int line) { - int i = 0; - struct thread *td; - + int i = 0, contested = 0; + struct thread *td; + uint64_t waittime = 0; + if (LOCK_LOG_TEST(&m->lock_object, opts)) CTR1(KTR_LOCK, "_mtx_lock_spin: %p spinning", m); + lock_profile_obtain_lock_failed(&m->lock_object, &contested, &waittime); while (!_obtain_lock(m, tid)) { /* Give interrupts a chance while we spin. */ @@ -471,7 +478,9 @@ _mtx_lock_spin(struct mtx *m, uintptr_t tid, int opts, const char *file, if (LOCK_LOG_TEST(&m->lock_object, opts)) CTR1(KTR_LOCK, "_mtx_lock_spin: %p spin done", m); - return; + lock_profile_obtain_lock_success(&m->lock_object, contested, + waittime, (file), (line)); + } #endif /* SMP */ @@ -545,6 +554,7 @@ _mtx_unlock_sleep(struct mtx *m, int opts, const char *file, int line) td = curthread; if (td->td_critnest > 0 || td1->td_priority >= td->td_priority) return; + mtx_lock_spin(&sched_lock); if (!TD_IS_RUNNING(td1)) { #ifdef notyet @@ -572,8 +582,6 @@ _mtx_unlock_sleep(struct mtx *m, int opts, const char *file, int line) } mtx_unlock_spin(&sched_lock); #endif - - return; } /* diff --git a/sys/sys/mutex.h b/sys/sys/mutex.h index dea4b76..4116e38 100644 --- a/sys/sys/mutex.h +++ b/sys/sys/mutex.h @@ -156,15 +156,11 @@ void _mtx_assert(struct mtx *m, int what, const char *file, int line); #ifndef _get_sleep_lock #define _get_sleep_lock(mp, tid, opts, file, line) do { \ uintptr_t _tid = (uintptr_t)(tid); \ - int contested = 0; \ - uint64_t waittime = 0; \ if (!_obtain_lock((mp), _tid)) { \ - lock_profile_obtain_lock_failed(&(mp)->lock_object, \ - &contested, &waittime); \ _mtx_lock_sleep((mp), _tid, (opts), (file), (line)); \ - } \ - lock_profile_obtain_lock_success(&(mp)->lock_object, contested, \ - waittime, (file), (line)); \ + } else \ + lock_profile_obtain_lock_success(&(mp)->lock_object, 0, \ + 0, (file), (line)); \ } while (0) #endif @@ -179,20 +175,16 @@ void _mtx_assert(struct mtx *m, int what, const char *file, int line); #ifdef SMP #define _get_spin_lock(mp, tid, opts, file, line) do { \ uintptr_t _tid = (uintptr_t)(tid); \ - int contested = 0; \ - uint64_t waittime = 0; \ spinlock_enter(); \ if (!_obtain_lock((mp), _tid)) { \ if ((mp)->mtx_lock == _tid) \ (mp)->mtx_recurse++; \ else { \ - lock_profile_obtain_lock_failed(&(mp)->lock_object, \ - &contested, &waittime); \ _mtx_lock_spin((mp), _tid, (opts), (file), (line)); \ } \ - } \ - lock_profile_obtain_lock_success(&(mp)->lock_object, contested, \ - waittime, (file), (line)); \ + } else \ + lock_profile_obtain_lock_success(&(mp)->lock_object, 0, \ + 0, (file), (line)); \ } while (0) #else /* SMP */ #define _get_spin_lock(mp, tid, opts, file, line) do { \ @@ -237,9 +229,11 @@ void _mtx_assert(struct mtx *m, int what, const char *file, int line); #define _rel_spin_lock(mp) do { \ if (mtx_recursed((mp))) \ (mp)->mtx_recurse--; \ - else \ + else { \ + lock_profile_release_lock(&(mp)->lock_object); \ _release_lock_quick((mp)); \ - spinlock_exit(); \ + } \ + spinlock_exit(); \ } while (0) #else /* SMP */ #define _rel_spin_lock(mp) do { \ |
