diff options
| author | attilio <attilio@FreeBSD.org> | 2011-12-12 23:29:32 +0000 |
|---|---|---|
| committer | attilio <attilio@FreeBSD.org> | 2011-12-12 23:29:32 +0000 |
| commit | cb0e02e00e9b1dd7c973b926616603c86ba314b7 (patch) | |
| tree | accadb3a02714fbc40f4b6198a13cfd8cc697088 /sys/sys/lockstat.h | |
| parent | 276f79818d29293335512d8f834804c2bc8e45c8 (diff) | |
| download | FreeBSD-src-cb0e02e00e9b1dd7c973b926616603c86ba314b7.zip FreeBSD-src-cb0e02e00e9b1dd7c973b926616603c86ba314b7.tar.gz | |
Revert the approach for skipping lockstat_probe_func call when doing
lock_success/lock_failure, introduced in r228424, by directly skipping
in dtrace_probe.
This mainly helps in avoiding namespace pollution and thus lockstat.h
dependency by systm.h.
As an added bonus, this also helps in MFC case.
Reviewed by: avg
MFC after: 3 months (or never)
X-MFC: r228424
Diffstat (limited to 'sys/sys/lockstat.h')
| -rw-r--r-- | sys/sys/lockstat.h | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/sys/sys/lockstat.h b/sys/sys/lockstat.h index bdfb475..ed9cffa 100644 --- a/sys/sys/lockstat.h +++ b/sys/sys/lockstat.h @@ -185,24 +185,17 @@ extern uint64_t lockstat_nsecs(void); #define LOCKSTAT_PROFILE_OBTAIN_LOCK_SUCCESS(probe, lp, c, wt, f, l) do { \ uint32_t id; \ \ - if (!SCHEDULER_STOPPED()) { \ - lock_profile_obtain_lock_success(&(lp)->lock_object, c, wt, \ - f, l); \ - if ((id = lockstat_probemap[(probe)])) \ - (*lockstat_probe_func)(id, (uintptr_t)(lp), 0, 0, \ - 0, 0); \ - } \ + lock_profile_obtain_lock_success(&(lp)->lock_object, c, wt, f, l); \ + if ((id = lockstat_probemap[(probe)])) \ + (*lockstat_probe_func)(id, (uintptr_t)(lp), 0, 0, 0, 0); \ } while (0) #define LOCKSTAT_PROFILE_RELEASE_LOCK(probe, lp) do { \ uint32_t id; \ \ - if (!SCHEDULER_STOPPED()) { \ - lock_profile_release_lock(&(lp)->lock_object); \ - if ((id = lockstat_probemap[(probe)])) \ - (*lockstat_probe_func)(id, (uintptr_t)(lp), 0, 0, \ - 0, 0); \ - } \ + lock_profile_release_lock(&(lp)->lock_object); \ + if ((id = lockstat_probemap[(probe)])) \ + (*lockstat_probe_func)(id, (uintptr_t)(lp), 0, 0, 0, 0); \ } while (0) #else /* !KDTRACE_HOOKS */ |
