Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/cddl/osnet/dist import new CDDL dtrace and ZFS code...
details: https://anonhg.NetBSD.org/src/rev/4ffd2b256dfd
branches: trunk
changeset: 832791:4ffd2b256dfd
user: chs <chs%NetBSD.org@localhost>
date: Mon May 28 20:52:50 2018 +0000
description:
import new CDDL dtrace and ZFS code from FreeBSD svn r315983.
diffstat:
external/cddl/osnet/dist/cmd/pyzfs/pyzfs.py | 79 +
external/cddl/osnet/dist/cmd/stat/common/timestamp.c | 49 +
external/cddl/osnet/dist/cmd/zfs/zfs_iter.c | 75 +-
external/cddl/osnet/dist/cmd/zfs/zfs_iter.h | 6 +
external/cddl/osnet/dist/cmd/zfs/zfs_util.h | 6 +-
external/cddl/osnet/dist/cmd/zhack/zhack.c | 568 +
external/cddl/osnet/dist/cmd/zinject/translate.c | 492 +
external/cddl/osnet/dist/cmd/zinject/zinject.c | 1093 +++
external/cddl/osnet/dist/cmd/zinject/zinject.h | 70 +
external/cddl/osnet/dist/cmd/zlook/zlook.c | 411 +
external/cddl/osnet/dist/cmd/zpool/zpool_iter.c | 9 +-
external/cddl/osnet/dist/cmd/zpool/zpool_util.h | 5 +-
external/cddl/osnet/dist/cmd/zstreamdump/zstreamdump.1 | 71 +
external/cddl/osnet/dist/cmd/zstreamdump/zstreamdump.c | 628 +
external/cddl/osnet/dist/common/acl/acl_common.h | 26 +-
external/cddl/osnet/dist/common/avl/avl.c | 51 +-
external/cddl/osnet/dist/common/nvpair/fnvpair.c | 512 +
external/cddl/osnet/dist/common/nvpair/nvpair_alloc_fixed.c | 2 -
external/cddl/osnet/dist/common/unicode/u8_textprep.c | 16 +-
external/cddl/osnet/dist/common/util/strtolctype.h | 79 +
external/cddl/osnet/dist/common/zfs/zfeature_common.c | 250 +
external/cddl/osnet/dist/common/zfs/zfeature_common.h | 104 +
external/cddl/osnet/dist/common/zfs/zfs_comutil.c | 107 +-
external/cddl/osnet/dist/common/zfs/zfs_comutil.h | 9 +-
external/cddl/osnet/dist/common/zfs/zfs_deleg.c | 65 +-
external/cddl/osnet/dist/common/zfs/zfs_deleg.h | 8 +-
external/cddl/osnet/dist/common/zfs/zfs_fletcher.c | 19 +-
external/cddl/osnet/dist/common/zfs/zfs_fletcher.h | 17 +-
external/cddl/osnet/dist/common/zfs/zfs_ioctl_compat.c | 1380 +++
external/cddl/osnet/dist/common/zfs/zfs_ioctl_compat.h | 543 +
external/cddl/osnet/dist/common/zfs/zfs_namecheck.c | 25 +-
external/cddl/osnet/dist/common/zfs/zfs_namecheck.h | 5 +-
external/cddl/osnet/dist/common/zfs/zfs_prop.c | 293 +-
external/cddl/osnet/dist/common/zfs/zfs_prop.h | 16 +-
external/cddl/osnet/dist/common/zfs/zpool_prop.c | 93 +-
external/cddl/osnet/dist/common/zfs/zprop_common.c | 39 +-
external/cddl/osnet/dist/head/nlist.h | 9 +-
external/cddl/osnet/dist/lib/libdtrace/aarch64/dt_isadep.c | 139 +
external/cddl/osnet/dist/lib/libdtrace/common/dt_print.c | 6 +-
external/cddl/osnet/dist/lib/libdtrace/common/dt_strtab.c | 11 +-
external/cddl/osnet/dist/lib/libdtrace/common/dt_sugar.c | 516 +
external/cddl/osnet/dist/lib/libdtrace/common/mkerrno.sh | 40 +
external/cddl/osnet/dist/lib/libdtrace/common/mksignal.sh | 40 +
external/cddl/osnet/dist/lib/libdtrace/i386/dt_isadep.c | 35 +-
external/cddl/osnet/dist/lib/libdtrace/i386/regs.d.in | 117 +
external/cddl/osnet/dist/lib/libdtrace/i386/regs.sed.in | 82 +
external/cddl/osnet/dist/lib/libdtrace/mips/dt_isadep.c | 75 +
external/cddl/osnet/dist/lib/libdtrace/powerpc/dt_isadep.c | 197 +
external/cddl/osnet/dist/lib/libdtrace/riscv/dt_isadep.c | 139 +
external/cddl/osnet/dist/lib/libdtrace/sparc/dt_isadep.c | 338 +
external/cddl/osnet/dist/lib/libdtrace/sparc/regs.d | 120 +
external/cddl/osnet/dist/lib/libnvpair/libnvpair.h | 161 +-
external/cddl/osnet/dist/lib/libnvpair/nvpair_json.c | 403 +
external/cddl/osnet/dist/lib/libshare/common/libshare.h | 301 +-
external/cddl/osnet/dist/lib/libuutil/common/libuutil.h | 14 +-
external/cddl/osnet/dist/lib/libuutil/common/uu_alloc.c | 41 +-
external/cddl/osnet/dist/lib/libuutil/common/uu_avl.c | 1 +
external/cddl/osnet/dist/lib/libuutil/common/uu_dprintf.c | 2 +-
external/cddl/osnet/dist/lib/libuutil/common/uu_pname.c | 4 +-
external/cddl/osnet/dist/lib/libuutil/common/uu_string.c | 56 +
external/cddl/osnet/dist/lib/libzfs/common/libzfs_changelist.c | 59 +-
external/cddl/osnet/dist/lib/libzfs/common/libzfs_compat.c | 118 +
external/cddl/osnet/dist/lib/libzfs/common/libzfs_compat.h | 44 +
external/cddl/osnet/dist/lib/libzfs/common/libzfs_config.c | 103 +-
external/cddl/osnet/dist/lib/libzfs/common/libzfs_diff.c | 842 ++
external/cddl/osnet/dist/lib/libzfs/common/libzfs_impl.h | 48 +-
external/cddl/osnet/dist/lib/libzfs/common/libzfs_iter.c | 526 +
external/cddl/osnet/dist/lib/libzfs/common/libzfs_status.c | 164 +-
external/cddl/osnet/dist/lib/libzfs_core/common/libzfs_core.c | 848 ++
external/cddl/osnet/dist/lib/libzfs_core/common/libzfs_core.h | 89 +
external/cddl/osnet/dist/lib/libzfs_core/common/libzfs_core_compat.c | 189 +
external/cddl/osnet/dist/lib/libzfs_core/common/libzfs_core_compat.h | 47 +
external/cddl/osnet/dist/lib/libzpool/common/kernel.c | 1210 +++
external/cddl/osnet/dist/lib/libzpool/common/zfs.d | 36 +
external/cddl/osnet/dist/lib/pyzfs/common/__init__.py | 27 +
external/cddl/osnet/dist/lib/pyzfs/common/allow.py | 398 +
external/cddl/osnet/dist/lib/pyzfs/common/dataset.py | 234 +
external/cddl/osnet/dist/lib/pyzfs/common/groupspace.py | 28 +
external/cddl/osnet/dist/lib/pyzfs/common/holds.py | 75 +
external/cddl/osnet/dist/lib/pyzfs/common/ioctl.c | 544 +
external/cddl/osnet/dist/lib/pyzfs/common/table.py | 70 +
external/cddl/osnet/dist/lib/pyzfs/common/unallow.py | 27 +
external/cddl/osnet/dist/lib/pyzfs/common/userspace.py | 246 +
external/cddl/osnet/dist/lib/pyzfs/common/util.py | 141 +
external/cddl/osnet/dist/uts/aarch64/dtrace/fasttrap_isa.c | 29 +
external/cddl/osnet/dist/uts/aarch64/sys/fasttrap_isa.h | 46 +
external/cddl/osnet/dist/uts/arm/dtrace/fasttrap_isa.c | 30 +
external/cddl/osnet/dist/uts/common/dtrace/dtrace_xoroshiro128_plus.c | 89 +
external/cddl/osnet/dist/uts/common/dtrace/dtrace_xoroshiro128_plus.h | 41 +
external/cddl/osnet/dist/uts/common/fs/vnode.c | 104 +
external/cddl/osnet/dist/uts/common/fs/zfs/THIRDPARTYLICENSE.lz4 | 30 +
external/cddl/osnet/dist/uts/common/fs/zfs/THIRDPARTYLICENSE.lz4.descrip | 1 +
external/cddl/osnet/dist/uts/common/fs/zfs/blkptr.c | 119 +
external/cddl/osnet/dist/uts/common/fs/zfs/bplist.c | 346 +-
external/cddl/osnet/dist/uts/common/fs/zfs/bpobj.c | 592 +
external/cddl/osnet/dist/uts/common/fs/zfs/bptree.c | 301 +
external/cddl/osnet/dist/uts/common/fs/zfs/bqueue.c | 111 +
external/cddl/osnet/dist/uts/common/fs/zfs/ddt_zap.c | 21 +-
external/cddl/osnet/dist/uts/common/fs/zfs/dmu_diff.c | 251 +
external/cddl/osnet/dist/uts/common/fs/zfs/dmu_object.c | 114 +-
external/cddl/osnet/dist/uts/common/fs/zfs/dmu_objset.c | 1669 +++-
external/cddl/osnet/dist/uts/common/fs/zfs/dmu_send.c | 3616 +++++++--
external/cddl/osnet/dist/uts/common/fs/zfs/dmu_traverse.c | 600 +-
external/cddl/osnet/dist/uts/common/fs/zfs/dmu_tx.c | 904 +-
external/cddl/osnet/dist/uts/common/fs/zfs/dmu_zfetch.c | 778 +-
external/cddl/osnet/dist/uts/common/fs/zfs/dsl_bookmark.c | 457 +
external/cddl/osnet/dist/uts/common/fs/zfs/dsl_deadlist.c | 539 +
external/cddl/osnet/dist/uts/common/fs/zfs/dsl_destroy.c | 992 ++
external/cddl/osnet/dist/uts/common/fs/zfs/dsl_dir.c | 1615 +++-
external/cddl/osnet/dist/uts/common/fs/zfs/dsl_prop.c | 757 +-
external/cddl/osnet/dist/uts/common/fs/zfs/dsl_scan.c | 1922 +++++
external/cddl/osnet/dist/uts/common/fs/zfs/dsl_synctask.c | 269 +-
external/cddl/osnet/dist/uts/common/fs/zfs/dsl_userhold.c | 666 +
external/cddl/osnet/dist/uts/common/fs/zfs/edonr_zfs.c | 102 +
external/cddl/osnet/dist/uts/common/fs/zfs/lz4.c | 1025 ++
external/cddl/osnet/dist/uts/common/fs/zfs/lzjb.c | 21 +-
external/cddl/osnet/dist/uts/common/fs/zfs/metaslab.c | 3104 ++++++-
external/cddl/osnet/dist/uts/common/fs/zfs/multilist.c | 366 +
external/cddl/osnet/dist/uts/common/fs/zfs/range_tree.c | 411 +
external/cddl/osnet/dist/uts/common/fs/zfs/refcount.c | 156 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sa.c | 2015 +++++
external/cddl/osnet/dist/uts/common/fs/zfs/sha256.c | 49 +-
external/cddl/osnet/dist/uts/common/fs/zfs/skein_zfs.c | 95 +
external/cddl/osnet/dist/uts/common/fs/zfs/spa_errlog.c | 62 +-
external/cddl/osnet/dist/uts/common/fs/zfs/space_reftree.c | 159 +
external/cddl/osnet/dist/uts/common/fs/zfs/sys/arc.h | 137 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/blkptr.h | 38 +
external/cddl/osnet/dist/uts/common/fs/zfs/sys/bplist.h | 63 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/bpobj.h | 93 +
external/cddl/osnet/dist/uts/common/fs/zfs/sys/bptree.h | 65 +
external/cddl/osnet/dist/uts/common/fs/zfs/sys/bqueue.h | 54 +
external/cddl/osnet/dist/uts/common/fs/zfs/sys/dmu_impl.h | 45 +
external/cddl/osnet/dist/uts/common/fs/zfs/sys/dmu_objset.h | 89 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/dmu_send.h | 91 +
external/cddl/osnet/dist/uts/common/fs/zfs/sys/dmu_traverse.h | 15 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/dmu_tx.h | 40 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/dmu_zfetch.h | 44 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/dnode.h | 116 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/dsl_bookmark.h | 51 +
external/cddl/osnet/dist/uts/common/fs/zfs/sys/dsl_deadlist.h | 87 +
external/cddl/osnet/dist/uts/common/fs/zfs/sys/dsl_deleg.h | 7 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/dsl_destroy.h | 53 +
external/cddl/osnet/dist/uts/common/fs/zfs/sys/dsl_dir.h | 69 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/dsl_pool.h | 108 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/dsl_prop.h | 75 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/dsl_scan.h | 145 +
external/cddl/osnet/dist/uts/common/fs/zfs/sys/dsl_synctask.h | 82 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/dsl_userhold.h | 57 +
external/cddl/osnet/dist/uts/common/fs/zfs/sys/metaslab.h | 97 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/metaslab_impl.h | 304 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/multilist.h | 106 +
external/cddl/osnet/dist/uts/common/fs/zfs/sys/range_tree.h | 97 +
external/cddl/osnet/dist/uts/common/fs/zfs/sys/refcount.h | 47 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/rrwlock.h | 40 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/sa.h | 170 +
external/cddl/osnet/dist/uts/common/fs/zfs/sys/sa_impl.h | 291 +
external/cddl/osnet/dist/uts/common/fs/zfs/sys/spa_boot.h | 6 +
external/cddl/osnet/dist/uts/common/fs/zfs/sys/spa_impl.h | 119 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/space_map.h | 153 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/space_reftree.h | 57 +
external/cddl/osnet/dist/uts/common/fs/zfs/sys/trim_map.h | 51 +
external/cddl/osnet/dist/uts/common/fs/zfs/sys/txg.h | 26 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/txg_impl.h | 59 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/uberblock.h | 7 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/uberblock_impl.h | 6 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/unique.h | 4 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/vdev.h | 44 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/vdev_impl.h | 142 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/vdev_raidz.h | 50 +
external/cddl/osnet/dist/uts/common/fs/zfs/sys/zap.h | 80 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/zap_impl.h | 50 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/zap_leaf.h | 30 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/zfeature.h | 73 +
external/cddl/osnet/dist/uts/common/fs/zfs/sys/zfs_acl.h | 41 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/zfs_context.h | 104 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/zfs_ctldir.h | 14 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/zfs_debug.h | 41 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/zfs_fuid.h | 3 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/zfs_ioctl.h | 335 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/zfs_onexit.h | 66 +
external/cddl/osnet/dist/uts/common/fs/zfs/sys/zfs_sa.h | 142 +
external/cddl/osnet/dist/uts/common/fs/zfs/sys/zfs_stat.h | 55 +
external/cddl/osnet/dist/uts/common/fs/zfs/sys/zfs_vfsops.h | 39 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/zil.h | 56 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/zil_impl.h | 45 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/zio.h | 279 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/zio_checksum.h | 59 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/zio_compress.h | 20 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/zio_impl.h | 121 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/zio_priority.h | 41 +
external/cddl/osnet/dist/uts/common/fs/zfs/sys/zrlock.h | 63 +
external/cddl/osnet/dist/uts/common/fs/zfs/trim_map.c | 636 +
external/cddl/osnet/dist/uts/common/fs/zfs/uberblock.c | 15 +-
external/cddl/osnet/dist/uts/common/fs/zfs/vdev_cache.c | 48 +-
external/cddl/osnet/dist/uts/common/fs/zfs/vdev_geom.c | 1077 ++
external/cddl/osnet/dist/uts/common/fs/zfs/vdev_label.c | 403 +-
external/cddl/osnet/dist/uts/common/fs/zfs/vdev_mirror.c | 339 +-
external/cddl/osnet/dist/uts/common/fs/zfs/vdev_missing.c | 23 +-
external/cddl/osnet/dist/uts/common/fs/zfs/vdev_queue.c | 947 ++-
external/cddl/osnet/dist/uts/common/fs/zfs/vdev_raidz.c | 347 +-
external/cddl/osnet/dist/uts/common/fs/zfs/vdev_root.c | 17 +-
external/cddl/osnet/dist/uts/common/fs/zfs/zap.c | 470 +-
external/cddl/osnet/dist/uts/common/fs/zfs/zap_leaf.c | 138 +-
external/cddl/osnet/dist/uts/common/fs/zfs/zfeature.c | 509 +
external/cddl/osnet/dist/uts/common/fs/zfs/zfs.conf | 28 +
external/cddl/osnet/dist/uts/common/fs/zfs/zfs_byteswap.c | 5 +-
external/cddl/osnet/dist/uts/common/fs/zfs/zfs_debug.c | 112 +
external/cddl/osnet/dist/uts/common/fs/zfs/zfs_fm.c | 8 +
external/cddl/osnet/dist/uts/common/fs/zfs/zfs_log.c | 183 +-
external/cddl/osnet/dist/uts/common/fs/zfs/zfs_onexit.c | 254 +
external/cddl/osnet/dist/uts/common/fs/zfs/zfs_sa.c | 327 +
external/cddl/osnet/dist/uts/common/fs/zfs/zil.c | 1080 ++-
external/cddl/osnet/dist/uts/common/fs/zfs/zio_checksum.c | 242 +-
external/cddl/osnet/dist/uts/common/fs/zfs/zio_compress.c | 105 +-
external/cddl/osnet/dist/uts/common/fs/zfs/zio_inject.c | 344 +-
external/cddl/osnet/dist/uts/common/fs/zfs/zrlock.c | 187 +
external/cddl/osnet/dist/uts/common/os/nvpair_alloc_system.c | 1 -
external/cddl/osnet/dist/uts/common/sys/acl.h | 24 +-
external/cddl/osnet/dist/uts/common/sys/acl_impl.h | 4 +-
external/cddl/osnet/dist/uts/common/sys/avl.h | 13 +-
external/cddl/osnet/dist/uts/common/sys/bitmap.h | 11 +-
external/cddl/osnet/dist/uts/common/sys/callb.h | 8 +-
external/cddl/osnet/dist/uts/common/sys/cpupart.h | 12 +-
external/cddl/osnet/dist/uts/common/sys/cpuvar.h | 21 +-
external/cddl/osnet/dist/uts/common/sys/fasttrap.h | 5 +
external/cddl/osnet/dist/uts/common/sys/fasttrap_impl.h | 235 +
external/cddl/osnet/dist/uts/common/sys/feature_tests.h | 53 +-
external/cddl/osnet/dist/uts/common/sys/fm/fs/zfs.h | 1 +
external/cddl/osnet/dist/uts/common/sys/fm/protocol.h | 39 +-
external/cddl/osnet/dist/uts/common/sys/fs/zut.h | 93 +
external/cddl/osnet/dist/uts/common/sys/idmap.h | 97 +
external/cddl/osnet/dist/uts/common/sys/nvpair.h | 76 +-
external/cddl/osnet/dist/uts/common/sys/sysevent/dev.h | 256 +
external/cddl/osnet/dist/uts/common/sys/sysevent/eventdefs.h | 34 +-
external/cddl/osnet/dist/uts/common/sys/systeminfo.h | 114 +-
external/cddl/osnet/dist/uts/common/sys/taskq.h | 45 +-
external/cddl/osnet/dist/uts/common/sys/taskq_impl.h | 9 +
external/cddl/osnet/dist/uts/common/sys/u8_textprep.h | 2 +
external/cddl/osnet/dist/uts/common/zmod/zmod.c | 2 +-
external/cddl/osnet/dist/uts/common/zmod/zmod_subr.c | 1 -
external/cddl/osnet/dist/uts/intel/dtrace/fasttrap_isa.c | 1894 +++++
external/cddl/osnet/dist/uts/mips/dtrace/fasttrap_isa.c | 30 +
external/cddl/osnet/dist/uts/mips/sys/fasttrap_isa.h | 48 +
external/cddl/osnet/dist/uts/powerpc/dtrace/fasttrap_isa.c | 542 +
external/cddl/osnet/dist/uts/powerpc/sys/fasttrap_isa.h | 76 +
external/cddl/osnet/dist/uts/riscv/dtrace/fasttrap_isa.c | 29 +
external/cddl/osnet/dist/uts/riscv/sys/fasttrap_isa.h | 46 +
247 files changed, 50207 insertions(+), 7470 deletions(-)
diffs (truncated from 69851 to 300 lines):
diff -r 4b31296d3664 -r 4ffd2b256dfd external/cddl/osnet/dist/cmd/pyzfs/pyzfs.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/cddl/osnet/dist/cmd/pyzfs/pyzfs.py Mon May 28 20:52:50 2018 +0000
@@ -0,0 +1,79 @@
+#! /usr/bin/python2.4 -S
+#
+# 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 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
+#
+
+# Note, we want SIGINT (control-c) to exit the process quietly, to mimic
+# the standard behavior of C programs. The best we can do with pure
+# Python is to run with -S (to disable "import site"), and start our
+# program with a "try" statement. Hopefully nobody hits ^C before our
+# try statement is executed.
+
+try:
+ import site
+ import gettext
+ import zfs.util
+ import zfs.ioctl
+ import sys
+ import errno
+
+ """This is the main script for doing zfs subcommands. It doesn't know
+ what subcommands there are, it just looks for a module zfs.<subcommand>
+ that implements that subcommand."""
+
+ _ = gettext.translation("SUNW_OST_OSCMD", "/usr/lib/locale",
+ fallback=True).gettext
+
+ if len(sys.argv) < 2:
+ sys.exit(_("missing subcommand argument"))
+
+ zfs.ioctl.set_cmdstr(" ".join(["zfs"] + sys.argv[1:]))
+
+ try:
+ # import zfs.<subcommand>
+ # subfunc = zfs.<subcommand>.do_<subcommand>
+
+ subcmd = sys.argv[1]
+ __import__("zfs." + subcmd)
+ submod = getattr(zfs, subcmd)
+ subfunc = getattr(submod, "do_" + subcmd)
+ except (ImportError, AttributeError):
+ sys.exit(_("invalid subcommand"))
+
+ try:
+ subfunc()
+ except zfs.util.ZFSError, e:
+ print(e)
+ sys.exit(1)
+
+except IOError, e:
+ import errno
+ import sys
+
+ if e.errno == errno.EPIPE:
+ sys.exit(1)
+ raise
+except KeyboardInterrupt:
+ import sys
+
+ sys.exit(1)
diff -r 4b31296d3664 -r 4ffd2b256dfd external/cddl/osnet/dist/cmd/stat/common/timestamp.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/cddl/osnet/dist/cmd/stat/common/timestamp.c Mon May 28 20:52:50 2018 +0000
@@ -0,0 +1,49 @@
+/*
+ * 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 2009 Sun Microsystems, Inc. All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#include "statcommon.h"
+
+#include <langinfo.h>
+
+/*
+ * Print timestamp as decimal reprentation of time_t value (-T u was specified)
+ * or in date(1) format (-T d was specified).
+ */
+void
+print_timestamp(uint_t timestamp_fmt)
+{
+ time_t t = time(NULL);
+
+ if (timestamp_fmt == UDATE) {
+ (void) printf("%ld\n", t);
+ } else if (timestamp_fmt == DDATE) {
+ char dstr[64];
+ int len;
+
+ len = strftime(dstr, sizeof (dstr), "%+", localtime(&t));
+ if (len > 0)
+ (void) printf("%s\n", dstr);
+ }
+}
diff -r 4b31296d3664 -r 4ffd2b256dfd external/cddl/osnet/dist/cmd/zfs/zfs_iter.c
--- a/external/cddl/osnet/dist/cmd/zfs/zfs_iter.c Mon May 28 20:45:38 2018 +0000
+++ b/external/cddl/osnet/dist/cmd/zfs/zfs_iter.c Mon May 28 20:52:50 2018 +0000
@@ -18,9 +18,12 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012 Pawel Jakub Dawidek. All rights reserved.
+ * Copyright 2013 Nexenta Systems, Inc. All rights reserved.
+ * Copyright (c) 2013 by Delphix. All rights reserved.
*/
#include <libintl.h>
@@ -69,7 +72,7 @@
* Include snaps if they were requested or if this a zfs list where types
* were not specified and the "listsnapshots" property is set on this pool.
*/
-static int
+static boolean_t
zfs_include_snapshots(zfs_handle_t *zhp, callback_data_t *cb)
{
zpool_handle_t *zph;
@@ -89,8 +92,9 @@
zfs_callback(zfs_handle_t *zhp, void *data)
{
callback_data_t *cb = data;
- int dontclose = 0;
- int include_snaps = zfs_include_snapshots(zhp, cb);
+ boolean_t should_close = B_TRUE;
+ boolean_t include_snaps = zfs_include_snapshots(zhp, cb);
+ boolean_t include_bmarks = (cb->cb_types & ZFS_TYPE_BOOKMARK);
if ((zfs_get_type(zhp) & cb->cb_types) ||
((zfs_get_type(zhp) == ZFS_TYPE_SNAPSHOT) && include_snaps)) {
@@ -108,14 +112,15 @@
cb->cb_props_table);
if (zfs_expand_proplist(zhp, cb->cb_proplist,
- (cb->cb_flags & ZFS_ITER_RECVD_PROPS))
+ (cb->cb_flags & ZFS_ITER_RECVD_PROPS),
+ (cb->cb_flags & ZFS_ITER_LITERAL_PROPS))
!= 0) {
free(node);
return (-1);
}
}
uu_avl_insert(cb->cb_avl, node, idx);
- dontclose = 1;
+ should_close = B_FALSE;
} else {
free(node);
}
@@ -130,12 +135,18 @@
cb->cb_depth++;
if (zfs_get_type(zhp) == ZFS_TYPE_FILESYSTEM)
(void) zfs_iter_filesystems(zhp, zfs_callback, data);
- if ((zfs_get_type(zhp) != ZFS_TYPE_SNAPSHOT) && include_snaps)
- (void) zfs_iter_snapshots(zhp, zfs_callback, data);
+ if (((zfs_get_type(zhp) & (ZFS_TYPE_SNAPSHOT |
+ ZFS_TYPE_BOOKMARK)) == 0) && include_snaps)
+ (void) zfs_iter_snapshots(zhp,
+ (cb->cb_flags & ZFS_ITER_SIMPLE) != 0, zfs_callback,
+ data);
+ if (((zfs_get_type(zhp) & (ZFS_TYPE_SNAPSHOT |
+ ZFS_TYPE_BOOKMARK)) == 0) && include_bmarks)
+ (void) zfs_iter_bookmarks(zhp, zfs_callback, data);
cb->cb_depth--;
}
- if (!dontclose)
+ if (should_close)
zfs_close(zhp);
return (0);
@@ -185,6 +196,14 @@
}
}
+boolean_t
+zfs_sort_only_by_name(const zfs_sort_column_t *sc)
+{
+
+ return (sc != NULL && sc->sc_next == NULL &&
+ sc->sc_prop == ZFS_PROP_NAME);
+}
+
/* ARGSUSED */
static int
zfs_compare(const void *larg, const void *rarg, void *unused)
@@ -225,7 +244,13 @@
lcreate = zfs_prop_get_int(l, ZFS_PROP_CREATETXG);
rcreate = zfs_prop_get_int(r, ZFS_PROP_CREATETXG);
- if (lcreate < rcreate)
+ /*
+ * Both lcreate and rcreate being 0 means we don't have
+ * properties and we should compare full name.
+ */
+ if (lcreate == 0 && rcreate == 0)
+ ret = strcmp(lat + 1, rat + 1);
+ else if (lcreate < rcreate)
ret = -1;
else if (lcreate > rcreate)
ret = 1;
@@ -291,7 +316,14 @@
if (rvalid)
verify(nvlist_lookup_string(rval,
ZPROP_VALUE, &rstr) == 0);
+ } else if (psc->sc_prop == ZFS_PROP_NAME) {
+ lvalid = rvalid = B_TRUE;
+ (void) strlcpy(lbuf, zfs_get_name(l), sizeof (lbuf));
+ (void) strlcpy(rbuf, zfs_get_name(r), sizeof (rbuf));
+
+ lstr = lbuf;
+ rstr = rbuf;
} else if (zfs_prop_is_string(psc->sc_prop)) {
lvalid = (zfs_prop_get(l, psc->sc_prop, lbuf,
sizeof (lbuf), NULL, NULL, 0, B_TRUE) == 0);
@@ -351,11 +383,8 @@
avl_pool = uu_avl_pool_create("zfs_pool", sizeof (zfs_node_t),
offsetof(zfs_node_t, zn_avlnode), zfs_sort, UU_DEFAULT);
- if (avl_pool == NULL) {
- (void) fprintf(stderr,
- gettext("internal error: out of memory\n"));
- exit(1);
- }
+ if (avl_pool == NULL)
+ nomem();
cb.cb_sortcol = sortcol;
cb.cb_flags = flags;
@@ -400,11 +429,8 @@
sizeof (cb.cb_props_table));
}
- if ((cb.cb_avl = uu_avl_create(avl_pool, NULL, UU_DEFAULT)) == NULL) {
- (void) fprintf(stderr,
- gettext("internal error: out of memory\n"));
- exit(1);
- }
+ if ((cb.cb_avl = uu_avl_create(avl_pool, NULL, UU_DEFAULT)) == NULL)
+ nomem();
if (argc == 0) {
/*
@@ -454,11 +480,8 @@
/*
* Finally, clean up the AVL tree.
*/
- if ((walk = uu_avl_walk_start(cb.cb_avl, UU_WALK_ROBUST)) == NULL) {
- (void) fprintf(stderr,
- gettext("internal error: out of memory"));
- exit(1);
- }
+ if ((walk = uu_avl_walk_start(cb.cb_avl, UU_WALK_ROBUST)) == NULL)
+ nomem();
Home |
Main Index |
Thread Index |
Old Index