aboutsummaryrefslogtreecommitdiff
path: root/sys/sys/lock.h
diff options
context:
space:
mode:
authorConrad Meyer <cem@FreeBSD.org>2019-05-20 00:38:23 +0000
committerConrad Meyer <cem@FreeBSD.org>2019-05-20 00:38:23 +0000
commite2e050c8ef733138fc6a9e514e4b856fefbc3ff1 (patch)
treef2ba0e6ef3f572211c35dcb8f9aef4f132a08d96 /sys/sys/lock.h
parent2ad7ed6e4a84448234e9aaef3c9fa884848f7387 (diff)
downloadsrc-e2e050c8ef733138fc6a9e514e4b856fefbc3ff1.tar.gz
src-e2e050c8ef733138fc6a9e514e4b856fefbc3ff1.zip
Extract eventfilter declarations to sys/_eventfilter.h
This allows replacing "sys/eventfilter.h" includes with "sys/_eventfilter.h" in other header files (e.g., sys/{bus,conf,cpu}.h) and reduces header pollution substantially. EVENTHANDLER_DECLARE and EVENTHANDLER_LIST_DECLAREs were moved out of .c files into appropriate headers (e.g., sys/proc.h, powernv/opal.h). As a side effect of reduced header pollution, many .c files and headers no longer contain needed definitions. The remainder of the patch addresses adding appropriate includes to fix those files. LOCK_DEBUG and LOCK_FILE_LINE_ARG are moved to sys/_lock.h, as required by sys/mutex.h since r326106 (but silently protected by header pollution prior to this change). No functional change (intended). Of course, any out of tree modules that relied on header pollution for sys/eventhandler.h, sys/lock.h, or sys/mutex.h inclusion need to be fixed. __FreeBSD_version has been bumped.
Notes
Notes: svn path=/head/; revision=347984
Diffstat (limited to 'sys/sys/lock.h')
-rw-r--r--sys/sys/lock.h32
1 files changed, 0 insertions, 32 deletions
diff --git a/sys/sys/lock.h b/sys/sys/lock.h
index f7e25d278f3b..db2e697e563d 100644
--- a/sys/sys/lock.h
+++ b/sys/sys/lock.h
@@ -119,38 +119,6 @@ struct lock_class {
#ifdef _KERNEL
/*
- * If any of WITNESS, INVARIANTS, or KTR_LOCK KTR tracing has been enabled,
- * then turn on LOCK_DEBUG. When this option is on, extra debugging
- * facilities such as tracking the file and line number of lock operations
- * are enabled. Also, mutex locking operations are not inlined to avoid
- * bloat from all the extra debugging code. We also have to turn on all the
- * calling conventions for this debugging code in modules so that modules can
- * work with both debug and non-debug kernels.
- */
-#if (defined(KLD_MODULE) && !defined(KLD_TIED)) || defined(WITNESS) || defined(INVARIANTS) || \
- defined(LOCK_PROFILING) || defined(KTR)
-#define LOCK_DEBUG 1
-#else
-#define LOCK_DEBUG 0
-#endif
-
-/*
- * In the LOCK_DEBUG case, use the filename and line numbers for debugging
- * operations. Otherwise, use default values to avoid the unneeded bloat.
- */
-#if LOCK_DEBUG > 0
-#define LOCK_FILE_LINE_ARG_DEF , const char *file, int line
-#define LOCK_FILE_LINE_ARG , file, line
-#define LOCK_FILE __FILE__
-#define LOCK_LINE __LINE__
-#else
-#define LOCK_FILE_LINE_ARG_DEF
-#define LOCK_FILE_LINE_ARG
-#define LOCK_FILE NULL
-#define LOCK_LINE 0
-#endif
-
-/*
* Macros for KTR_LOCK tracing.
*
* opname - name of this operation (LOCK/UNLOCK/SLOCK, etc.)