PERFORCE change 134251 for review
John Birrell
jb at FreeBSD.org
Sun Jan 27 14:25:17 PST 2008
http://perforce.freebsd.org/chv.cgi?CH=134251
Change 134251 by jb at jb_freebsd1 on 2008/01/27 22:24:37
IFdtrace
Affected files ...
.. //depot/projects/opensolaris/src/cddl/Makefile#1 branch
.. //depot/projects/opensolaris/src/cddl/Makefile.inc#1 branch
.. //depot/projects/opensolaris/src/cddl/lib/Makefile#1 branch
.. //depot/projects/opensolaris/src/cddl/lib/Makefile.inc#1 branch
.. //depot/projects/opensolaris/src/cddl/lib/drti/Makefile#1 branch
.. //depot/projects/opensolaris/src/cddl/lib/libavl/Makefile#1 branch
.. //depot/projects/opensolaris/src/cddl/lib/libctf/Makefile#1 branch
.. //depot/projects/opensolaris/src/cddl/lib/libdtrace/Makefile#1 branch
.. //depot/projects/opensolaris/src/cddl/lib/libdtrace/errno.d#1 branch
.. //depot/projects/opensolaris/src/cddl/lib/libdtrace/net.d#1 branch
.. //depot/projects/opensolaris/src/cddl/lib/libdtrace/nfs.d#1 branch
.. //depot/projects/opensolaris/src/cddl/lib/libdtrace/psinfo.d#1 branch
.. //depot/projects/opensolaris/src/cddl/lib/libdtrace/sched.d#1 branch
.. //depot/projects/opensolaris/src/cddl/lib/libdtrace/signal.d#1 branch
.. //depot/projects/opensolaris/src/cddl/lib/libdtrace/unistd.d#1 branch
.. //depot/projects/opensolaris/src/cddl/lib/libnvpair/Makefile#1 branch
.. //depot/projects/opensolaris/src/cddl/lib/libumem/Makefile#1 branch
.. //depot/projects/opensolaris/src/cddl/lib/libuutil/Makefile#1 branch
.. //depot/projects/opensolaris/src/cddl/lib/libzfs/Makefile#1 branch
.. //depot/projects/opensolaris/src/cddl/lib/libzpool/Makefile#1 branch
.. //depot/projects/opensolaris/src/cddl/sbin/Makefile#1 branch
.. //depot/projects/opensolaris/src/cddl/sbin/Makefile.inc#1 branch
.. //depot/projects/opensolaris/src/cddl/sbin/zfs/Makefile#1 branch
.. //depot/projects/opensolaris/src/cddl/sbin/zpool/Makefile#1 branch
.. //depot/projects/opensolaris/src/cddl/usr.bin/Makefile#1 branch
.. //depot/projects/opensolaris/src/cddl/usr.bin/Makefile.inc#1 branch
.. //depot/projects/opensolaris/src/cddl/usr.bin/ctfconvert/Makefile#1 branch
.. //depot/projects/opensolaris/src/cddl/usr.bin/ctfdump/Makefile#1 branch
.. //depot/projects/opensolaris/src/cddl/usr.bin/ctfmerge/Makefile#1 branch
.. //depot/projects/opensolaris/src/cddl/usr.bin/sgsmsg/Makefile#1 branch
.. //depot/projects/opensolaris/src/cddl/usr.bin/ztest/Makefile#1 branch
.. //depot/projects/opensolaris/src/cddl/usr.sbin/Makefile#1 branch
.. //depot/projects/opensolaris/src/cddl/usr.sbin/Makefile.inc#1 branch
.. //depot/projects/opensolaris/src/cddl/usr.sbin/dtrace/Makefile#1 branch
.. //depot/projects/opensolaris/src/cddl/usr.sbin/zdb/Makefile#1 branch
.. //depot/projects/opensolaris/src/compat/opensolaris/include/alloca.h#1 branch
.. //depot/projects/opensolaris/src/compat/opensolaris/include/devid.h#1 branch
.. //depot/projects/opensolaris/src/compat/opensolaris/include/dtrace.h#1 branch
.. //depot/projects/opensolaris/src/compat/opensolaris/include/fcntl.h#1 branch
.. //depot/projects/opensolaris/src/compat/opensolaris/include/fsshare.h#1 branch
.. //depot/projects/opensolaris/src/compat/opensolaris/include/libintl.h#1 branch
.. //depot/projects/opensolaris/src/compat/opensolaris/include/libproc.h#1 branch
.. //depot/projects/opensolaris/src/compat/opensolaris/include/mnttab.h#1 branch
.. //depot/projects/opensolaris/src/compat/opensolaris/include/priv.h#1 branch
.. //depot/projects/opensolaris/src/compat/opensolaris/include/solaris.h#1 branch
.. //depot/projects/opensolaris/src/compat/opensolaris/include/stdio.h#1 branch
.. //depot/projects/opensolaris/src/compat/opensolaris/include/stdlib.h#1 branch
.. //depot/projects/opensolaris/src/compat/opensolaris/include/strings.h#1 branch
.. //depot/projects/opensolaris/src/compat/opensolaris/include/unistd.h#1 branch
.. //depot/projects/opensolaris/src/compat/opensolaris/include/zone.h#1 branch
.. //depot/projects/opensolaris/src/compat/opensolaris/lib/libumem/umem.c#1 branch
.. //depot/projects/opensolaris/src/compat/opensolaris/lib/libumem/umem.h#1 branch
.. //depot/projects/opensolaris/src/compat/opensolaris/misc/deviceid.c#1 branch
.. //depot/projects/opensolaris/src/compat/opensolaris/misc/fsshare.c#1 branch
.. //depot/projects/opensolaris/src/compat/opensolaris/misc/mkdirp.c#1 branch
.. //depot/projects/opensolaris/src/compat/opensolaris/misc/mnttab.c#1 branch
.. //depot/projects/opensolaris/src/compat/opensolaris/misc/zmount.c#1 branch
.. //depot/projects/opensolaris/src/compat/opensolaris/misc/zone.c#1 branch
.. //depot/projects/opensolaris/src/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/dtrace.c#3 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/Makefile#2 delete
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/Makefile.subdirs#2 delete
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/Makefile#2 delete
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/Makefile#2 delete
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/badioctl/Makefile#2 delete
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/32/Makefile#2 delete
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/64/Makefile#2 delete
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/Makefile#2 delete
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/Makefile.com#2 delete
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/Makefile#2 delete
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/Makefile#2 delete
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/Makefile#2 delete
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/Makefile.com#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/Makefile#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo.d#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo1.d#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/Makefile#2 delete
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call.c#1 branch
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call.d#1 branch
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_BITFIELD.bitfield.d#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.create.ksh#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exec.ksh#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ENOENT.ksh#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ksh#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitcore.ksh#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitexit.ksh#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.c#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.d#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.c#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.c#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/tst.misc.d#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/tst.rootvp.d#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/i386/Makefile#2 delete
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/sparc/Makefile#2 delete
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/sgs/include/_string_table.h#1 branch
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/sgs/include/debug.h#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/sgs/include/string_table.h#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/sgs/tools/common/sgsmsg.c#3 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/sgs/tools/common/string_table.c#3 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/zdb/zdb.8#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/zdb/zdb.c#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/zdb/zdb_il.c#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/zfs/zfs.8#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/zfs/zfs_iter.c#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/zfs/zfs_iter.h#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/zfs/zfs_main.c#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/zpool/zpool.8#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/zpool/zpool_iter.c#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/zpool/zpool_main.c#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/zpool/zpool_util.c#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/zpool/zpool_util.h#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/zpool/zpool_vdev.c#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/ztest/ztest.c#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/head/stdio_ext.h#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/head/synch.h#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/head/thread.h#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libctf/common/ctf_lib.c#3 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/drti.c#3 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_buf.c#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_decl.c#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_link.c#3 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_module.c#3 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_open.c#3 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_pid.c#3 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_printf.c#3 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_proc.c#3 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_proc.h#3 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_regset.c#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_strtab.c#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_subr.c#3 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dtrace.h#3 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libuutil/common/libuutil.h#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libuutil/common/uu_misc.c#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libuutil/common/uu_pname.c#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libzfs/common/libzfs.h#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libzpool/common/kernel.c#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libzpool/common/taskq.c#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libzpool/common/util.c#2 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/tools/ctf/cvt/ctf.c#3 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/tools/ctf/cvt/dwarf.c#3 integrate
.. //depot/projects/opensolaris/src/contrib/opensolaris/tools/ctf/dump/dump.c#3 integrate
.. //depot/projects/opensolaris/src/sys/cddl/cyclic/amd64/cyclic_machdep.c#1 branch
.. //depot/projects/opensolaris/src/sys/cddl/cyclic/cyclic.c#1 branch
.. //depot/projects/opensolaris/src/sys/cddl/cyclic/cyclic_test.c#1 branch
.. //depot/projects/opensolaris/src/sys/cddl/cyclic/i386/cyclic_machdep.c#1 branch
.. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/amd64/dis_tables.c#1 branch
.. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/amd64/dis_tables.h#1 branch
.. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/amd64/dtrace_asm.S#1 branch
.. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/amd64/dtrace_isa.c#1 branch
.. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#1 branch
.. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/amd64/instr_size.c#1 branch
.. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/dtrace_anon.c#1 branch
.. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/dtrace_cddl.h#1 branch
.. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/dtrace_clone.c#1 branch
.. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/dtrace_debug.c#1 branch
.. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/dtrace_hacks.c#1 branch
.. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/dtrace_ioctl.c#1 branch
.. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/dtrace_load.c#1 branch
.. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/dtrace_modevent.c#1 branch
.. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/dtrace_sysctl.c#1 branch
.. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/dtrace_test.c#1 branch
.. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/dtrace_unload.c#1 branch
.. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/dtrace_vtime.c#1 branch
.. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/i386/dis_tables.c#1 branch
.. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/i386/dis_tables.h#1 branch
.. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/i386/dtrace_asm.S#1 branch
.. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/i386/dtrace_isa.c#1 branch
.. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/i386/dtrace_subr.c#1 branch
.. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/i386/instr_size.c#1 branch
.. //depot/projects/opensolaris/src/sys/cddl/dev/fbt/fbt.c#1 branch
.. //depot/projects/opensolaris/src/sys/cddl/dev/profile/profile.c#1 branch
.. //depot/projects/opensolaris/src/sys/cddl/dev/prototype.c#1 branch
.. //depot/projects/opensolaris/src/sys/cddl/dev/sdt/sdt.c#1 branch
.. //depot/projects/opensolaris/src/sys/cddl/dev/systrace/systrace.c#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/kern/opensolaris.c#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/kern/opensolaris_atomic.c#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/kern/opensolaris_cmn_err.c#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/kern/opensolaris_kmem.c#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/kern/opensolaris_kobj.c#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/kern/opensolaris_kstat.c#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/kern/opensolaris_misc.c#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/kern/opensolaris_policy.c#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/kern/opensolaris_string.c#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/kern/opensolaris_zone.c#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/rpc/xdr.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/acl.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/atomic.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/bitmap.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/byteorder.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/callb.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/cmn_err.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/cpupart.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/cpuvar.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/cpuvar_defs.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/cred.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/cyclic.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/cyclic_impl.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/debug.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/dirent.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/dkio.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/dnlc.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/elf.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/feature_tests.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/kcondvar.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/kmem.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/kobj.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/kstat.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/lock.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/misc.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/mman.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/mntent.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/mnttab.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/modctl.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/mount.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/mutex.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/objfs.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/param.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/pcpu.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/policy.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/proc.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/random.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/rwlock.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/sema.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/stat.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/string.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/sunddi.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/sysmacros.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/systm.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/taskq.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/taskq_impl.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/time.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/types.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/uio.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/varargs.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/vfs.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/vnode.h#1 branch
.. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/zone.h#1 branch
.. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#3 integrate
.. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/dtrace/sdt_subr.c#2 integrate
.. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/gfs.c#3 integrate
.. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#3 integrate
.. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#3 integrate
.. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#3 integrate
.. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#3 integrate
.. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 integrate
.. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 integrate
.. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/avl.h#2 integrate
.. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/avl_impl.h#2 integrate
.. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/ccompile.h#2 integrate
.. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/cpuvar.h#2 integrate
.. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/debug.h#3 integrate
.. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/dtrace.h#3 integrate
.. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/dtrace_impl.h#3 integrate
.. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/fasttrap_impl.h#1 branch
.. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#3 integrate
.. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/note.h#2 integrate
.. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/sdt.h#3 delete
.. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/vmem.h#3 delete
.. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/zmod.h#2 integrate
Differences ...
==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/dtrace.c#3 (text) ====
@@ -202,7 +202,7 @@
static void
dfatal(const char *fmt, ...)
{
-#if !defined(sun)
+#if !defined(sun) && defined(NEED_ERRLOC)
char *p_errfile = NULL;
int errline = 0;
#endif
@@ -223,7 +223,7 @@
(void) fprintf(stderr, "%s\n",
dtrace_errmsg(g_dtp, dtrace_errno(g_dtp)));
}
-#if !defined(sun)
+#if !defined(sun) && defined(NEED_ERRLOC)
dt_get_errloc(g_dtp, &p_errfile, &errline);
if (p_errfile != NULL)
printf("File '%s', line %d\n", p_errfile, errline);
@@ -235,12 +235,6 @@
*/
dtrace_close(g_dtp);
- /*
- * Close the DTrace handle to ensure that any controlled processes are
- * correctly restored and continued.
- */
- dtrace_close(g_dtp);
-
exit(E_ERROR);
}
@@ -1202,8 +1196,8 @@
g_ofp = stdout;
int done = 0, mode = 0;
- int err, i;
- char c, *p, **v;
+ int err, i, c;
+ char *p, **v;
struct ps_prochandle *P;
pid_t pid;
@@ -1230,7 +1224,7 @@
* options into g_argv[], and abort if any invalid options are found.
*/
for (optind = 1; optind < argc; optind++) {
- while ((c = getopt(argc, argv, DTRACE_OPTSTR)) != EOF) {
+ while ((c = getopt(argc, argv, DTRACE_OPTSTR)) != -1) {
switch (c) {
case '3':
if (strcmp(optarg, "2") != 0) {
@@ -1413,7 +1407,7 @@
* this time; these will compiled as part of the fourth processing pass.
*/
for (optind = 1; optind < argc; optind++) {
- while ((c = getopt(argc, argv, DTRACE_OPTSTR)) != EOF) {
+ while ((c = getopt(argc, argv, DTRACE_OPTSTR)) != -1) {
switch (c) {
case 'a':
if (dtrace_setopt(g_dtp, "grabanon", 0) != 0)
@@ -1570,7 +1564,7 @@
* may been affected by any library options set by the second pass.
*/
for (optind = 1; optind < argc; optind++) {
- while ((c = getopt(argc, argv, DTRACE_OPTSTR)) != EOF) {
+ while ((c = getopt(argc, argv, DTRACE_OPTSTR)) != -1) {
switch (c) {
case 'c':
if ((v = make_argv(optarg)) == NULL)
@@ -1835,6 +1829,11 @@
if (sigaction(SIGTERM, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
(void) sigaction(SIGTERM, &act, NULL);
+#if !defined(sun)
+ if (sigaction(SIGUSR1, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
+ (void) sigaction(SIGUSR1, &act, NULL);
+#endif
+
/*
* Now that tracing is active and we are ready to consume trace data,
* continue any grabbed or created processes, setting them running
==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl#2 (text+ko) ====
@@ -1,4 +1,4 @@
-#!/usr/perl5/bin/perl
+#!/usr/local/bin/perl
#
# CDDL HEADER START
#
==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#2 (text+ko) ====
@@ -1,4 +1,4 @@
-#!/usr/perl5/bin/perl
+#!/usr/local/bin/perl
#
# CDDL HEADER START
#
@@ -44,7 +44,7 @@
$dtrace_path = '/usr/sbin/dtrace';
@dtrace_argv = ();
-$ksh_path = '/usr/bin/ksh';
+$ksh_path = '/bin/sh';
@files = ();
%exceptions = ();
@@ -268,7 +268,7 @@
# Ensure that $PATH contains a cc(1) so that we can execute the
# test programs that require compilation of C code.
#
-$ENV{'PATH'} = $ENV{'PATH'} . ':/ws/onnv-tools/SUNWspro/SS11/bin';
+#$ENV{'PATH'} = $ENV{'PATH'} . ':/ws/onnv-tools/SUNWspro/SS11/bin';
if ($opt_b) {
logmsg("badioctl'ing ... ");
@@ -418,7 +418,7 @@
}
$fullname = "$dir/$name";
- $exe = "$dir/$base.exe";
+ $exe = "./$base.exe";
$exe_pid = -1;
if ($opt_a && ($status != 0 || $tag != 0 || $droptag != 0 ||
==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/Makefile.com#2 (text+ko) ====
@@ -62,6 +62,7 @@
-$(RM) $(CSRCS:%.c=%.exe) $(CSRCS:%.c=%.o)
-$(RM) $(SSRCS:%.s=%.exe) $(SSRCS:%.s=%.o)
-$(RM) $(DSRCS:%.d=%.o)
+ -$(RM) $(CLOBBERFILES)
install: $(ROOT_TSTS) $(ROOT_EXES)
==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/Makefile#2 (text+ko) ====
@@ -29,6 +29,11 @@
include $(SRC)/Makefile.master
include ../Makefile.com
+SNOOPDIR = $(SRC)/cmd/cmd-inet/usr.sbin/snoop
+SNOOPOBJS = nfs4_xdr.o
+SNOOPSRCS = ${SNOOPOBJS:%.o=%.c}
+CLOBBERFILES += nfs/$(SNOOPOBJS)
+
fasttrap/tst.fasttrap.exe := LDLIBS += -ldtrace
fasttrap/tst.stack.exe := LDLIBS += -ldtrace
@@ -41,6 +46,13 @@
GCC = $(ONBLD_TOOLS)/bin/$(MACH)/cw -_gcc
+nfs/%.o: $(SNOOPDIR)/%.c
+ $(COMPILE.c) -o $@ $< -I$(SNOOPDIR)
+ $(POST_PROCESS_O)
+nfs/tst.call.exe: nfs/tst.call.o nfs/$(SNOOPOBJS)
+ $(LINK.c) -o $@ nfs/tst.call.o nfs/$(SNOOPOBJS) $(LDLIBS) -lnsl
+ $(POST_PROCESS) ; $(STRIP_STABS)
+
pid/tst.gcc.exe: pid/tst.gcc.c
$(GCC) -o pid/tst.gcc.exe pid/tst.gcc.c $(LDFLAGS)
$(POST_PROCESS) ; $(STRIP_STABS)
==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d#2 (text+ko) ====
@@ -40,3 +40,8 @@
x[123] = `kmem_flags;
x[456] = *`rootvp;
}
+
+ERROR
+{
+ exit(1);
+}
==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d#2 (text+ko) ====
@@ -40,3 +40,8 @@
self->x[123] = `kmem_flags;
self->x[456] = *`rootvp;
}
+
+ERROR
+{
+ exit(1);
+}
==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo.d#2 (text+ko) ====
@@ -53,3 +53,8 @@
printf("address of process = %u\n", curpsinfo->pr_addr);
exit (0);
}
+
+ERROR
+{
+ exit(1);
+}
==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo1.d#2 (text+ko) ====
@@ -49,3 +49,8 @@
printf("address of process = %u\n", curpsinfo->pr_addr);
exit (0);
}
+
+ERROR
+{
+ exit(1);
+}
==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh#2 (text+ko) ====
@@ -46,7 +46,7 @@
dtrace=$1
$dtrace -qZm wassup'{printf("Iamkool");}' \
--qm unix'{printf("I am done"); exit(0);}'
+-qm BEGIN'{printf("I am done"); exit(0);}'
status=$?
==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_BITFIELD.bitfield.d#2 (text+ko) ====
@@ -20,7 +20,7 @@
*/
/*
- * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -38,7 +38,13 @@
*
*/
+struct foo {
+ int a:1;
+ int b:3;
+};
+
BEGIN
{
- trace(offsetof(tcp_t, tcp_hwcksum));
+ trace(offsetof(struct foo, b));
+ exit(0);
}
==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.create.ksh#2 (text+ko) ====
@@ -36,7 +36,7 @@
{
$dtrace -s /dev/stdin <<EOF
proc:::create
- /args[0]->pr_ppid == $child && pid == $child/
+ /args[0]->p_pptr->p_pid == $child && pid == $child/
{
exit(0);
}
@@ -46,7 +46,7 @@
sleeper()
{
while true; do
- /usr/bin/sleep 1
+ /bin/sleep 1
done
}
==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exec.ksh#2 (text+ko) ====
@@ -36,12 +36,12 @@
{
$dtrace -s /dev/stdin <<EOF
proc:::exec
- /curpsinfo->pr_ppid == $child && args[0] == "/usr/bin/sleep"/
+ /curpsinfo->pr_ppid == $child && args[0] == "/bin/sleep"/
{
self->exec = 1;
}
- proc:::exec-success
+ proc:::exec_success
/self->exec/
{
exit(0);
@@ -52,7 +52,7 @@
sleeper()
{
while true; do
- /usr/bin/sleep 1
+ /bin/sleep 1
done
}
==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ENOENT.ksh#2 (text+ko) ====
@@ -42,7 +42,7 @@
self->exec = 1;
}
- proc:::exec-failure
+ proc:::exec_failure
/self->exec && args[0] == ENOENT/
{
exit(0);
@@ -53,7 +53,7 @@
sleeper()
{
while true; do
- /usr/bin/sleep 1
+ /bin/sleep 1
$badexec
done
}
==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ksh#2 (text+ko) ====
@@ -45,7 +45,7 @@
self->exec = 1;
}
- proc:::exec-failure
+ proc:::exec_failure
/self->exec/
{
exit(0);
@@ -56,7 +56,7 @@
sleeper()
{
while true; do
- /usr/bin/sleep 1
+ /bin/sleep 1
$badexec
done
}
==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitcore.ksh#2 (text+ko) ====
@@ -43,18 +43,16 @@
$dtrace -s /dev/stdin <<EOF
proc:::exit
/curpsinfo->pr_ppid == $child &&
- curpsinfo->pr_psargs == "$longsleep" && args[0] == CLD_DUMPED/
+ execargs == "$longsleep" && args[0] == CLD_DUMPED/
{
exit(0);
}
proc:::exit
/curpsinfo->pr_ppid == $child &&
- curpsinfo->pr_psargs == "$longsleep" && args[0] != CLD_DUMPED/
+ execargs == "$longsleep" && args[0] != CLD_DUMPED/
{
- printf("Child process could not dump core. Check coreadm(1M)");
- printf(" settings; either per-process or global core dumps ");
- printf("must be enabled for this test to work properly.");
+ printf("Child process could did dump core.");
exit(1);
}
EOF
@@ -62,13 +60,12 @@
sleeper()
{
- /usr/bin/coreadm -p $corefile
while true; do
$longsleep &
- /usr/bin/sleep 1
+ /bin/sleep 1
kill -SEGV $!
done
- /usr/bin/rm -f $corefile
+ /bin/rm -f $corefile
}
if [ $# != 1 ]; then
@@ -77,8 +74,8 @@
fi
dtrace=$1
-longsleep="/usr/bin/sleep 10000"
-corefile=/tmp/core.$$
+longsleep="/bin/sleep 10000"
+corefile=/tmp/sleep.core
sleeper &
child=$!
@@ -86,10 +83,10 @@
script
status=$?
-pstop $child
-pkill -P $child
+#pstop $child
+#pkill -P $child
kill $child
-prun $child
+#prun $child
-/usr/bin/rm -f $corefile
+/bin/rm -f $corefile
exit $status
==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitexit.ksh#2 (text+ko) ====
@@ -46,7 +46,7 @@
sleeper()
{
while true; do
- /usr/bin/sleep 1
+ /bin/sleep 1
done
}
==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.c#2 (text+ko) ====
@@ -33,6 +33,8 @@
#include <errno.h>
#include <string.h>
+#define NANOSEC 1000000000
+
int
main(int argc, char **argv)
{
@@ -41,6 +43,7 @@
sigset_t set;
timer_t tid;
char *cmd = argv[0];
+ int sig;
ev.sigev_notify = SIGEV_SIGNAL;
ev.sigev_signo = SIGUSR1;
@@ -66,9 +69,9 @@
exit(EXIT_FAILURE);
}
- for (;;) {
- (void) sigwait(&set);
- }
+ do {
+ (void) sigwait(&set, &sig);
+ } while(sig != SIGUSR1);
/*NOTREACHED*/
return (0);
==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.d#2 (text+ko) ====
@@ -28,13 +28,13 @@
#pragma D option destructive
-proc:::signal-send
-/pid == 0 && args[1]->pr_pid == $1 && args[2] == SIGUSR1/
+proc:::signal_send
+/args[1]->p_pid == $1 && args[2] == SIGUSR1/
{
sent = 1;
}
-proc:::signal-clear
+proc:::signal_clear
/pid == $1 && args[0] == SIGUSR1 && sent/
{
exit(0);
==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d#2 (text+ko) ====
@@ -54,7 +54,7 @@
timeout = timestamp + 500000000;
}
-syscall::rexit:entry
+syscall::exit:entry
{
exit(0);
}
==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.c#2 (text+ko) ====
@@ -28,6 +28,7 @@
#include <unistd.h>
#include <signal.h>
+#include <stdlib.h>
static void
handle(int sig)
==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d#2 (text+ko) ====
@@ -54,7 +54,7 @@
timeout = timestamp + 500000000;
}
-syscall::rexit:entry
+syscall::exit:entry
{
exit(0);
}
==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.c#2 (text+ko) ====
@@ -28,6 +28,7 @@
#include <unistd.h>
#include <signal.h>
+#include <stdlib.h>
static void
handle(int sig)
==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d#2 (text+ko) ====
@@ -54,7 +54,7 @@
timeout = timestamp + 500000000;
}
-syscall::rexit:entry
+syscall::exit:entry
{
exit(0);
}
==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/tst.misc.d#2 (text+ko) ====
@@ -61,3 +61,8 @@
{
exit(0);
}
+
+ERROR
+{
+ exit(1);
+}
==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/tst.rootvp.d#2 (text+ko) ====
@@ -52,3 +52,8 @@
{
exit(0);
}
+
+ERROR
+{
+ exit(1);
+}
==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/sgs/include/debug.h#2 (text) ====
@@ -786,7 +786,7 @@
const char *, int);
extern void Dbg_syms_ar_title(Lm_list *, const char *, int);
extern void Dbg_syms_created(Lm_list *, const char *);
-extern void Dbg_syms_discarded(Lm_list *, Sym_desc *, Is_desc *);
+extern void Dbg_syms_discarded(Lm_list *, Sym_desc *);
extern void Dbg_syms_dlsym(Rt_map *, const char *, const char *, int);
extern void Dbg_syms_dup_sort_addr(Lm_list *, const char *, const char *,
const char *, Addr);
==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/sgs/include/string_table.h#2 (text) ====
@@ -2,9 +2,8 @@
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
+ * 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.
@@ -20,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2003 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -29,109 +28,33 @@
#pragma ident "%Z%%M% %I% %E% SMI"
-#include <stdio.h>
#include <sys/types.h>
-#include <sys/avl.h>
-#include <sgs.h>
#ifdef __cplusplus
extern "C" {
#endif
-typedef struct str_hash Str_hash;
-typedef struct str_tbl Str_tbl;
-typedef struct str_master Str_master;
-
-
/*
- * The Stringlist is the list of 'input strings'
- * associatied with the AVL nodes Stringelem.
+ * Exported, opaque string table handle.
*/
-typedef struct stringlist {
- const char *sl_string;
- struct stringlist *sl_next;
-} Stringlist;
+typedef struct str_tbl Str_tbl;
/*
- * Nodes for the initial AVL tree which contains all of
- * the input strings. The AVL tree is indexed off of
- * the length of the strings. This permits later traversal
- * of all of the strings based off of their string length.
- */
-typedef struct {
- avl_node_t se_avlnode;
- Stringlist *se_strlist;
- uint_t se_stlen;
-} Stringelem;
-
-
-/*
- * Pointer to the Master string, other strings may be suffixes
- * of this string.
+ * Exported string table functions.
*/
-struct str_master {
- const char *sm_str; /* pointer to master string */
- Str_master *sm_next; /* used for tracking master strings */
- uint_t sm_stlen; /* length of master string */
- uint_t sm_hashval; /* hashval of master string */
- uint_t sm_stoff; /* offset into destination strtab */
-};
-
-
-/*
- * Represents a individual string that was input into
- * the String hash table. The string may either be a
- * suffix of another string or a master string.
- */
-struct str_hash {
- uint_t hi_stlen; /* string length */
- uint_t hi_refcnt; /* # of references to str */
- uint_t hi_hashval; /* hash for string */
- Str_master *hi_mstr; /* pointer to master string */
- Str_hash *hi_next; /* next entry in hash bckt */
-};
-
-/*
- * Controlling data structure for a String Table
- */
-struct str_tbl {
- avl_tree_t *st_strtree; /* avl tree of initial strs */
- char *st_strbuf; /* string buffer */
- Str_hash **st_hashbcks; /* hash buckets */
- Str_master *st_mstrlist; /* list of all master strings */
- uint_t st_fullstringsize; /* uncompressed table size */
- uint_t st_nextoff; /* next available string */
- uint_t st_stringsize; /* compressed size */
- uint_t st_stringcnt; /* # of strings */
- uint_t st_hbckcnt; /* # of buckets in hashlist */
- uint_t st_flags;
-};
-
-#define FLG_STTAB_COOKED 0x00000001 /* offset has been assigned */
-#define FLG_STTAB_COMPRESS 0x00000002 /* build compressed str tab */
-
-/*
- * starting value for use with string hashing functions
- * inside of string_table.c
- */
-#define HASHSEED 5381
-
-/*
- * Flags for st_new
- */
-#define FLG_STNEW_COMPRESS 0x00000001 /* build compressed str tab */
-
-/*
- * exported string_table.c functions
- */
extern int st_delstring(Str_tbl *, const char *);
extern void st_destroy(Str_tbl *);
extern uint_t st_getstrtab_sz(Str_tbl *);
extern const char *st_getstrbuf(Str_tbl *);
extern int st_insert(Str_tbl *, const char *);
+extern Str_tbl *st_new(uint_t);
extern int st_setstrbuf(Str_tbl *, char *, uint_t);
extern int st_setstring(Str_tbl *, const char *, uint_t *);
-extern Str_tbl *st_new(uint_t);
+
+/*
+ * Exported flags values for st_new().
+ */
+#define FLG_STNEW_COMPRESS 0x01 /* compressed string table */
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list