diff options
54 files changed, 214 insertions, 137 deletions
diff --git a/usr/src/cmd/Makefile b/usr/src/cmd/Makefile index 036049287c..98c962ca31 100644 --- a/usr/src/cmd/Makefile +++ b/usr/src/cmd/Makefile @@ -861,6 +861,9 @@ MANIFEST_SUBDIRS= \ ypcmd/ypupdated \ xntpd/xntpd +DTEST_SUBDIRS= \ + dtrace/test/tst + all := TARGET = all install := TARGET = install clean := TARGET = clean @@ -875,16 +878,20 @@ _dc := TARGET = _dc SUBDIRS = $(COMMON_SUBDIRS) $($(MACH)_SUBDIRS) .PARALLEL: $(BWOSDIRS) $(SUBDIRS) $(MSGSUBDIRS) $(BSMSUBDIRS) \ - $(MANIFEST_SUBDIRS) + $(MANIFEST_SUBDIRS) $(DTEST_SUBDIRS) all install clean clobber lint: $(FIRST_SUBDIRS) .WAIT $(SUBDIRS) $(BSMSUBDIRS) -check: svccfg_check .WAIT $(MANIFEST_TOPDIRS) $(MANIFEST_SUBDIRS) +check: svccfg_check .WAIT $(MANIFEST_TOPDIRS) $(MANIFEST_SUBDIRS) \ + $(DTEST_SUBDIRS) svccfg_check: @$(ECHO) "building requirements for svccfg check ..."; \ (cd $(SRC)/cmd/svc/svccfg && pwd && $(MAKE) $(MFLAGS) native) +$(DTEST_SUBDIRS): FRC + @cd $@; pwd; $(MAKE) $(TARGET) + # # The .WAIT directive works around an apparent bug in parallel make. # Evidently make was getting the target _msg vs. _dc confused under diff --git a/usr/src/cmd/dtrace/test/tst/Makefile b/usr/src/cmd/dtrace/test/tst/Makefile index 2e6277d319..7e8df313da 100644 --- a/usr/src/cmd/dtrace/test/tst/Makefile +++ b/usr/src/cmd/dtrace/test/tst/Makefile @@ -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. # #ident "%Z%%M% %I% %E% SMI" @@ -32,4 +32,8 @@ include ../Makefile.subdirs dstyle := TARGET += dstyle +check: FRC + @$(ECHO) "checking dstyle" + @$(MAKE) dstyle + dstyle: $(SUBDIRS) diff --git a/usr/src/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.mobadarg.d b/usr/src/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.mobadarg.d index 8c30c94127..4df8d1868c 100644 --- a/usr/src/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.mobadarg.d +++ b/usr/src/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.mobadarg.d @@ -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. */ @@ -34,8 +34,6 @@ * */ -#pragma ident "%Z%%M% %I% %E% SMI" - BEGIN { mutex_owned("badarg"); diff --git a/usr/src/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoofew.d b/usr/src/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoofew.d index 5845d1e84e..e878713abb 100644 --- a/usr/src/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoofew.d +++ b/usr/src/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoofew.d @@ -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. */ @@ -34,8 +34,6 @@ * */ -#pragma ident "%Z%%M% %I% %E% SMI" - lockstat:genunix:mutex_enter:adaptive-acquire { mutex_owned(); diff --git a/usr/src/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoomany.d b/usr/src/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoomany.d index 44a374df3e..d3b9ed486e 100644 --- a/usr/src/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoomany.d +++ b/usr/src/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoomany.d @@ -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. */ @@ -34,8 +34,6 @@ * */ -#pragma ident "%Z%%M% %I% %E% SMI" - lockstat:genunix:mutex_enter:adaptive-acquire { mutex_owned((kmutex_t *)arg0, 99); diff --git a/usr/src/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtabadarg.d b/usr/src/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtabadarg.d index f8340852c9..6ad1e47b43 100644 --- a/usr/src/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtabadarg.d +++ b/usr/src/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtabadarg.d @@ -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. */ @@ -34,7 +34,6 @@ * */ -#pragma ident "%Z%%M% %I% %E% SMI" BEGIN { diff --git a/usr/src/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.progenyofbad2.d b/usr/src/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.progenyofbad2.d index 8d2f41202d..51c8674def 100644 --- a/usr/src/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.progenyofbad2.d +++ b/usr/src/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.progenyofbad2.d @@ -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. */ @@ -36,9 +36,6 @@ */ -#pragma ident "%Z%%M% %I% %E% SMI" - - BEGIN { progenyof(trace()); diff --git a/usr/src/cmd/dtrace/test/tst/common/funcs/err.chillbadarg.ksh b/usr/src/cmd/dtrace/test/tst/common/funcs/err.chillbadarg.ksh index 76a94b6b30..98f04dd20c 100644 --- a/usr/src/cmd/dtrace/test/tst/common/funcs/err.chillbadarg.ksh +++ b/usr/src/cmd/dtrace/test/tst/common/funcs/err.chillbadarg.ksh @@ -20,11 +20,11 @@ */ /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" dtrace_script() { diff --git a/usr/src/cmd/dtrace/test/tst/common/funcs/err.copyoutbadaddr.ksh b/usr/src/cmd/dtrace/test/tst/common/funcs/err.copyoutbadaddr.ksh index 1cb05663b5..de5c47d5c0 100644 --- a/usr/src/cmd/dtrace/test/tst/common/funcs/err.copyoutbadaddr.ksh +++ b/usr/src/cmd/dtrace/test/tst/common/funcs/err.copyoutbadaddr.ksh @@ -20,12 +20,12 @@ */ /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" dtrace_script() diff --git a/usr/src/cmd/dtrace/test/tst/common/funcs/err.copyoutstrbadaddr.ksh b/usr/src/cmd/dtrace/test/tst/common/funcs/err.copyoutstrbadaddr.ksh index 6467709efd..181702b8ec 100644 --- a/usr/src/cmd/dtrace/test/tst/common/funcs/err.copyoutstrbadaddr.ksh +++ b/usr/src/cmd/dtrace/test/tst/common/funcs/err.copyoutstrbadaddr.ksh @@ -20,11 +20,11 @@ */ /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" dtrace_script() diff --git a/usr/src/cmd/dtrace/test/tst/common/mib/tst.icmp.ksh b/usr/src/cmd/dtrace/test/tst/common/mib/tst.icmp.ksh index ba3431ee02..b1cac20fc8 100644 --- a/usr/src/cmd/dtrace/test/tst/common/mib/tst.icmp.ksh +++ b/usr/src/cmd/dtrace/test/tst/common/mib/tst.icmp.ksh @@ -20,10 +20,10 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" # # This script tests that several of the the mib:::icmp* probes fire and fire diff --git a/usr/src/cmd/dtrace/test/tst/common/mib/tst.tcp.ksh b/usr/src/cmd/dtrace/test/tst/common/mib/tst.tcp.ksh index 448de6cc37..ee602e8611 100644 --- a/usr/src/cmd/dtrace/test/tst/common/mib/tst.tcp.ksh +++ b/usr/src/cmd/dtrace/test/tst/common/mib/tst.tcp.ksh @@ -20,18 +20,33 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" # # This script tests that several of the the mib:::tcp* probes fire and fire # with a valid args[0]. # + +if [ $# != 1 ]; then + echo expected one argument: '<'dtrace-path'>' + exit 2 +fi + +dtrace=$1 +dtraceout=/tmp/dtrace.out.$$ +timeout=15 +port=2000 + +if [ -f $dtraceout ]; then + rm -f $dtraceout +fi + script() { - $dtrace -s /dev/stdin <<EOF + $dtrace -o $dtraceout -s /dev/stdin <<EOF mib:::tcpActiveOpens { opens = args[0]; @@ -52,28 +67,89 @@ script() { exit(0); } + + profile:::tick-1s + /n++ >= 10/ + { + exit(1); + } EOF } -telneter() +server() { - while true; do - finger @localhost - /usr/bin/sleep 1 - done + perl /dev/stdin /dev/stdout << EOF + use strict; + use Socket; + + socket(S, AF_INET, SOCK_STREAM, getprotobyname('tcp')) + or die "socket() failed: \$!"; + + setsockopt(S, SOL_SOCKET, SO_REUSEADDR, 1) + or die "setsockopt() failed: \$!"; + + my \$addr = sockaddr_in($port, INADDR_ANY); + bind(S, \$addr) or die "bind() failed: \$!"; + listen(S, SOMAXCONN) or die "listen() failed: \$!"; + + while (1) { + next unless my \$raddr = accept(SESSION, S); + + while (<SESSION>) { + } + + close SESSION; + } +EOF } -if [ $# != 1 ]; then - echo expected one argument: '<'dtrace-path'>' - exit 2 -fi +client() +{ + perl /dev/stdin /dev/stdout <<EOF + use strict; + use Socket; -dtrace=$1 + my \$peer = sockaddr_in($port, INADDR_ANY); + + socket(S, AF_INET, SOCK_STREAM, getprotobyname('tcp')) + or die "socket() failed: \$!"; -telneter & -telneter=$! -script + connect(S, \$peer) or die "connect failed: \$!"; + + for (my \$i = 0; \$i < 10; \$i++) { + send(S, "There!", 0) or die "send() failed: \$!"; + sleep (1); + } +EOF +} + +script & +dtrace_pid=$! + +# +# Sleep while the above script fires into life. To guard against dtrace dying +# and us sleeping forever we allow 15 secs for this to happen. This should be +# enough for even the slowest systems. +# +while [ ! -f $dtraceout ]; do + sleep 1 + timeout=$(($timeout-1)) + if [ $timeout -eq 0 ]; then + echo "dtrace failed to start. Exiting." + exit 1 + fi +done + +server & +server_pid=$! +sleep 2 +client & +client_pid=$! + +wait $dtrace_pid status=$? -kill $telneter +kill $server_pid +kill $client_pid + exit $status diff --git a/usr/src/cmd/dtrace/test/tst/common/mib/tst.udp.ksh b/usr/src/cmd/dtrace/test/tst/common/mib/tst.udp.ksh index 3ef9fb0495..a492124c9c 100644 --- a/usr/src/cmd/dtrace/test/tst/common/mib/tst.udp.ksh +++ b/usr/src/cmd/dtrace/test/tst/common/mib/tst.udp.ksh @@ -23,7 +23,7 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" # # This script tests that several of the the mib:::udp* probes fire and fire diff --git a/usr/src/cmd/dtrace/test/tst/common/pid/tst.manypids.ksh b/usr/src/cmd/dtrace/test/tst/common/pid/tst.manypids.ksh index 28e1607a9c..869339bafb 100644 --- a/usr/src/cmd/dtrace/test/tst/common/pid/tst.manypids.ksh +++ b/usr/src/cmd/dtrace/test/tst/common/pid/tst.manypids.ksh @@ -20,10 +20,10 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" if [ $# != 1 ]; then echo expected one argument: '<'dtrace-path'>' diff --git a/usr/src/cmd/dtrace/test/tst/common/proc/tst.create.ksh b/usr/src/cmd/dtrace/test/tst/common/proc/tst.create.ksh index ee4fb1e8f3..5b484cf084 100644 --- a/usr/src/cmd/dtrace/test/tst/common/proc/tst.create.ksh +++ b/usr/src/cmd/dtrace/test/tst/common/proc/tst.create.ksh @@ -20,10 +20,10 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" # # This script tests that the proc:::create probe fires with the proper diff --git a/usr/src/cmd/dtrace/test/tst/common/proc/tst.discard.ksh b/usr/src/cmd/dtrace/test/tst/common/proc/tst.discard.ksh index 86c8d3f2c0..5595c24aaa 100644 --- a/usr/src/cmd/dtrace/test/tst/common/proc/tst.discard.ksh +++ b/usr/src/cmd/dtrace/test/tst/common/proc/tst.discard.ksh @@ -20,10 +20,10 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" # # This script tests that the proc:::signal-discard probe fires correctly diff --git a/usr/src/cmd/dtrace/test/tst/common/proc/tst.exec.ksh b/usr/src/cmd/dtrace/test/tst/common/proc/tst.exec.ksh index 5923f5eab8..0318ae6daf 100644 --- a/usr/src/cmd/dtrace/test/tst/common/proc/tst.exec.ksh +++ b/usr/src/cmd/dtrace/test/tst/common/proc/tst.exec.ksh @@ -20,10 +20,10 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" # # This script tests that the proc:::exec probe fires, followed by the diff --git a/usr/src/cmd/dtrace/test/tst/common/proc/tst.execfail.ENOENT.ksh b/usr/src/cmd/dtrace/test/tst/common/proc/tst.execfail.ENOENT.ksh index 9c0d54191e..fb1efc5432 100644 --- a/usr/src/cmd/dtrace/test/tst/common/proc/tst.execfail.ENOENT.ksh +++ b/usr/src/cmd/dtrace/test/tst/common/proc/tst.execfail.ENOENT.ksh @@ -20,10 +20,10 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" # # This script is identical to tst.execfail.ksh -- but it additionally checks diff --git a/usr/src/cmd/dtrace/test/tst/common/proc/tst.execfail.ksh b/usr/src/cmd/dtrace/test/tst/common/proc/tst.execfail.ksh index 552ccc06a5..d2241e1e56 100644 --- a/usr/src/cmd/dtrace/test/tst/common/proc/tst.execfail.ksh +++ b/usr/src/cmd/dtrace/test/tst/common/proc/tst.execfail.ksh @@ -20,10 +20,10 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" # # This script tests that -- if a exec(2) fails -- the proc:::exec probe fires, diff --git a/usr/src/cmd/dtrace/test/tst/common/proc/tst.exitcore.ksh b/usr/src/cmd/dtrace/test/tst/common/proc/tst.exitcore.ksh index a48149325c..df3fdb3d6d 100644 --- a/usr/src/cmd/dtrace/test/tst/common/proc/tst.exitcore.ksh +++ b/usr/src/cmd/dtrace/test/tst/common/proc/tst.exitcore.ksh @@ -20,10 +20,10 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" # # This script tests that the proc:::exit probe fires with the correct argument diff --git a/usr/src/cmd/dtrace/test/tst/common/proc/tst.exitexit.ksh b/usr/src/cmd/dtrace/test/tst/common/proc/tst.exitexit.ksh index 70abcc243a..13af911cad 100644 --- a/usr/src/cmd/dtrace/test/tst/common/proc/tst.exitexit.ksh +++ b/usr/src/cmd/dtrace/test/tst/common/proc/tst.exitexit.ksh @@ -20,10 +20,10 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" # # This script tests that the proc:::exit probe fires with the correct argument diff --git a/usr/src/cmd/dtrace/test/tst/common/proc/tst.exitkilled.ksh b/usr/src/cmd/dtrace/test/tst/common/proc/tst.exitkilled.ksh index 11b19ad108..8040ade637 100644 --- a/usr/src/cmd/dtrace/test/tst/common/proc/tst.exitkilled.ksh +++ b/usr/src/cmd/dtrace/test/tst/common/proc/tst.exitkilled.ksh @@ -20,10 +20,10 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" # # This script tests that the proc:::exit probe fires with the correct argument diff --git a/usr/src/cmd/dtrace/test/tst/common/proc/tst.signal.ksh b/usr/src/cmd/dtrace/test/tst/common/proc/tst.signal.ksh index 3872bb17fd..cd3c791804 100644 --- a/usr/src/cmd/dtrace/test/tst/common/proc/tst.signal.ksh +++ b/usr/src/cmd/dtrace/test/tst/common/proc/tst.signal.ksh @@ -20,10 +20,10 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" # # This script tests that the proc:::signal-send and proc:::signal-handle diff --git a/usr/src/cmd/dtrace/test/tst/common/proc/tst.startexit.ksh b/usr/src/cmd/dtrace/test/tst/common/proc/tst.startexit.ksh index a71f19c850..429173806f 100644 --- a/usr/src/cmd/dtrace/test/tst/common/proc/tst.startexit.ksh +++ b/usr/src/cmd/dtrace/test/tst/common/proc/tst.startexit.ksh @@ -20,10 +20,10 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" # # This script tests that the firing order of probes in a process is: diff --git a/usr/src/cmd/dtrace/test/tst/common/profile-n/tst.func.ksh b/usr/src/cmd/dtrace/test/tst/common/profile-n/tst.func.ksh index 7bae0ff819..358d3625da 100644 --- a/usr/src/cmd/dtrace/test/tst/common/profile-n/tst.func.ksh +++ b/usr/src/cmd/dtrace/test/tst/common/profile-n/tst.func.ksh @@ -20,10 +20,10 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" script() { diff --git a/usr/src/cmd/dtrace/test/tst/common/profile-n/tst.mod.ksh b/usr/src/cmd/dtrace/test/tst/common/profile-n/tst.mod.ksh index f813c933b3..4652ff32cd 100644 --- a/usr/src/cmd/dtrace/test/tst/common/profile-n/tst.mod.ksh +++ b/usr/src/cmd/dtrace/test/tst/common/profile-n/tst.mod.ksh @@ -20,10 +20,10 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" script() { diff --git a/usr/src/cmd/dtrace/test/tst/common/profile-n/tst.sym.ksh b/usr/src/cmd/dtrace/test/tst/common/profile-n/tst.sym.ksh index 24fee53e49..218a651c91 100644 --- a/usr/src/cmd/dtrace/test/tst/common/profile-n/tst.sym.ksh +++ b/usr/src/cmd/dtrace/test/tst/common/profile-n/tst.sym.ksh @@ -20,10 +20,10 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" script() { diff --git a/usr/src/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh b/usr/src/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh index 94f49230ce..69c0f84a49 100644 --- a/usr/src/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh +++ b/usr/src/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh @@ -20,10 +20,10 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" script() { diff --git a/usr/src/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh b/usr/src/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh index e351a5f03f..6ca823f5dd 100644 --- a/usr/src/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh +++ b/usr/src/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh @@ -20,10 +20,10 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" script() { diff --git a/usr/src/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh b/usr/src/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh index c628ffcaa5..b1a3ab9de2 100644 --- a/usr/src/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh +++ b/usr/src/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh @@ -20,10 +20,10 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" script() { diff --git a/usr/src/cmd/dtrace/test/tst/common/safety/tst.violentdeath.ksh b/usr/src/cmd/dtrace/test/tst/common/safety/tst.violentdeath.ksh index adaf25e067..879774a42e 100644 --- a/usr/src/cmd/dtrace/test/tst/common/safety/tst.violentdeath.ksh +++ b/usr/src/cmd/dtrace/test/tst/common/safety/tst.violentdeath.ksh @@ -20,10 +20,10 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" script() { diff --git a/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_COMM_COMM.CommitAftCommit.d b/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_COMM_COMM.CommitAftCommit.d index 17ad40b2ee..ebc316a9fe 100644 --- a/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_COMM_COMM.CommitAftCommit.d +++ b/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_COMM_COMM.CommitAftCommit.d @@ -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. */ @@ -34,7 +34,7 @@ * Options and Tunables/cleanrate */ #pragma D option quiet -#pragma D option cleanrate=3000 +#pragma D option cleanrate=3000hz BEGIN { diff --git a/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_COMM_COMM.DisjointCommit.d b/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_COMM_COMM.DisjointCommit.d index 79f9e842c5..e482d07ee4 100644 --- a/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_COMM_COMM.DisjointCommit.d +++ b/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_COMM_COMM.DisjointCommit.d @@ -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. */ @@ -34,7 +34,7 @@ * Options and Tunables/cleanrate */ #pragma D option quiet -#pragma D option cleanrate=3000 +#pragma D option cleanrate=3000hz BEGIN { diff --git a/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_DREC_COMM.DataRecAftCommit.d b/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_DREC_COMM.DataRecAftCommit.d index 50ebe2d0fb..75560d8317 100644 --- a/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_DREC_COMM.DataRecAftCommit.d +++ b/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_DREC_COMM.DataRecAftCommit.d @@ -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. */ @@ -35,7 +35,7 @@ * */ #pragma D option quiet -#pragma D option cleanrate=2000 +#pragma D option cleanrate=2000hz BEGIN { diff --git a/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_PRAGMA_MALFORM.NspecExpr.d b/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_PRAGMA_MALFORM.NspecExpr.d index a31e338147..91168e3008 100644 --- a/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_PRAGMA_MALFORM.NspecExpr.d +++ b/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_PRAGMA_MALFORM.NspecExpr.d @@ -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. */ @@ -37,7 +37,7 @@ */ #pragma D option quiet -#pragma D option cleanrate=3000 +#pragma D option cleanrate=3000hz #pragma D option nspec=24 * 44 BEGIN diff --git a/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_PRAGMA_OPTSET.HugeNspecValue.d b/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_PRAGMA_OPTSET.HugeNspecValue.d index d9386a4509..d13132ef58 100644 --- a/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_PRAGMA_OPTSET.HugeNspecValue.d +++ b/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_PRAGMA_OPTSET.HugeNspecValue.d @@ -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. */ @@ -36,7 +36,7 @@ */ #pragma D option quiet -#pragma D option cleanrate=3000 +#pragma D option cleanrate=3000hz #pragma D option nspec=245566729809009887663 BEGIN diff --git a/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_SPEC_COMM.SpecAftCommit.d b/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_SPEC_COMM.SpecAftCommit.d index 2847c968b7..ec4b22b809 100644 --- a/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_SPEC_COMM.SpecAftCommit.d +++ b/usr/src/cmd/dtrace/test/tst/common/speculation/err.D_SPEC_COMM.SpecAftCommit.d @@ -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. */ @@ -35,7 +35,7 @@ * */ #pragma D option quiet -#pragma D option cleanrate=3000 +#pragma D option cleanrate=3000hz BEGIN { diff --git a/usr/src/cmd/dtrace/test/tst/common/speculation/tst.CommitAfterDiscard.d b/usr/src/cmd/dtrace/test/tst/common/speculation/tst.CommitAfterDiscard.d index b6e0aa6a20..a874ab5b55 100644 --- a/usr/src/cmd/dtrace/test/tst/common/speculation/tst.CommitAfterDiscard.d +++ b/usr/src/cmd/dtrace/test/tst/common/speculation/tst.CommitAfterDiscard.d @@ -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. */ @@ -36,7 +36,7 @@ * */ #pragma D option quiet -#pragma D option cleanrate=3000 +#pragma D option cleanrate=3000hz BEGIN { diff --git a/usr/src/cmd/dtrace/test/tst/common/speculation/tst.CommitWithZero.d b/usr/src/cmd/dtrace/test/tst/common/speculation/tst.CommitWithZero.d index be2e18d185..647552fbbf 100644 --- a/usr/src/cmd/dtrace/test/tst/common/speculation/tst.CommitWithZero.d +++ b/usr/src/cmd/dtrace/test/tst/common/speculation/tst.CommitWithZero.d @@ -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. */ @@ -34,7 +34,7 @@ * Options and Tunables/cleanrate */ #pragma D option quiet -#pragma D option cleanrate=4000 +#pragma D option cleanrate=4000hz BEGIN { diff --git a/usr/src/cmd/dtrace/test/tst/common/speculation/tst.DataRecAftDiscard.d b/usr/src/cmd/dtrace/test/tst/common/speculation/tst.DataRecAftDiscard.d index 856eeb83c1..03ae1b5ff1 100644 --- a/usr/src/cmd/dtrace/test/tst/common/speculation/tst.DataRecAftDiscard.d +++ b/usr/src/cmd/dtrace/test/tst/common/speculation/tst.DataRecAftDiscard.d @@ -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. */ @@ -34,7 +34,7 @@ * Options and Tunables/cleanrate */ #pragma D option quiet -#pragma D option cleanrate=2000 +#pragma D option cleanrate=2000hz BEGIN { diff --git a/usr/src/cmd/dtrace/test/tst/common/speculation/tst.DiscardAftCommit.d b/usr/src/cmd/dtrace/test/tst/common/speculation/tst.DiscardAftCommit.d index 993e5a81c1..25fcfc542a 100644 --- a/usr/src/cmd/dtrace/test/tst/common/speculation/tst.DiscardAftCommit.d +++ b/usr/src/cmd/dtrace/test/tst/common/speculation/tst.DiscardAftCommit.d @@ -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. */ @@ -35,7 +35,7 @@ * */ #pragma D option quiet -#pragma D option cleanrate=3000 +#pragma D option cleanrate=3000hz BEGIN { diff --git a/usr/src/cmd/dtrace/test/tst/common/speculation/tst.DiscardAftDiscard.d b/usr/src/cmd/dtrace/test/tst/common/speculation/tst.DiscardAftDiscard.d index 1353d8e505..8c95cee748 100644 --- a/usr/src/cmd/dtrace/test/tst/common/speculation/tst.DiscardAftDiscard.d +++ b/usr/src/cmd/dtrace/test/tst/common/speculation/tst.DiscardAftDiscard.d @@ -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. */ @@ -35,7 +35,7 @@ * */ #pragma D option quiet -#pragma D option cleanrate=3000 +#pragma D option cleanrate=3000hz BEGIN { diff --git a/usr/src/cmd/dtrace/test/tst/common/speculation/tst.DiscardWithZero.d b/usr/src/cmd/dtrace/test/tst/common/speculation/tst.DiscardWithZero.d index 6b212014b6..1a78561378 100644 --- a/usr/src/cmd/dtrace/test/tst/common/speculation/tst.DiscardWithZero.d +++ b/usr/src/cmd/dtrace/test/tst/common/speculation/tst.DiscardWithZero.d @@ -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. */ @@ -34,7 +34,7 @@ * Options and Tunables/cleanrate */ #pragma D option quiet -#pragma D option cleanrate=4000 +#pragma D option cleanrate=4000hz BEGIN { diff --git a/usr/src/cmd/dtrace/test/tst/common/speculation/tst.SpeculationCommit.d b/usr/src/cmd/dtrace/test/tst/common/speculation/tst.SpeculationCommit.d index 6790301729..744ba67664 100644 --- a/usr/src/cmd/dtrace/test/tst/common/speculation/tst.SpeculationCommit.d +++ b/usr/src/cmd/dtrace/test/tst/common/speculation/tst.SpeculationCommit.d @@ -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. */ @@ -35,7 +35,7 @@ * */ #pragma D option quiet -#pragma D option cleanrate=2000 +#pragma D option cleanrate=2000hz BEGIN { diff --git a/usr/src/cmd/dtrace/test/tst/common/speculation/tst.SpeculationDiscard.d b/usr/src/cmd/dtrace/test/tst/common/speculation/tst.SpeculationDiscard.d index d790d9e4b6..4ac0e236d1 100644 --- a/usr/src/cmd/dtrace/test/tst/common/speculation/tst.SpeculationDiscard.d +++ b/usr/src/cmd/dtrace/test/tst/common/speculation/tst.SpeculationDiscard.d @@ -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. */ @@ -34,7 +34,7 @@ * */ #pragma D option quiet -#pragma D option cleanrate=2000 +#pragma D option cleanrate=2000hz BEGIN { diff --git a/usr/src/cmd/dtrace/test/tst/common/speculation/tst.TwoSpecBuffers.d b/usr/src/cmd/dtrace/test/tst/common/speculation/tst.TwoSpecBuffers.d index 7a485cf32e..8016b200c5 100644 --- a/usr/src/cmd/dtrace/test/tst/common/speculation/tst.TwoSpecBuffers.d +++ b/usr/src/cmd/dtrace/test/tst/common/speculation/tst.TwoSpecBuffers.d @@ -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. */ @@ -37,7 +37,7 @@ */ #pragma D option quiet -#pragma D option cleanrate=3000 +#pragma D option cleanrate=3000hz #pragma D option nspec=2 BEGIN diff --git a/usr/src/cmd/dtrace/test/tst/common/sysevent/tst.post.d b/usr/src/cmd/dtrace/test/tst/common/sysevent/tst.post.d index 819e7648d8..e547a2610c 100644 --- a/usr/src/cmd/dtrace/test/tst/common/sysevent/tst.post.d +++ b/usr/src/cmd/dtrace/test/tst/common/sysevent/tst.post.d @@ -31,10 +31,10 @@ BEGIN { $1 + 0; /* make sure pid is referenced */ - /* - * Wait no more than a five seconds for the sysevent to be posted - */ - timeout = timestamp + 5000000000; + /* + * Wait no more than a five seconds for the sysevent to be posted + */ + timeout = timestamp + 5000000000; } sysevent:::post @@ -83,6 +83,6 @@ sysevent:::post profile:::tick-8 /timestamp > timeout/ { - printf("timed out\n"); - exit(1); + printf("timed out\n"); + exit(1); } diff --git a/usr/src/cmd/dtrace/test/tst/common/sysevent/tst.post_chan.d b/usr/src/cmd/dtrace/test/tst/common/sysevent/tst.post_chan.d index 2fea1e8f3f..9d12e1eccc 100644 --- a/usr/src/cmd/dtrace/test/tst/common/sysevent/tst.post_chan.d +++ b/usr/src/cmd/dtrace/test/tst/common/sysevent/tst.post_chan.d @@ -31,10 +31,10 @@ BEGIN { $1 + 0; /* make sure pid is referenced */ - /* - * Wait no more than five seconds for the sysevent to be posted - */ - timeout = timestamp + 5000000000; + /* + * Wait no more than five seconds for the sysevent to be posted + */ + timeout = timestamp + 5000000000; } sysevent:::post @@ -82,6 +82,6 @@ sysevent:::post profile:::tick-8 /timestamp > timeout/ { - printf("timed out\n"); - exit(1); + printf("timed out\n"); + exit(1); } diff --git a/usr/src/cmd/dtrace/test/tst/common/usdt/tst.entryreturn.ksh b/usr/src/cmd/dtrace/test/tst/common/usdt/tst.entryreturn.ksh index 7a429a0866..9d2646cdf1 100644 --- a/usr/src/cmd/dtrace/test/tst/common/usdt/tst.entryreturn.ksh +++ b/usr/src/cmd/dtrace/test/tst/common/usdt/tst.entryreturn.ksh @@ -20,10 +20,10 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" if [ $# != 1 ]; then echo expected one argument: '<'dtrace-path'>' diff --git a/usr/src/cmd/dtrace/test/tst/common/usdt/tst.reeval.ksh b/usr/src/cmd/dtrace/test/tst/common/usdt/tst.reeval.ksh index 52b6272d5c..7fad40156a 100644 --- a/usr/src/cmd/dtrace/test/tst/common/usdt/tst.reeval.ksh +++ b/usr/src/cmd/dtrace/test/tst/common/usdt/tst.reeval.ksh @@ -20,10 +20,10 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" if [ $# != 1 ]; then echo expected one argument: '<'dtrace-path'>' diff --git a/usr/src/cmd/dtrace/test/tst/common/ustack/tst.bigstack.d b/usr/src/cmd/dtrace/test/tst/common/ustack/tst.bigstack.d index 1809b1ac00..66fda5ba28 100644 --- a/usr/src/cmd/dtrace/test/tst/common/ustack/tst.bigstack.d +++ b/usr/src/cmd/dtrace/test/tst/common/ustack/tst.bigstack.d @@ -29,17 +29,17 @@ syscall::getpid:entry /pid == $1/ { - @[ustackdepth] = count(); + @[ustackdepth] = count(); } ERROR /arg4 == DTRACEFLT_BADSTACK/ { - exit(0); + exit(0); } profile:::tick-1s /++n == 10/ { - exit(1) + exit(1) } diff --git a/usr/src/cmd/dtrace/test/tst/common/vars/tst.ucaller.ksh b/usr/src/cmd/dtrace/test/tst/common/vars/tst.ucaller.ksh index 87d8319dea..8427ea0cb4 100644 --- a/usr/src/cmd/dtrace/test/tst/common/vars/tst.ucaller.ksh +++ b/usr/src/cmd/dtrace/test/tst/common/vars/tst.ucaller.ksh @@ -20,10 +20,10 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" # # This test is a bit naughty; it's assuming that ld.so.1 has an implementation diff --git a/usr/src/cmd/dtrace/test/tst/i386/ustack/tst.circstack.d b/usr/src/cmd/dtrace/test/tst/i386/ustack/tst.circstack.d index 79bed7cdf0..78218bd72a 100644 --- a/usr/src/cmd/dtrace/test/tst/i386/ustack/tst.circstack.d +++ b/usr/src/cmd/dtrace/test/tst/i386/ustack/tst.circstack.d @@ -29,18 +29,18 @@ syscall::getpid:entry /pid == $1/ { - @[ustackdepth] = count(); + @[ustackdepth] = count(); } ERROR /arg4 == DTRACEFLT_BADSTACK/ { - exit(0); + exit(0); } profile:::tick-1s /++n == 10/ { - exit(1) + exit(1) } diff --git a/usr/src/cmd/dtrace/test/tst/sparc/ustack/tst.circstack.d b/usr/src/cmd/dtrace/test/tst/sparc/ustack/tst.circstack.d index 79bed7cdf0..78218bd72a 100644 --- a/usr/src/cmd/dtrace/test/tst/sparc/ustack/tst.circstack.d +++ b/usr/src/cmd/dtrace/test/tst/sparc/ustack/tst.circstack.d @@ -29,18 +29,18 @@ syscall::getpid:entry /pid == $1/ { - @[ustackdepth] = count(); + @[ustackdepth] = count(); } ERROR /arg4 == DTRACEFLT_BADSTACK/ { - exit(0); + exit(0); } profile:::tick-1s /++n == 10/ { - exit(1) + exit(1) } |