]> git.proxmox.com Git - mirror_zfs.git/commitdiff
Temporarily move taskq+util to libzpool until that directory is broken in to lib...
authorBrian Behlendorf <behlendorf1@llnl.gov>
Tue, 9 Dec 2008 21:32:01 +0000 (13:32 -0800)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Tue, 9 Dec 2008 21:32:01 +0000 (13:32 -0800)
scripts/update-zfs.sh
zfs/lib/libspl/include/sys/zfs_context.h [deleted file]
zfs/lib/libspl/taskq.c [deleted file]
zfs/lib/libspl/util.c [deleted file]
zfs/lib/libzpool/taskq.c [new file with mode: 0644]
zfs/lib/libzpool/util.c [new file with mode: 0644]

index 057dcc40b7241d4a900eb4f67d80080c01230a62..c7f4ff86901ee16625f8cf2c2f8989453f01f21b 100755 (executable)
@@ -86,9 +86,6 @@ cp ${SRC_LIB}/libuutil/common/*.h             ${DST_LIB}/libuutil/include/
 
 echo "* zfs/lib/libspl"
 mkdir -p ${DST_LIB}/libspl/include/sys/
-cp ${SRC_LIB}/libzpool/common/taskq.c          ${DST_LIB}/libspl/
-cp ${SRC_LIB}/libzpool/common/util.c           ${DST_LIB}/libspl/
-cp ${SRC_LIB}/libzpool/common/sys/zfs_context.h        ${DST_LIB}/libspl/include/sys/
 cp ${SRC_LIB}/libc/port/gen/strlcat.c          ${DST_LIB}/libspl/
 cp ${SRC_LIB}/libc/port/gen/strlcpy.c          ${DST_LIB}/libspl/
 cp ${SRC_LIB}/libc/port/gen/strnlen.c          ${DST_LIB}/libspl/
@@ -110,6 +107,9 @@ cp ${SRC_UCM}/sys/fm/fs/zfs.h                       ${DST_LIB}/libzcommon/include/sys/fm/fs/
 echo "* zfs/lib/libzpool"
 mkdir -p ${DST_LIB}/libzpool/include/sys/
 cp ${SRC_LIB}/libzpool/common/kernel.c         ${DST_LIB}/libzpool/
+cp ${SRC_LIB}/libzpool/common/taskq.c          ${DST_LIB}/libzpool/
+cp ${SRC_LIB}/libzpool/common/util.c           ${DST_LIB}/libzpool/
+#cp ${SRC_LIB}/libzpool/common/sys/zfs_context.h       ${DST_LIB}/libzpool/include/sys/
 cp ${SRC_ZLIB}/*.c                             ${DST_LIB}/libzpool/
 cp ${SRC_UTS}/intel/zfs/spa_boot.c             ${DST_LIB}/libzpool/
 cp ${SRC_ZLIB}/sys/*.h                         ${DST_LIB}/libzpool/include/sys/
diff --git a/zfs/lib/libspl/include/sys/zfs_context.h b/zfs/lib/libspl/include/sys/zfs_context.h
deleted file mode 100644 (file)
index 0e7019b..0000000
+++ /dev/null
@@ -1,547 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-#ifndef _SYS_ZFS_CONTEXT_H
-#define        _SYS_ZFS_CONTEXT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define        _SYS_MUTEX_H
-#define        _SYS_RWLOCK_H
-#define        _SYS_CONDVAR_H
-#define        _SYS_SYSTM_H
-#define        _SYS_DEBUG_H
-#define        _SYS_T_LOCK_H
-#define        _SYS_VNODE_H
-#define        _SYS_VFS_H
-#define        _SYS_SUNDDI_H
-#define        _SYS_CALLB_H
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <stdarg.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <strings.h>
-#include <synch.h>
-#include <thread.h>
-#include <assert.h>
-#include <alloca.h>
-#include <umem.h>
-#include <limits.h>
-#include <atomic.h>
-#include <dirent.h>
-#include <time.h>
-#include <sys/note.h>
-#include <sys/types.h>
-#include <sys/cred.h>
-#include <sys/sysmacros.h>
-#include <sys/bitmap.h>
-#include <sys/resource.h>
-#include <sys/byteorder.h>
-#include <sys/list.h>
-#include <sys/uio.h>
-#include <sys/zfs_debug.h>
-#include <sys/sdt.h>
-#include <sys/kstat.h>
-#include <sys/u8_textprep.h>
-#include <sys/sysevent/eventdefs.h>
-
-/*
- * Debugging
- */
-
-/*
- * Note that we are not using the debugging levels.
- */
-
-#define        CE_CONT         0       /* continuation         */
-#define        CE_NOTE         1       /* notice               */
-#define        CE_WARN         2       /* warning              */
-#define        CE_PANIC        3       /* panic                */
-#define        CE_IGNORE       4       /* print nothing        */
-
-/*
- * ZFS debugging
- */
-
-#ifdef ZFS_DEBUG
-extern void dprintf_setup(int *argc, char **argv);
-#endif /* ZFS_DEBUG */
-
-extern void cmn_err(int, const char *, ...);
-extern void vcmn_err(int, const char *, __va_list);
-extern void panic(const char *, ...);
-extern void vpanic(const char *, __va_list);
-
-#define        fm_panic        panic
-
-/* This definition is copied from assert.h. */
-#if defined(__STDC__)
-#if __STDC_VERSION__ - 0 >= 199901L
-#define        verify(EX) (void)((EX) || \
-       (__assert_c99(#EX, __FILE__, __LINE__, __func__), 0))
-#else
-#define        verify(EX) (void)((EX) || (__assert(#EX, __FILE__, __LINE__), 0))
-#endif /* __STDC_VERSION__ - 0 >= 199901L */
-#else
-#define        verify(EX) (void)((EX) || (_assert("EX", __FILE__, __LINE__), 0))
-#endif /* __STDC__ */
-
-
-#define        VERIFY  verify
-#define        ASSERT  assert
-
-extern void __assert(const char *, const char *, int);
-
-#ifdef lint
-#define        VERIFY3_IMPL(x, y, z, t)        if (x == z) ((void)0)
-#else
-/* BEGIN CSTYLED */
-#define        VERIFY3_IMPL(LEFT, OP, RIGHT, TYPE) do { \
-       const TYPE __left = (TYPE)(LEFT); \
-       const TYPE __right = (TYPE)(RIGHT); \
-       if (!(__left OP __right)) { \
-               char *__buf = alloca(256); \
-               (void) snprintf(__buf, 256, "%s %s %s (0x%llx %s 0x%llx)", \
-                       #LEFT, #OP, #RIGHT, \
-                       (u_longlong_t)__left, #OP, (u_longlong_t)__right); \
-               __assert(__buf, __FILE__, __LINE__); \
-       } \
-_NOTE(CONSTCOND) } while (0)
-/* END CSTYLED */
-#endif /* lint */
-
-#define        VERIFY3S(x, y, z)       VERIFY3_IMPL(x, y, z, int64_t)
-#define        VERIFY3U(x, y, z)       VERIFY3_IMPL(x, y, z, uint64_t)
-#define        VERIFY3P(x, y, z)       VERIFY3_IMPL(x, y, z, uintptr_t)
-
-#ifdef NDEBUG
-#define        ASSERT3S(x, y, z)       ((void)0)
-#define        ASSERT3U(x, y, z)       ((void)0)
-#define        ASSERT3P(x, y, z)       ((void)0)
-#else
-#define        ASSERT3S(x, y, z)       VERIFY3S(x, y, z)
-#define        ASSERT3U(x, y, z)       VERIFY3U(x, y, z)
-#define        ASSERT3P(x, y, z)       VERIFY3P(x, y, z)
-#endif
-
-/*
- * DTrace SDT probes have different signatures in userland than they do in
- * kernel.  If they're being used in kernel code, re-define them out of
- * existence for their counterparts in libzpool.
- */
-
-#ifdef DTRACE_PROBE
-#undef DTRACE_PROBE
-#define        DTRACE_PROBE(a) ((void)0)
-#endif /* DTRACE_PROBE */
-
-#ifdef DTRACE_PROBE1
-#undef DTRACE_PROBE1
-#define        DTRACE_PROBE1(a, b, c)  ((void)0)
-#endif /* DTRACE_PROBE1 */
-
-#ifdef DTRACE_PROBE2
-#undef DTRACE_PROBE2
-#define        DTRACE_PROBE2(a, b, c, d, e)    ((void)0)
-#endif /* DTRACE_PROBE2 */
-
-#ifdef DTRACE_PROBE3
-#undef DTRACE_PROBE3
-#define        DTRACE_PROBE3(a, b, c, d, e, f, g)      ((void)0)
-#endif /* DTRACE_PROBE3 */
-
-#ifdef DTRACE_PROBE4
-#undef DTRACE_PROBE4
-#define        DTRACE_PROBE4(a, b, c, d, e, f, g, h, i)        ((void)0)
-#endif /* DTRACE_PROBE4 */
-
-/*
- * Threads
- */
-#define        curthread       ((void *)(uintptr_t)thr_self())
-
-typedef struct kthread kthread_t;
-
-#define        thread_create(stk, stksize, func, arg, len, pp, state, pri)     \
-       zk_thread_create(func, arg)
-#define        thread_exit() thr_exit(NULL)
-
-extern kthread_t *zk_thread_create(void (*func)(), void *arg);
-
-#define        issig(why)      (FALSE)
-#define        ISSIG(thr, why) (FALSE)
-
-/*
- * Mutexes
- */
-typedef struct kmutex {
-       void            *m_owner;
-       boolean_t       initialized;
-       mutex_t         m_lock;
-} kmutex_t;
-
-#define        MUTEX_DEFAULT   USYNC_THREAD
-#undef MUTEX_HELD
-#define        MUTEX_HELD(m) _mutex_held(&(m)->m_lock)
-
-/*
- * Argh -- we have to get cheesy here because the kernel and userland
- * have different signatures for the same routine.
- */
-extern int _mutex_init(mutex_t *mp, int type, void *arg);
-extern int _mutex_destroy(mutex_t *mp);
-
-#define        mutex_init(mp, b, c, d)         zmutex_init((kmutex_t *)(mp))
-#define        mutex_destroy(mp)               zmutex_destroy((kmutex_t *)(mp))
-
-extern void zmutex_init(kmutex_t *mp);
-extern void zmutex_destroy(kmutex_t *mp);
-extern void mutex_enter(kmutex_t *mp);
-extern void mutex_exit(kmutex_t *mp);
-extern int mutex_tryenter(kmutex_t *mp);
-extern void *mutex_owner(kmutex_t *mp);
-
-/*
- * RW locks
- */
-typedef struct krwlock {
-       void            *rw_owner;
-       boolean_t       initialized;
-       rwlock_t        rw_lock;
-} krwlock_t;
-
-typedef int krw_t;
-
-#define        RW_READER       0
-#define        RW_WRITER       1
-#define        RW_DEFAULT      USYNC_THREAD
-
-#undef RW_READ_HELD
-#define        RW_READ_HELD(x)         _rw_read_held(&(x)->rw_lock)
-
-#undef RW_WRITE_HELD
-#define        RW_WRITE_HELD(x)        _rw_write_held(&(x)->rw_lock)
-
-extern void rw_init(krwlock_t *rwlp, char *name, int type, void *arg);
-extern void rw_destroy(krwlock_t *rwlp);
-extern void rw_enter(krwlock_t *rwlp, krw_t rw);
-extern int rw_tryenter(krwlock_t *rwlp, krw_t rw);
-extern int rw_tryupgrade(krwlock_t *rwlp);
-extern void rw_exit(krwlock_t *rwlp);
-#define        rw_downgrade(rwlp) do { } while (0)
-
-extern uid_t crgetuid(cred_t *cr);
-extern gid_t crgetgid(cred_t *cr);
-extern int crgetngroups(cred_t *cr);
-extern gid_t *crgetgroups(cred_t *cr);
-
-/*
- * Condition variables
- */
-typedef cond_t kcondvar_t;
-
-#define        CV_DEFAULT      USYNC_THREAD
-
-extern void cv_init(kcondvar_t *cv, char *name, int type, void *arg);
-extern void cv_destroy(kcondvar_t *cv);
-extern void cv_wait(kcondvar_t *cv, kmutex_t *mp);
-extern clock_t cv_timedwait(kcondvar_t *cv, kmutex_t *mp, clock_t abstime);
-extern void cv_signal(kcondvar_t *cv);
-extern void cv_broadcast(kcondvar_t *cv);
-
-/*
- * kstat creation, installation and deletion
- */
-extern kstat_t *kstat_create(char *, int,
-    char *, char *, uchar_t, ulong_t, uchar_t);
-extern void kstat_install(kstat_t *);
-extern void kstat_delete(kstat_t *);
-
-/*
- * Kernel memory
- */
-#define        KM_SLEEP                UMEM_NOFAIL
-#define        KM_PUSHPAGE             KM_SLEEP
-#define        KM_NOSLEEP              UMEM_DEFAULT
-#define        KMC_NODEBUG             UMC_NODEBUG
-#define        kmem_alloc(_s, _f)      umem_alloc(_s, _f)
-#define        kmem_zalloc(_s, _f)     umem_zalloc(_s, _f)
-#define        kmem_free(_b, _s)       umem_free(_b, _s)
-#define        kmem_cache_create(_a, _b, _c, _d, _e, _f, _g, _h, _i) \
-       umem_cache_create(_a, _b, _c, _d, _e, _f, _g, _h, _i)
-#define        kmem_cache_destroy(_c)  umem_cache_destroy(_c)
-#define        kmem_cache_alloc(_c, _f) umem_cache_alloc(_c, _f)
-#define        kmem_cache_free(_c, _b) umem_cache_free(_c, _b)
-#define        kmem_debugging()        0
-#define        kmem_cache_reap_now(c)
-
-typedef umem_cache_t kmem_cache_t;
-
-/*
- * Task queues
- */
-typedef struct taskq taskq_t;
-typedef uintptr_t taskqid_t;
-typedef void (task_func_t)(void *);
-
-#define        TASKQ_PREPOPULATE       0x0001
-#define        TASKQ_CPR_SAFE          0x0002  /* Use CPR safe protocol */
-#define        TASKQ_DYNAMIC           0x0004  /* Use dynamic thread scheduling */
-
-#define        TQ_SLEEP        KM_SLEEP        /* Can block for memory */
-#define        TQ_NOSLEEP      KM_NOSLEEP      /* cannot block for memory; may fail */
-#define        TQ_NOQUEUE      0x02    /* Do not enqueue if can't dispatch */
-
-extern taskq_t *system_taskq;
-
-extern taskq_t *taskq_create(const char *, int, pri_t, int, int, uint_t);
-extern taskqid_t taskq_dispatch(taskq_t *, task_func_t, void *, uint_t);
-extern void    taskq_destroy(taskq_t *);
-extern void    taskq_wait(taskq_t *);
-extern int     taskq_member(taskq_t *, void *);
-extern void    system_taskq_init(void);
-
-#define        XVA_MAPSIZE     3
-#define        XVA_MAGIC       0x78766174
-
-/*
- * vnodes
- */
-typedef struct vnode {
-       uint64_t        v_size;
-       int             v_fd;
-       char            *v_path;
-} vnode_t;
-
-
-typedef struct xoptattr {
-       timestruc_t     xoa_createtime; /* Create time of file */
-       uint8_t         xoa_archive;
-       uint8_t         xoa_system;
-       uint8_t         xoa_readonly;
-       uint8_t         xoa_hidden;
-       uint8_t         xoa_nounlink;
-       uint8_t         xoa_immutable;
-       uint8_t         xoa_appendonly;
-       uint8_t         xoa_nodump;
-       uint8_t         xoa_settable;
-       uint8_t         xoa_opaque;
-       uint8_t         xoa_av_quarantined;
-       uint8_t         xoa_av_modified;
-} xoptattr_t;
-
-typedef struct vattr {
-       uint_t          va_mask;        /* bit-mask of attributes */
-       u_offset_t      va_size;        /* file size in bytes */
-} vattr_t;
-
-
-typedef struct xvattr {
-       vattr_t         xva_vattr;      /* Embedded vattr structure */
-       uint32_t        xva_magic;      /* Magic Number */
-       uint32_t        xva_mapsize;    /* Size of attr bitmap (32-bit words) */
-       uint32_t        *xva_rtnattrmapp;       /* Ptr to xva_rtnattrmap[] */
-       uint32_t        xva_reqattrmap[XVA_MAPSIZE];    /* Requested attrs */
-       uint32_t        xva_rtnattrmap[XVA_MAPSIZE];    /* Returned attrs */
-       xoptattr_t      xva_xoptattrs;  /* Optional attributes */
-} xvattr_t;
-
-typedef struct vsecattr {
-       uint_t          vsa_mask;       /* See below */
-       int             vsa_aclcnt;     /* ACL entry count */
-       void            *vsa_aclentp;   /* pointer to ACL entries */
-       int             vsa_dfaclcnt;   /* default ACL entry count */
-       void            *vsa_dfaclentp; /* pointer to default ACL entries */
-       size_t          vsa_aclentsz;   /* ACE size in bytes of vsa_aclentp */
-} vsecattr_t;
-
-#define        AT_TYPE         0x00001
-#define        AT_MODE         0x00002
-#define        AT_UID          0x00004
-#define        AT_GID          0x00008
-#define        AT_FSID         0x00010
-#define        AT_NODEID       0x00020
-#define        AT_NLINK        0x00040
-#define        AT_SIZE         0x00080
-#define        AT_ATIME        0x00100
-#define        AT_MTIME        0x00200
-#define        AT_CTIME        0x00400
-#define        AT_RDEV         0x00800
-#define        AT_BLKSIZE      0x01000
-#define        AT_NBLOCKS      0x02000
-#define        AT_SEQ          0x08000
-#define        AT_XVATTR       0x10000
-
-#define        CRCREAT         0
-
-#define        VOP_CLOSE(vp, f, c, o, cr, ct)  0
-#define        VOP_PUTPAGE(vp, of, sz, fl, cr, ct)     0
-#define        VOP_GETATTR(vp, vap, fl, cr, ct)  ((vap)->va_size = (vp)->v_size, 0)
-
-#define        VOP_FSYNC(vp, f, cr, ct)        fsync((vp)->v_fd)
-
-#define        VN_RELE(vp)     vn_close(vp)
-
-extern int vn_open(char *path, int x1, int oflags, int mode, vnode_t **vpp,
-    int x2, int x3);
-extern int vn_openat(char *path, int x1, int oflags, int mode, vnode_t **vpp,
-    int x2, int x3, vnode_t *vp, int fd);
-extern int vn_rdwr(int uio, vnode_t *vp, void *addr, ssize_t len,
-    offset_t offset, int x1, int x2, rlim64_t x3, void *x4, ssize_t *residp);
-extern void vn_close(vnode_t *vp);
-
-#define        vn_remove(path, x1, x2)         remove(path)
-#define        vn_rename(from, to, seg)        rename((from), (to))
-#define        vn_is_readonly(vp)              B_FALSE
-
-extern vnode_t *rootdir;
-
-#include <sys/file.h>          /* for FREAD, FWRITE, etc */
-
-/*
- * Random stuff
- */
-#define        lbolt   (gethrtime() >> 23)
-#define        lbolt64 (gethrtime() >> 23)
-#define        hz      119     /* frequency when using gethrtime() >> 23 for lbolt */
-
-extern void delay(clock_t ticks);
-
-#define        gethrestime_sec() time(NULL)
-
-#define        max_ncpus       64
-
-#define        minclsyspri     60
-#define        maxclsyspri     99
-
-#define        CPU_SEQID       (thr_self() & (max_ncpus - 1))
-
-#define        kcred           NULL
-#define        CRED()          NULL
-
-#define        ptob(x)         ((x) * PAGESIZE)
-
-extern uint64_t physmem;
-
-extern int highbit(ulong_t i);
-extern int random_get_bytes(uint8_t *ptr, size_t len);
-extern int random_get_pseudo_bytes(uint8_t *ptr, size_t len);
-
-extern void kernel_init(int);
-extern void kernel_fini(void);
-
-struct spa;
-extern void nicenum(uint64_t num, char *buf);
-extern void show_pool_stats(struct spa *);
-
-typedef struct callb_cpr {
-       kmutex_t        *cc_lockp;
-} callb_cpr_t;
-
-#define        CALLB_CPR_INIT(cp, lockp, func, name)   {               \
-       (cp)->cc_lockp = lockp;                                 \
-}
-
-#define        CALLB_CPR_SAFE_BEGIN(cp) {                              \
-       ASSERT(MUTEX_HELD((cp)->cc_lockp));                     \
-}
-
-#define        CALLB_CPR_SAFE_END(cp, lockp) {                         \
-       ASSERT(MUTEX_HELD((cp)->cc_lockp));                     \
-}
-
-#define        CALLB_CPR_EXIT(cp) {                                    \
-       ASSERT(MUTEX_HELD((cp)->cc_lockp));                     \
-       mutex_exit((cp)->cc_lockp);                             \
-}
-
-#define        zone_dataset_visible(x, y)      (1)
-#define        INGLOBALZONE(z)                 (1)
-
-/*
- * Hostname information
- */
-extern char hw_serial[];
-extern int ddi_strtoul(const char *str, char **nptr, int base,
-    unsigned long *result);
-
-/* ZFS Boot Related stuff. */
-
-struct _buf {
-       intptr_t        _fd;
-};
-
-struct bootstat {
-       uint64_t st_size;
-};
-
-typedef struct ace_object {
-       uid_t           a_who;
-       uint32_t        a_access_mask;
-       uint16_t        a_flags;
-       uint16_t        a_type;
-       uint8_t         a_obj_type[16];
-       uint8_t         a_inherit_obj_type[16];
-} ace_object_t;
-
-
-#define        ACE_ACCESS_ALLOWED_OBJECT_ACE_TYPE      0x05
-#define        ACE_ACCESS_DENIED_OBJECT_ACE_TYPE       0x06
-#define        ACE_SYSTEM_AUDIT_OBJECT_ACE_TYPE        0x07
-#define        ACE_SYSTEM_ALARM_OBJECT_ACE_TYPE        0x08
-
-extern struct _buf *kobj_open_file(char *name);
-extern int kobj_read_file(struct _buf *file, char *buf, unsigned size,
-    unsigned off);
-extern void kobj_close_file(struct _buf *file);
-extern int kobj_get_filesize(struct _buf *file, uint64_t *size);
-extern int zfs_secpolicy_snapshot_perms(const char *name, cred_t *cr);
-extern int zfs_secpolicy_rename_perms(const char *from, const char *to,
-    cred_t *cr);
-extern int zfs_secpolicy_destroy_perms(const char *name, cred_t *cr);
-extern zoneid_t getzoneid(void);
-
-/* SID stuff */
-typedef struct ksiddomain {
-       uint_t  kd_ref;
-       uint_t  kd_len;
-       char    *kd_name;
-} ksiddomain_t;
-
-ksiddomain_t *ksid_lookupdomain(const char *);
-void ksiddomain_rele(ksiddomain_t *);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _SYS_ZFS_CONTEXT_H */
diff --git a/zfs/lib/libspl/taskq.c b/zfs/lib/libspl/taskq.c
deleted file mode 100644 (file)
index 93acdcf..0000000
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-#include <sys/zfs_context.h>
-
-int taskq_now;
-taskq_t *system_taskq;
-
-typedef struct task {
-       struct task     *task_next;
-       struct task     *task_prev;
-       task_func_t     *task_func;
-       void            *task_arg;
-} task_t;
-
-#define        TASKQ_ACTIVE    0x00010000
-
-struct taskq {
-       kmutex_t        tq_lock;
-       krwlock_t       tq_threadlock;
-       kcondvar_t      tq_dispatch_cv;
-       kcondvar_t      tq_wait_cv;
-       thread_t        *tq_threadlist;
-       int             tq_flags;
-       int             tq_active;
-       int             tq_nthreads;
-       int             tq_nalloc;
-       int             tq_minalloc;
-       int             tq_maxalloc;
-       task_t          *tq_freelist;
-       task_t          tq_task;
-};
-
-static task_t *
-task_alloc(taskq_t *tq, int tqflags)
-{
-       task_t *t;
-
-       if ((t = tq->tq_freelist) != NULL && tq->tq_nalloc >= tq->tq_minalloc) {
-               tq->tq_freelist = t->task_next;
-       } else {
-               mutex_exit(&tq->tq_lock);
-               if (tq->tq_nalloc >= tq->tq_maxalloc) {
-                       if (!(tqflags & KM_SLEEP)) {
-                               mutex_enter(&tq->tq_lock);
-                               return (NULL);
-                       }
-                       /*
-                        * We don't want to exceed tq_maxalloc, but we can't
-                        * wait for other tasks to complete (and thus free up
-                        * task structures) without risking deadlock with
-                        * the caller.  So, we just delay for one second
-                        * to throttle the allocation rate.
-                        */
-                       delay(hz);
-               }
-               t = kmem_alloc(sizeof (task_t), tqflags);
-               mutex_enter(&tq->tq_lock);
-               if (t != NULL)
-                       tq->tq_nalloc++;
-       }
-       return (t);
-}
-
-static void
-task_free(taskq_t *tq, task_t *t)
-{
-       if (tq->tq_nalloc <= tq->tq_minalloc) {
-               t->task_next = tq->tq_freelist;
-               tq->tq_freelist = t;
-       } else {
-               tq->tq_nalloc--;
-               mutex_exit(&tq->tq_lock);
-               kmem_free(t, sizeof (task_t));
-               mutex_enter(&tq->tq_lock);
-       }
-}
-
-taskqid_t
-taskq_dispatch(taskq_t *tq, task_func_t func, void *arg, uint_t tqflags)
-{
-       task_t *t;
-
-       if (taskq_now) {
-               func(arg);
-               return (1);
-       }
-
-       mutex_enter(&tq->tq_lock);
-       ASSERT(tq->tq_flags & TASKQ_ACTIVE);
-       if ((t = task_alloc(tq, tqflags)) == NULL) {
-               mutex_exit(&tq->tq_lock);
-               return (0);
-       }
-       t->task_next = &tq->tq_task;
-       t->task_prev = tq->tq_task.task_prev;
-       t->task_next->task_prev = t;
-       t->task_prev->task_next = t;
-       t->task_func = func;
-       t->task_arg = arg;
-       cv_signal(&tq->tq_dispatch_cv);
-       mutex_exit(&tq->tq_lock);
-       return (1);
-}
-
-void
-taskq_wait(taskq_t *tq)
-{
-       mutex_enter(&tq->tq_lock);
-       while (tq->tq_task.task_next != &tq->tq_task || tq->tq_active != 0)
-               cv_wait(&tq->tq_wait_cv, &tq->tq_lock);
-       mutex_exit(&tq->tq_lock);
-}
-
-static void *
-taskq_thread(void *arg)
-{
-       taskq_t *tq = arg;
-       task_t *t;
-
-       mutex_enter(&tq->tq_lock);
-       while (tq->tq_flags & TASKQ_ACTIVE) {
-               if ((t = tq->tq_task.task_next) == &tq->tq_task) {
-                       if (--tq->tq_active == 0)
-                               cv_broadcast(&tq->tq_wait_cv);
-                       cv_wait(&tq->tq_dispatch_cv, &tq->tq_lock);
-                       tq->tq_active++;
-                       continue;
-               }
-               t->task_prev->task_next = t->task_next;
-               t->task_next->task_prev = t->task_prev;
-               mutex_exit(&tq->tq_lock);
-
-               rw_enter(&tq->tq_threadlock, RW_READER);
-               t->task_func(t->task_arg);
-               rw_exit(&tq->tq_threadlock);
-
-               mutex_enter(&tq->tq_lock);
-               task_free(tq, t);
-       }
-       tq->tq_nthreads--;
-       cv_broadcast(&tq->tq_wait_cv);
-       mutex_exit(&tq->tq_lock);
-       return (NULL);
-}
-
-/*ARGSUSED*/
-taskq_t *
-taskq_create(const char *name, int nthreads, pri_t pri,
-       int minalloc, int maxalloc, uint_t flags)
-{
-       taskq_t *tq = kmem_zalloc(sizeof (taskq_t), KM_SLEEP);
-       int t;
-
-       rw_init(&tq->tq_threadlock, NULL, RW_DEFAULT, NULL);
-       mutex_init(&tq->tq_lock, NULL, MUTEX_DEFAULT, NULL);
-       cv_init(&tq->tq_dispatch_cv, NULL, CV_DEFAULT, NULL);
-       cv_init(&tq->tq_wait_cv, NULL, CV_DEFAULT, NULL);
-       tq->tq_flags = flags | TASKQ_ACTIVE;
-       tq->tq_active = nthreads;
-       tq->tq_nthreads = nthreads;
-       tq->tq_minalloc = minalloc;
-       tq->tq_maxalloc = maxalloc;
-       tq->tq_task.task_next = &tq->tq_task;
-       tq->tq_task.task_prev = &tq->tq_task;
-       tq->tq_threadlist = kmem_alloc(nthreads * sizeof (thread_t), KM_SLEEP);
-
-       if (flags & TASKQ_PREPOPULATE) {
-               mutex_enter(&tq->tq_lock);
-               while (minalloc-- > 0)
-                       task_free(tq, task_alloc(tq, KM_SLEEP));
-               mutex_exit(&tq->tq_lock);
-       }
-
-       for (t = 0; t < nthreads; t++)
-               (void) thr_create(0, 0, taskq_thread,
-                   tq, THR_BOUND, &tq->tq_threadlist[t]);
-
-       return (tq);
-}
-
-void
-taskq_destroy(taskq_t *tq)
-{
-       int t;
-       int nthreads = tq->tq_nthreads;
-
-       taskq_wait(tq);
-
-       mutex_enter(&tq->tq_lock);
-
-       tq->tq_flags &= ~TASKQ_ACTIVE;
-       cv_broadcast(&tq->tq_dispatch_cv);
-
-       while (tq->tq_nthreads != 0)
-               cv_wait(&tq->tq_wait_cv, &tq->tq_lock);
-
-       tq->tq_minalloc = 0;
-       while (tq->tq_nalloc != 0) {
-               ASSERT(tq->tq_freelist != NULL);
-               task_free(tq, task_alloc(tq, KM_SLEEP));
-       }
-
-       mutex_exit(&tq->tq_lock);
-
-       for (t = 0; t < nthreads; t++)
-               (void) thr_join(tq->tq_threadlist[t], NULL, NULL);
-
-       kmem_free(tq->tq_threadlist, nthreads * sizeof (thread_t));
-
-       rw_destroy(&tq->tq_threadlock);
-       mutex_destroy(&tq->tq_lock);
-       cv_destroy(&tq->tq_dispatch_cv);
-       cv_destroy(&tq->tq_wait_cv);
-
-       kmem_free(tq, sizeof (taskq_t));
-}
-
-int
-taskq_member(taskq_t *tq, void *t)
-{
-       int i;
-
-       if (taskq_now)
-               return (1);
-
-       for (i = 0; i < tq->tq_nthreads; i++)
-               if (tq->tq_threadlist[i] == (thread_t)(uintptr_t)t)
-                       return (1);
-
-       return (0);
-}
-
-void
-system_taskq_init(void)
-{
-       system_taskq = taskq_create("system_taskq", 64, minclsyspri, 4, 512,
-           TASKQ_DYNAMIC | TASKQ_PREPOPULATE);
-}
diff --git a/zfs/lib/libspl/util.c b/zfs/lib/libspl/util.c
deleted file mode 100644 (file)
index 781edb6..0000000
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-#include <assert.h>
-#include <sys/zfs_context.h>
-#include <sys/avl.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/spa.h>
-#include <sys/fs/zfs.h>
-#include <sys/refcount.h>
-
-/*
- * Routines needed by more than one client of libzpool.
- */
-
-void
-nicenum(uint64_t num, char *buf)
-{
-       uint64_t n = num;
-       int index = 0;
-       char u;
-
-       while (n >= 1024) {
-               n = (n + (1024 / 2)) / 1024; /* Round up or down */
-               index++;
-       }
-
-       u = " KMGTPE"[index];
-
-       if (index == 0) {
-               (void) sprintf(buf, "%llu", (u_longlong_t)n);
-       } else if (n < 10 && (num & (num - 1)) != 0) {
-               (void) sprintf(buf, "%.2f%c",
-                   (double)num / (1ULL << 10 * index), u);
-       } else if (n < 100 && (num & (num - 1)) != 0) {
-               (void) sprintf(buf, "%.1f%c",
-                   (double)num / (1ULL << 10 * index), u);
-       } else {
-               (void) sprintf(buf, "%llu%c", (u_longlong_t)n, u);
-       }
-}
-
-static void
-show_vdev_stats(const char *desc, const char *ctype, nvlist_t *nv, int indent)
-{
-       vdev_stat_t *vs;
-       vdev_stat_t v0 = { 0 };
-       uint64_t sec;
-       uint64_t is_log = 0;
-       nvlist_t **child;
-       uint_t c, children;
-       char used[6], avail[6];
-       char rops[6], wops[6], rbytes[6], wbytes[6], rerr[6], werr[6], cerr[6];
-       char *prefix = "";
-
-       if (indent == 0 && desc != NULL) {
-               (void) printf("                           "
-                   " capacity   operations   bandwidth  ---- errors ----\n");
-               (void) printf("description                "
-                   "used avail  read write  read write  read write cksum\n");
-       }
-
-       if (desc != NULL) {
-               (void) nvlist_lookup_uint64(nv, ZPOOL_CONFIG_IS_LOG, &is_log);
-
-               if (is_log)
-                       prefix = "log ";
-
-               if (nvlist_lookup_uint64_array(nv, ZPOOL_CONFIG_STATS,
-                   (uint64_t **)&vs, &c) != 0)
-                       vs = &v0;
-
-               sec = MAX(1, vs->vs_timestamp / NANOSEC);
-
-               nicenum(vs->vs_alloc, used);
-               nicenum(vs->vs_space - vs->vs_alloc, avail);
-               nicenum(vs->vs_ops[ZIO_TYPE_READ] / sec, rops);
-               nicenum(vs->vs_ops[ZIO_TYPE_WRITE] / sec, wops);
-               nicenum(vs->vs_bytes[ZIO_TYPE_READ] / sec, rbytes);
-               nicenum(vs->vs_bytes[ZIO_TYPE_WRITE] / sec, wbytes);
-               nicenum(vs->vs_read_errors, rerr);
-               nicenum(vs->vs_write_errors, werr);
-               nicenum(vs->vs_checksum_errors, cerr);
-
-               (void) printf("%*s%s%*s%*s%*s %5s %5s %5s %5s %5s %5s %5s\n",
-                   indent, "",
-                   prefix,
-                   indent + strlen(prefix) - 25 - (vs->vs_space ? 0 : 12),
-                   desc,
-                   vs->vs_space ? 6 : 0, vs->vs_space ? used : "",
-                   vs->vs_space ? 6 : 0, vs->vs_space ? avail : "",
-                   rops, wops, rbytes, wbytes, rerr, werr, cerr);
-       }
-
-       if (nvlist_lookup_nvlist_array(nv, ctype, &child, &children) != 0)
-               return;
-
-       for (c = 0; c < children; c++) {
-               nvlist_t *cnv = child[c];
-               char *cname, *tname;
-               uint64_t np;
-               if (nvlist_lookup_string(cnv, ZPOOL_CONFIG_PATH, &cname) &&
-                   nvlist_lookup_string(cnv, ZPOOL_CONFIG_TYPE, &cname))
-                       cname = "<unknown>";
-               tname = calloc(1, strlen(cname) + 2);
-               (void) strcpy(tname, cname);
-               if (nvlist_lookup_uint64(cnv, ZPOOL_CONFIG_NPARITY, &np) == 0)
-                       tname[strlen(tname)] = '0' + np;
-               show_vdev_stats(tname, ctype, cnv, indent + 2);
-               free(tname);
-       }
-}
-
-void
-show_pool_stats(spa_t *spa)
-{
-       nvlist_t *config, *nvroot;
-       char *name;
-
-       VERIFY(spa_get_stats(spa_name(spa), &config, NULL, 0) == 0);
-
-       VERIFY(nvlist_lookup_nvlist(config, ZPOOL_CONFIG_VDEV_TREE,
-           &nvroot) == 0);
-       VERIFY(nvlist_lookup_string(config, ZPOOL_CONFIG_POOL_NAME,
-           &name) == 0);
-
-       show_vdev_stats(name, ZPOOL_CONFIG_CHILDREN, nvroot, 0);
-       show_vdev_stats(NULL, ZPOOL_CONFIG_L2CACHE, nvroot, 0);
-       show_vdev_stats(NULL, ZPOOL_CONFIG_SPARES, nvroot, 0);
-
-       nvlist_free(config);
-}
diff --git a/zfs/lib/libzpool/taskq.c b/zfs/lib/libzpool/taskq.c
new file mode 100644 (file)
index 0000000..93acdcf
--- /dev/null
@@ -0,0 +1,261 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+/*
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#include <sys/zfs_context.h>
+
+int taskq_now;
+taskq_t *system_taskq;
+
+typedef struct task {
+       struct task     *task_next;
+       struct task     *task_prev;
+       task_func_t     *task_func;
+       void            *task_arg;
+} task_t;
+
+#define        TASKQ_ACTIVE    0x00010000
+
+struct taskq {
+       kmutex_t        tq_lock;
+       krwlock_t       tq_threadlock;
+       kcondvar_t      tq_dispatch_cv;
+       kcondvar_t      tq_wait_cv;
+       thread_t        *tq_threadlist;
+       int             tq_flags;
+       int             tq_active;
+       int             tq_nthreads;
+       int             tq_nalloc;
+       int             tq_minalloc;
+       int             tq_maxalloc;
+       task_t          *tq_freelist;
+       task_t          tq_task;
+};
+
+static task_t *
+task_alloc(taskq_t *tq, int tqflags)
+{
+       task_t *t;
+
+       if ((t = tq->tq_freelist) != NULL && tq->tq_nalloc >= tq->tq_minalloc) {
+               tq->tq_freelist = t->task_next;
+       } else {
+               mutex_exit(&tq->tq_lock);
+               if (tq->tq_nalloc >= tq->tq_maxalloc) {
+                       if (!(tqflags & KM_SLEEP)) {
+                               mutex_enter(&tq->tq_lock);
+                               return (NULL);
+                       }
+                       /*
+                        * We don't want to exceed tq_maxalloc, but we can't
+                        * wait for other tasks to complete (and thus free up
+                        * task structures) without risking deadlock with
+                        * the caller.  So, we just delay for one second
+                        * to throttle the allocation rate.
+                        */
+                       delay(hz);
+               }
+               t = kmem_alloc(sizeof (task_t), tqflags);
+               mutex_enter(&tq->tq_lock);
+               if (t != NULL)
+                       tq->tq_nalloc++;
+       }
+       return (t);
+}
+
+static void
+task_free(taskq_t *tq, task_t *t)
+{
+       if (tq->tq_nalloc <= tq->tq_minalloc) {
+               t->task_next = tq->tq_freelist;
+               tq->tq_freelist = t;
+       } else {
+               tq->tq_nalloc--;
+               mutex_exit(&tq->tq_lock);
+               kmem_free(t, sizeof (task_t));
+               mutex_enter(&tq->tq_lock);
+       }
+}
+
+taskqid_t
+taskq_dispatch(taskq_t *tq, task_func_t func, void *arg, uint_t tqflags)
+{
+       task_t *t;
+
+       if (taskq_now) {
+               func(arg);
+               return (1);
+       }
+
+       mutex_enter(&tq->tq_lock);
+       ASSERT(tq->tq_flags & TASKQ_ACTIVE);
+       if ((t = task_alloc(tq, tqflags)) == NULL) {
+               mutex_exit(&tq->tq_lock);
+               return (0);
+       }
+       t->task_next = &tq->tq_task;
+       t->task_prev = tq->tq_task.task_prev;
+       t->task_next->task_prev = t;
+       t->task_prev->task_next = t;
+       t->task_func = func;
+       t->task_arg = arg;
+       cv_signal(&tq->tq_dispatch_cv);
+       mutex_exit(&tq->tq_lock);
+       return (1);
+}
+
+void
+taskq_wait(taskq_t *tq)
+{
+       mutex_enter(&tq->tq_lock);
+       while (tq->tq_task.task_next != &tq->tq_task || tq->tq_active != 0)
+               cv_wait(&tq->tq_wait_cv, &tq->tq_lock);
+       mutex_exit(&tq->tq_lock);
+}
+
+static void *
+taskq_thread(void *arg)
+{
+       taskq_t *tq = arg;
+       task_t *t;
+
+       mutex_enter(&tq->tq_lock);
+       while (tq->tq_flags & TASKQ_ACTIVE) {
+               if ((t = tq->tq_task.task_next) == &tq->tq_task) {
+                       if (--tq->tq_active == 0)
+                               cv_broadcast(&tq->tq_wait_cv);
+                       cv_wait(&tq->tq_dispatch_cv, &tq->tq_lock);
+                       tq->tq_active++;
+                       continue;
+               }
+               t->task_prev->task_next = t->task_next;
+               t->task_next->task_prev = t->task_prev;
+               mutex_exit(&tq->tq_lock);
+
+               rw_enter(&tq->tq_threadlock, RW_READER);
+               t->task_func(t->task_arg);
+               rw_exit(&tq->tq_threadlock);
+
+               mutex_enter(&tq->tq_lock);
+               task_free(tq, t);
+       }
+       tq->tq_nthreads--;
+       cv_broadcast(&tq->tq_wait_cv);
+       mutex_exit(&tq->tq_lock);
+       return (NULL);
+}
+
+/*ARGSUSED*/
+taskq_t *
+taskq_create(const char *name, int nthreads, pri_t pri,
+       int minalloc, int maxalloc, uint_t flags)
+{
+       taskq_t *tq = kmem_zalloc(sizeof (taskq_t), KM_SLEEP);
+       int t;
+
+       rw_init(&tq->tq_threadlock, NULL, RW_DEFAULT, NULL);
+       mutex_init(&tq->tq_lock, NULL, MUTEX_DEFAULT, NULL);
+       cv_init(&tq->tq_dispatch_cv, NULL, CV_DEFAULT, NULL);
+       cv_init(&tq->tq_wait_cv, NULL, CV_DEFAULT, NULL);
+       tq->tq_flags = flags | TASKQ_ACTIVE;
+       tq->tq_active = nthreads;
+       tq->tq_nthreads = nthreads;
+       tq->tq_minalloc = minalloc;
+       tq->tq_maxalloc = maxalloc;
+       tq->tq_task.task_next = &tq->tq_task;
+       tq->tq_task.task_prev = &tq->tq_task;
+       tq->tq_threadlist = kmem_alloc(nthreads * sizeof (thread_t), KM_SLEEP);
+
+       if (flags & TASKQ_PREPOPULATE) {
+               mutex_enter(&tq->tq_lock);
+               while (minalloc-- > 0)
+                       task_free(tq, task_alloc(tq, KM_SLEEP));
+               mutex_exit(&tq->tq_lock);
+       }
+
+       for (t = 0; t < nthreads; t++)
+               (void) thr_create(0, 0, taskq_thread,
+                   tq, THR_BOUND, &tq->tq_threadlist[t]);
+
+       return (tq);
+}
+
+void
+taskq_destroy(taskq_t *tq)
+{
+       int t;
+       int nthreads = tq->tq_nthreads;
+
+       taskq_wait(tq);
+
+       mutex_enter(&tq->tq_lock);
+
+       tq->tq_flags &= ~TASKQ_ACTIVE;
+       cv_broadcast(&tq->tq_dispatch_cv);
+
+       while (tq->tq_nthreads != 0)
+               cv_wait(&tq->tq_wait_cv, &tq->tq_lock);
+
+       tq->tq_minalloc = 0;
+       while (tq->tq_nalloc != 0) {
+               ASSERT(tq->tq_freelist != NULL);
+               task_free(tq, task_alloc(tq, KM_SLEEP));
+       }
+
+       mutex_exit(&tq->tq_lock);
+
+       for (t = 0; t < nthreads; t++)
+               (void) thr_join(tq->tq_threadlist[t], NULL, NULL);
+
+       kmem_free(tq->tq_threadlist, nthreads * sizeof (thread_t));
+
+       rw_destroy(&tq->tq_threadlock);
+       mutex_destroy(&tq->tq_lock);
+       cv_destroy(&tq->tq_dispatch_cv);
+       cv_destroy(&tq->tq_wait_cv);
+
+       kmem_free(tq, sizeof (taskq_t));
+}
+
+int
+taskq_member(taskq_t *tq, void *t)
+{
+       int i;
+
+       if (taskq_now)
+               return (1);
+
+       for (i = 0; i < tq->tq_nthreads; i++)
+               if (tq->tq_threadlist[i] == (thread_t)(uintptr_t)t)
+                       return (1);
+
+       return (0);
+}
+
+void
+system_taskq_init(void)
+{
+       system_taskq = taskq_create("system_taskq", 64, minclsyspri, 4, 512,
+           TASKQ_DYNAMIC | TASKQ_PREPOPULATE);
+}
diff --git a/zfs/lib/libzpool/util.c b/zfs/lib/libzpool/util.c
new file mode 100644 (file)
index 0000000..781edb6
--- /dev/null
@@ -0,0 +1,156 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+/*
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#include <assert.h>
+#include <sys/zfs_context.h>
+#include <sys/avl.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/spa.h>
+#include <sys/fs/zfs.h>
+#include <sys/refcount.h>
+
+/*
+ * Routines needed by more than one client of libzpool.
+ */
+
+void
+nicenum(uint64_t num, char *buf)
+{
+       uint64_t n = num;
+       int index = 0;
+       char u;
+
+       while (n >= 1024) {
+               n = (n + (1024 / 2)) / 1024; /* Round up or down */
+               index++;
+       }
+
+       u = " KMGTPE"[index];
+
+       if (index == 0) {
+               (void) sprintf(buf, "%llu", (u_longlong_t)n);
+       } else if (n < 10 && (num & (num - 1)) != 0) {
+               (void) sprintf(buf, "%.2f%c",
+                   (double)num / (1ULL << 10 * index), u);
+       } else if (n < 100 && (num & (num - 1)) != 0) {
+               (void) sprintf(buf, "%.1f%c",
+                   (double)num / (1ULL << 10 * index), u);
+       } else {
+               (void) sprintf(buf, "%llu%c", (u_longlong_t)n, u);
+       }
+}
+
+static void
+show_vdev_stats(const char *desc, const char *ctype, nvlist_t *nv, int indent)
+{
+       vdev_stat_t *vs;
+       vdev_stat_t v0 = { 0 };
+       uint64_t sec;
+       uint64_t is_log = 0;
+       nvlist_t **child;
+       uint_t c, children;
+       char used[6], avail[6];
+       char rops[6], wops[6], rbytes[6], wbytes[6], rerr[6], werr[6], cerr[6];
+       char *prefix = "";
+
+       if (indent == 0 && desc != NULL) {
+               (void) printf("                           "
+                   " capacity   operations   bandwidth  ---- errors ----\n");
+               (void) printf("description                "
+                   "used avail  read write  read write  read write cksum\n");
+       }
+
+       if (desc != NULL) {
+               (void) nvlist_lookup_uint64(nv, ZPOOL_CONFIG_IS_LOG, &is_log);
+
+               if (is_log)
+                       prefix = "log ";
+
+               if (nvlist_lookup_uint64_array(nv, ZPOOL_CONFIG_STATS,
+                   (uint64_t **)&vs, &c) != 0)
+                       vs = &v0;
+
+               sec = MAX(1, vs->vs_timestamp / NANOSEC);
+
+               nicenum(vs->vs_alloc, used);
+               nicenum(vs->vs_space - vs->vs_alloc, avail);
+               nicenum(vs->vs_ops[ZIO_TYPE_READ] / sec, rops);
+               nicenum(vs->vs_ops[ZIO_TYPE_WRITE] / sec, wops);
+               nicenum(vs->vs_bytes[ZIO_TYPE_READ] / sec, rbytes);
+               nicenum(vs->vs_bytes[ZIO_TYPE_WRITE] / sec, wbytes);
+               nicenum(vs->vs_read_errors, rerr);
+               nicenum(vs->vs_write_errors, werr);
+               nicenum(vs->vs_checksum_errors, cerr);
+
+               (void) printf("%*s%s%*s%*s%*s %5s %5s %5s %5s %5s %5s %5s\n",
+                   indent, "",
+                   prefix,
+                   indent + strlen(prefix) - 25 - (vs->vs_space ? 0 : 12),
+                   desc,
+                   vs->vs_space ? 6 : 0, vs->vs_space ? used : "",
+                   vs->vs_space ? 6 : 0, vs->vs_space ? avail : "",
+                   rops, wops, rbytes, wbytes, rerr, werr, cerr);
+       }
+
+       if (nvlist_lookup_nvlist_array(nv, ctype, &child, &children) != 0)
+               return;
+
+       for (c = 0; c < children; c++) {
+               nvlist_t *cnv = child[c];
+               char *cname, *tname;
+               uint64_t np;
+               if (nvlist_lookup_string(cnv, ZPOOL_CONFIG_PATH, &cname) &&
+                   nvlist_lookup_string(cnv, ZPOOL_CONFIG_TYPE, &cname))
+                       cname = "<unknown>";
+               tname = calloc(1, strlen(cname) + 2);
+               (void) strcpy(tname, cname);
+               if (nvlist_lookup_uint64(cnv, ZPOOL_CONFIG_NPARITY, &np) == 0)
+                       tname[strlen(tname)] = '0' + np;
+               show_vdev_stats(tname, ctype, cnv, indent + 2);
+               free(tname);
+       }
+}
+
+void
+show_pool_stats(spa_t *spa)
+{
+       nvlist_t *config, *nvroot;
+       char *name;
+
+       VERIFY(spa_get_stats(spa_name(spa), &config, NULL, 0) == 0);
+
+       VERIFY(nvlist_lookup_nvlist(config, ZPOOL_CONFIG_VDEV_TREE,
+           &nvroot) == 0);
+       VERIFY(nvlist_lookup_string(config, ZPOOL_CONFIG_POOL_NAME,
+           &name) == 0);
+
+       show_vdev_stats(name, ZPOOL_CONFIG_CHILDREN, nvroot, 0);
+       show_vdev_stats(NULL, ZPOOL_CONFIG_L2CACHE, nvroot, 0);
+       show_vdev_stats(NULL, ZPOOL_CONFIG_SPARES, nvroot, 0);
+
+       nvlist_free(config);
+}