diff options
| author | markj <markj@FreeBSD.org> | 2015-07-21 17:16:37 +0000 |
|---|---|---|
| committer | markj <markj@FreeBSD.org> | 2015-07-21 17:16:37 +0000 |
| commit | 84c91edd5356f5693f0ecd74d787e98b52fee0b4 (patch) | |
| tree | e3d69a4db0089a008c7c2596149b6277d1473fbf /sys/kern/kern_sx.c | |
| parent | 10c80a84dab9d6dfc505ebcda9ca49b6caa78f90 (diff) | |
| download | FreeBSD-src-84c91edd5356f5693f0ecd74d787e98b52fee0b4.zip FreeBSD-src-84c91edd5356f5693f0ecd74d787e98b52fee0b4.tar.gz | |
MFC r285663, r285664, r285667:
Ensure that locstat_nsecs() has no effect when lockstat probes are not
enabled or when the profiled lock carries the LO_NOPROFILE flag.
PR: 201642, 201517
Approved by: re (gjb)
Tested by: Jason Unovitch
Diffstat (limited to 'sys/kern/kern_sx.c')
| -rw-r--r-- | sys/kern/kern_sx.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/kern/kern_sx.c b/sys/kern/kern_sx.c index 78ca74a..952f7d4 100644 --- a/sys/kern/kern_sx.c +++ b/sys/kern/kern_sx.c @@ -544,7 +544,7 @@ _sx_xlock_hard(struct sx *sx, uintptr_t tid, int opts, const char *file, sx->lock_object.lo_name, (void *)sx->sx_lock, file, line); #ifdef KDTRACE_HOOKS - all_time -= lockstat_nsecs(); + all_time -= lockstat_nsecs(&sx->lock_object); state = sx->sx_lock; #endif while (!atomic_cmpset_acq_ptr(&sx->sx_lock, SX_LOCK_UNLOCKED, tid)) { @@ -694,7 +694,7 @@ _sx_xlock_hard(struct sx *sx, uintptr_t tid, int opts, const char *file, __func__, sx); #ifdef KDTRACE_HOOKS - sleep_time -= lockstat_nsecs(); + sleep_time -= lockstat_nsecs(&sx->lock_object); #endif GIANT_SAVE(); sleepq_add(&sx->lock_object, NULL, sx->lock_object.lo_name, @@ -705,7 +705,7 @@ _sx_xlock_hard(struct sx *sx, uintptr_t tid, int opts, const char *file, else error = sleepq_wait_sig(&sx->lock_object, 0); #ifdef KDTRACE_HOOKS - sleep_time += lockstat_nsecs(); + sleep_time += lockstat_nsecs(&sx->lock_object); sleep_cnt++; #endif if (error) { @@ -720,7 +720,7 @@ _sx_xlock_hard(struct sx *sx, uintptr_t tid, int opts, const char *file, __func__, sx); } #ifdef KDTRACE_HOOKS - all_time += lockstat_nsecs(); + all_time += lockstat_nsecs(&sx->lock_object); if (sleep_time) LOCKSTAT_RECORD4(LS_SX_XLOCK_BLOCK, sx, sleep_time, LOCKSTAT_WRITER, (state & SX_LOCK_SHARED) == 0, @@ -831,7 +831,7 @@ _sx_slock_hard(struct sx *sx, int opts, const char *file, int line) #ifdef KDTRACE_HOOKS state = sx->sx_lock; - all_time -= lockstat_nsecs(); + all_time -= lockstat_nsecs(&sx->lock_object); #endif /* @@ -958,7 +958,7 @@ _sx_slock_hard(struct sx *sx, int opts, const char *file, int line) __func__, sx); #ifdef KDTRACE_HOOKS - sleep_time -= lockstat_nsecs(); + sleep_time -= lockstat_nsecs(&sx->lock_object); #endif GIANT_SAVE(); sleepq_add(&sx->lock_object, NULL, sx->lock_object.lo_name, @@ -969,7 +969,7 @@ _sx_slock_hard(struct sx *sx, int opts, const char *file, int line) else error = sleepq_wait_sig(&sx->lock_object, 0); #ifdef KDTRACE_HOOKS - sleep_time += lockstat_nsecs(); + sleep_time += lockstat_nsecs(&sx->lock_object); sleep_cnt++; #endif if (error) { @@ -984,7 +984,7 @@ _sx_slock_hard(struct sx *sx, int opts, const char *file, int line) __func__, sx); } #ifdef KDTRACE_HOOKS - all_time += lockstat_nsecs(); + all_time += lockstat_nsecs(&sx->lock_object); if (sleep_time) LOCKSTAT_RECORD4(LS_SX_SLOCK_BLOCK, sx, sleep_time, LOCKSTAT_READER, (state & SX_LOCK_SHARED) == 0, |
