Date: Thu, 27 Mar 2008 20:52:58 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 138749 for review Message-ID: <200803272052.m2RKqwx6068779@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=138749 Change 138749 by jb@jb_freebsd1 on 2008/03/27 20:52:40 IFC Affected files ... .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/machine/endian.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/atomic.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/bitmap.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/cpupart.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/cpuvar.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/cyclic.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/dnlc.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/elf.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/mman.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/mntent.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/mnttab.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/modctl.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/mount.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/mutex.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/objfs.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/param.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/pcpu.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/policy.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/proc.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/random.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/rwlock.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/sdt.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/stat.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/string.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/sunddi.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/sysmacros.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/systm.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/taskq.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/taskq_impl.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/time.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/types.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/uio.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/varargs.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/vfs.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/vnode.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/zone.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/common/avl/avl.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/Makefile.files#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/gzip.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/unique.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/os/callb.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/os/list.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_mem.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/asm_linkage.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/avl_impl.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/bitmap.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/byteorder.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/ccompile.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/compress.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/cred.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/dkio.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/dklabel.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/errorq.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/feature_tests.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/protocol.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/util.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/gfs.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/list.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/list_impl.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/note.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair_impl.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/processor.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/procset.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/sdt.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/synch.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/vmem.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/zmod.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/zmod/adler32.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/zmod/deflate.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/zmod/deflate.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inffast.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inffast.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inffixed.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inflate.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inflate.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inftrees.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inftrees.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/zmod/trees.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zconf.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zlib.h#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zutil.c#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zutil.h#1 branch .. //depot/projects/dtrace/src/sys/netgraph/ng_car.c#3 integrate Differences ... ==== //depot/projects/dtrace/src/sys/netgraph/ng_car.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netgraph/ng_car.c,v 1.5 2007/12/19 22:50:14 mav Exp $ + * $FreeBSD: src/sys/netgraph/ng_car.c,v 1.6 2008/03/27 20:04:20 mav Exp $ */ /* @@ -58,7 +58,7 @@ int64_t tc; /* commited token bucket counter */ int64_t te; /* exceeded/peak token bucket counter */ - struct timeval lastRefill; /* last token refill time */ + struct bintime lastRefill; /* last token refill time */ struct ng_car_hookconf conf; /* hook configuration */ struct ng_car_hookstats stats; /* hook stats */ @@ -206,7 +206,7 @@ priv->upper.conf.yellow_action = NG_CAR_ACTION_FORWARD; priv->upper.conf.red_action = NG_CAR_ACTION_DROP; priv->upper.conf.mode = 0; - getmicrotime(&priv->upper.lastRefill); + getbinuptime(&priv->upper.lastRefill); priv->upper.q_first = 0; priv->upper.q_last = 0; ng_callout_init(&priv->upper.q_callout); @@ -592,57 +592,58 @@ static void ng_car_refillhook(struct hookinfo *h) { - struct timeval newt, deltat; - int64_t deltat_us; - int64_t delta; + struct bintime newt, deltat; + unsigned int deltat_us; /* Get current time. */ - getmicrotime(&newt); + getbinuptime(&newt); + + /* Get time delta since last refill. */ + deltat = newt; + bintime_sub(&deltat, &h->lastRefill); /* Time must go forward. */ - if (timevalcmp(&newt, &h->lastRefill, <= )) { + if (deltat.sec < 0) { h->lastRefill = newt; return; } - /* Get time delta since last refill. */ - deltat = newt; - timevalsub(&deltat, &h->lastRefill); - - /* Sanity check */ - if (deltat.tv_sec > 1000) { - deltat_us = 1000000000; + /* But not too far forward. */ + if (deltat.sec >= 1000) { + deltat_us = (1000 << 20); } else { - deltat_us = ((int64_t)deltat.tv_sec) * 1000000 + deltat.tv_usec; + /* convert bintime to the 1/(2^20) of sec */ + deltat_us = (deltat.sec << 20) + (deltat.frac >> 44); } if (h->conf.mode == NG_CAR_SINGLE_RATE) { + int64_t delta; /* Refill commited token bucket. */ - h->tc += h->conf.cir * deltat_us / 8000000; + h->tc += (h->conf.cir * deltat_us) >> 23; delta = h->tc - h->conf.cbs; if (delta > 0) { h->tc = h->conf.cbs; /* Refill exceeded token bucket. */ h->te += delta; - if (h->te > h->conf.ebs) + if (h->te > ((int64_t)h->conf.ebs)) h->te = h->conf.ebs; } } else if (h->conf.mode == NG_CAR_DOUBLE_RATE) { /* Refill commited token bucket. */ - h->tc += h->conf.cir * deltat_us / 8000000; - if (h->tc > h->conf.cbs) + h->tc += (h->conf.cir * deltat_us) >> 23; + if (h->tc > ((int64_t)h->conf.cbs)) h->tc = h->conf.cbs; /* Refill peak token bucket. */ - h->te += h->conf.pir * deltat_us / 8000000; - if (h->te > h->conf.ebs) + h->te += (h->conf.pir * deltat_us) >> 23; + if (h->te > ((int64_t)h->conf.ebs)) h->te = h->conf.ebs; } else { /* RED or SHAPE mode. */ /* Refill commited token bucket. */ - h->tc += h->conf.cir * deltat_us / 8000000; + h->tc += (h->conf.cir * deltat_us) >> 23; if (h->tc > ((int64_t)h->conf.cbs)) h->tc = h->conf.cbs; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200803272052.m2RKqwx6068779>