svn commit: r315391 - stable/11/sys/sys

[Mateusz Guzik]

Author: mjg
Date: Thu Mar 16 07:46:24 2017
New Revision: 315391
URL: https://svnweb.freebsd.org/changeset/base/315391

Log:
  MFC r313874:
  
  Make inline lockstat checks just inspect lockstat_enabled
  
  There is no correctness issue and this lets the kernel just test one typically
  false variable.

Modified:
  stable/11/sys/sys/lockstat.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/sys/lockstat.h
==============================================================================
--- stable/11/sys/sys/lockstat.h	Thu Mar 16 07:40:33 2017	(r315390)
+++ stable/11/sys/sys/lockstat.h	Thu Mar 16 07:46:24 2017	(r315391)
@@ -107,6 +107,13 @@ extern int lockstat_enabled;
 	LOCKSTAT_RECORD1(probe, lp, a);					\
 } while (0)
 
+#ifndef LOCK_PROFILING
+#define	LOCKSTAT_PROFILE_ENABLED(probe)		__predict_false(lockstat_enabled)
+#define	LOCKSTAT_OOL_PROFILE_ENABLED(probe)	LOCKSTAT_PROFILE_ENABLED(probe)
+#else
+#define	LOCKSTAT_OOL_PROFILE_ENABLED(probe)	1
+#endif
+
 struct lock_object;
 uint64_t lockstat_nsecs(struct lock_object *);
 
@@ -130,16 +137,12 @@ uint64_t lockstat_nsecs(struct lock_obje
 #define	LOCKSTAT_PROFILE_RELEASE_RWLOCK(probe, lp, a)  			\
 	LOCKSTAT_PROFILE_RELEASE_LOCK(probe, lp)
 
-#endif /* !KDTRACE_HOOKS */
-
 #ifndef LOCK_PROFILING
-#define	LOCKSTAT_PROFILE_ENABLED(probe)					\
-	SDT_PROBE_ENABLED(lockstat, , , probe)
-#define	LOCKSTAT_OOL_PROFILE_ENABLED(probe)				\
-	SDT_PROBE_ENABLED(lockstat, , , probe)
-#else
-#define	LOCKSTAT_OOL_PROFILE_ENABLED(probe)	1
+#define	LOCKSTAT_PROFILE_ENABLED(probe)		0
 #endif
+#define	LOCKSTAT_OOL_PROFILE_ENABLED(probe)	1
+
+#endif /* !KDTRACE_HOOKS */
 
 #endif /* _KERNEL */
 #endif /* _SYS_LOCKSTAT_H */