diff options
author | pjd <pjd@FreeBSD.org> | 2007-11-05 18:40:55 +0000 |
---|---|---|
committer | pjd <pjd@FreeBSD.org> | 2007-11-05 18:40:55 +0000 |
commit | 34e2d48eab712113151e3c5ff99b2e7fcc1dac4c (patch) | |
tree | 6f08e6848de526eab44275f2da5a9b50411b8361 /sys/cddl | |
parent | 3d1044f0aa0bf81dae67b3bd8ad4fb221d104785 (diff) | |
download | FreeBSD-src-34e2d48eab712113151e3c5ff99b2e7fcc1dac4c.zip FreeBSD-src-34e2d48eab712113151e3c5ff99b2e7fcc1dac4c.tar.gz |
Remove "zfs:" prefix from lock and condvar names and also skip non-letter
characters (mostly "&"). Because top(1) shows only first six characters of
wait channel, without this change we saw only one meaningful character.
Requested by: kris & others
MFC after: 1 week
Diffstat (limited to 'sys/cddl')
-rw-r--r-- | sys/cddl/compat/opensolaris/sys/kcondvar.h | 9 | ||||
-rw-r--r-- | sys/cddl/compat/opensolaris/sys/mutex.h | 9 | ||||
-rw-r--r-- | sys/cddl/compat/opensolaris/sys/rwlock.h | 9 |
3 files changed, 24 insertions, 3 deletions
diff --git a/sys/cddl/compat/opensolaris/sys/kcondvar.h b/sys/cddl/compat/opensolaris/sys/kcondvar.h index 547d622..0422ba0 100644 --- a/sys/cddl/compat/opensolaris/sys/kcondvar.h +++ b/sys/cddl/compat/opensolaris/sys/kcondvar.h @@ -45,8 +45,15 @@ typedef enum { } kcv_type_t; #define zfs_cv_init(cv, name, type, arg) do { \ + const char *_name; \ ASSERT((type) == CV_DEFAULT); \ - cv_init((cv), "zfs:" #cv); \ + for (_name = #cv; *_name != '\0'; _name++) { \ + if (*_name >= 'a' && *_name <= 'z') \ + break; \ + } \ + if (*_name == '\0') \ + _name = #cv; \ + cv_init((cv), _name); \ } while (0) #define cv_init(cv, name, type, arg) zfs_cv_init((cv), (name), (type), (arg)) diff --git a/sys/cddl/compat/opensolaris/sys/mutex.h b/sys/cddl/compat/opensolaris/sys/mutex.h index d7543af..8756cd0 100644 --- a/sys/cddl/compat/opensolaris/sys/mutex.h +++ b/sys/cddl/compat/opensolaris/sys/mutex.h @@ -53,11 +53,18 @@ typedef struct sx kmutex_t; #endif #define mutex_init(lock, desc, type, arg) do { \ + const char *_name; \ ASSERT((type) == MUTEX_DEFAULT); \ KASSERT(((lock)->lock_object.lo_flags & LO_ALLMASK) != \ LO_EXPECTED, ("lock %s already initialized", #lock)); \ bzero((lock), sizeof(struct sx)); \ - sx_init_flags((lock), "zfs:" #lock, MUTEX_FLAGS); \ + for (_name = #lock; *_name != '\0'; _name++) { \ + if (*_name >= 'a' && *_name <= 'z') \ + break; \ + } \ + if (*_name == '\0') \ + _name = #lock; \ + sx_init_flags((lock), _name, MUTEX_FLAGS); \ } while (0) #define mutex_destroy(lock) sx_destroy(lock) #define mutex_enter(lock) sx_xlock(lock) diff --git a/sys/cddl/compat/opensolaris/sys/rwlock.h b/sys/cddl/compat/opensolaris/sys/rwlock.h index e877175..a3e5515 100644 --- a/sys/cddl/compat/opensolaris/sys/rwlock.h +++ b/sys/cddl/compat/opensolaris/sys/rwlock.h @@ -60,10 +60,17 @@ typedef struct sx krwlock_t; #define RW_ISWRITER(x) (rw_iswriter(x)) #define rw_init(lock, desc, type, arg) do { \ + const char *_name; \ KASSERT(((lock)->lock_object.lo_flags & LO_ALLMASK) != \ LO_EXPECTED, ("lock %s already initialized", #lock)); \ bzero((lock), sizeof(struct sx)); \ - sx_init_flags((lock), "zfs:" #lock, RW_FLAGS); \ + for (_name = #lock; *_name != '\0'; _name++) { \ + if (*_name >= 'a' && *_name <= 'z') \ + break; \ + } \ + if (*_name == '\0') \ + _name = #lock; \ + sx_init_flags((lock), _name, RW_FLAGS); \ } while (0) #define rw_destroy(lock) sx_destroy(lock) #define rw_enter(lock, how) do { \ |