aboutsummaryrefslogtreecommitdiffstats
path: root/include/sys
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2009-10-30 13:58:51 -0700
committerBrian Behlendorf <[email protected]>2009-10-30 13:58:51 -0700
commit055ffd98cf80bfc72c28d730753c7d139b704d44 (patch)
tree24b7bd860c9d33327652698cd9f9b04dda50e341 /include/sys
parent302b88e6abc3efe86411f9622b0a27a5b8b1f417 (diff)
Autoconf --enable-debug-* cleanup
Cleanup the --enable-debug-* configure options, this has been pending for quite some time and I am glad I finally got to it. To summerize: 1) All SPL_AC_DEBUG_* macros were updated to be a more autoconf friendly. This mainly involved shift to the GNU approved usage of AC_ARG_ENABLE and ensuring AS_IF is used rather than directly using an if [ test ] construct. 2) --enable-debug-kmem=yes by default. This simply enabled keeping a running tally of total memory allocated and freed and reporting a memory leak if there was one at module unload. Additionally, it ensure /proc/spl/kmem/slab will exist by default which is handy. The overhead is low for this and it should not impact performance. 3) --enable-debug-kmem-tracking=no by default. This option was added to provide a configure option to enable to detailed memory allocation tracking. This support was always there but you had to know where to turn it on. By default this support is disabled because it is known to badly hurt performence, however it is invaluable when chasing a memory leak. 4) --enable-debug-kstat removed. After further reflection I can't see why you would ever really want to turn this support off. It is now always on which had the nice side effect of simplifying the proc handling code in spl-proc.c. We can now always assume the top level directory will be there. 5) --enable-debug-callb removed. This never really did anything, it was put in provisionally because it might have been needed. It turns out it was not so I am just removing it to prevent confusion.
Diffstat (limited to 'include/sys')
-rw-r--r--include/sys/callb.h4
-rw-r--r--include/sys/kmem.h1
-rw-r--r--include/sys/kstat.h17
-rw-r--r--include/sys/proc.h2
4 files changed, 0 insertions, 24 deletions
diff --git a/include/sys/callb.h b/include/sys/callb.h
index 0857d6d8a..b37bb278a 100644
--- a/include/sys/callb.h
+++ b/include/sys/callb.h
@@ -8,11 +8,7 @@ extern "C" {
#include <linux/module.h>
#include <sys/mutex.h>
-#ifdef DEBUG_CALLB
#define CALLB_CPR_ASSERT(cp) ASSERT(MUTEX_HELD((cp)->cc_lockp));
-#else
-#define CALLB_CPR_ASSERT(cp) (void)0
-#endif
typedef struct callb_cpr {
kmutex_t *cc_lockp;
diff --git a/include/sys/kmem.h b/include/sys/kmem.h
index caba9104f..7cfbc49e5 100644
--- a/include/sys/kmem.h
+++ b/include/sys/kmem.h
@@ -32,7 +32,6 @@ extern "C" {
#endif
#undef DEBUG_KMEM_UNIMPLEMENTED
-#undef DEBUG_KMEM_TRACKING /* Per-allocation memory tracking */
#include <linux/module.h>
#include <linux/slab.h>
diff --git a/include/sys/kstat.h b/include/sys/kstat.h
index bfae7bd15..362bae286 100644
--- a/include/sys/kstat.h
+++ b/include/sys/kstat.h
@@ -27,10 +27,6 @@
#ifndef _SPL_KSTAT_H
#define _SPL_KSTAT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
#include <linux/module.h>
#include <sys/types.h>
#include <sys/time.h>
@@ -155,7 +151,6 @@ typedef struct kstat_timer {
int kstat_init(void);
void kstat_fini(void);
-#ifdef DEBUG_KSTAT
extern kstat_t *__kstat_create(const char *ks_module, int ks_instance,
const char *ks_name, const char *ks_class,
uchar_t ks_type, uint_t ks_ndata,
@@ -167,17 +162,5 @@ extern void __kstat_delete(kstat_t *ksp);
#define kstat_install(k) __kstat_install(k)
#define kstat_delete(k) __kstat_delete(k)
-#else
-
-#define kstat_create(m,i,n,c,t,s,f) (NULL)
-#define kstat_install(k) ((void)0)
-#define kstat_delete(k) ((void)0)
-
-#endif /* DEBUG_KSTAT */
-
-#ifdef __cplusplus
-}
-#endif
-
#endif /* _SPL_KSTAT_H */
diff --git a/include/sys/proc.h b/include/sys/proc.h
index a4b1da55a..2938414b7 100644
--- a/include/sys/proc.h
+++ b/include/sys/proc.h
@@ -48,12 +48,10 @@
#define spl_unregister_sysctl_table(t) unregister_sysctl_table(t)
#endif /* CONFIG_SYSCTL */
-#ifdef DEBUG_KSTAT
extern struct proc_dir_entry *proc_spl_kstat;
struct proc_dir_entry *proc_dir_entry_find(struct proc_dir_entry *root,
const char *str);
int proc_dir_entries(struct proc_dir_entry *root);
-#endif
int proc_init(void);
void proc_fini(void);