diff options
45 files changed, 194 insertions, 234 deletions
diff --git a/usr/src/cmd/dtrace/test/cmd/jdtrace/src/jdtrace.c b/usr/src/cmd/dtrace/test/cmd/jdtrace/src/jdtrace.c index dec1fda3ce..095126569c 100644 --- a/usr/src/cmd/dtrace/test/cmd/jdtrace/src/jdtrace.c +++ b/usr/src/cmd/dtrace/test/cmd/jdtrace/src/jdtrace.c @@ -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,17 +37,10 @@ main(int argc, char **argv) int i, ac, has64; char **av, **p; - has64 = (sysinfo(SI_ARCHITECTURE_64, NULL, 0) != -1); - ac = argc + 3; - if (has64) - ac++; - av = p = alloca(sizeof (char *) * ac); *p++ = "java"; - if (has64) - *p++ = "-d64"; *p++ = "-jar"; *p++ = "/opt/SUNWdtrt/lib/java/jdtrace.jar"; diff --git a/usr/src/cmd/dtrace/test/pkg/SUNWdtrt/prototype_com b/usr/src/cmd/dtrace/test/pkg/SUNWdtrt/prototype_com index 67c018e4ca..17c8bc8881 100644 --- a/usr/src/cmd/dtrace/test/pkg/SUNWdtrt/prototype_com +++ b/usr/src/cmd/dtrace/test/pkg/SUNWdtrt/prototype_com @@ -1366,7 +1366,6 @@ f none opt/SUNWdtrt/bin/jdtrace 0555 root bin f none opt/SUNWdtrt/bin/exception.lst 0444 root bin d none opt/SUNWdtrt/tst/common/java_api 0755 root bin f none opt/SUNWdtrt/tst/common/java_api/test.jar 0644 root bin -f none opt/SUNWdtrt/tst/common/java_api/bitarch.exe 0555 root bin f none opt/SUNWdtrt/tst/common/java_api/tst.ProbeDescription.ksh 0444 root bin f none opt/SUNWdtrt/tst/common/java_api/tst.ProbeDescription.ksh.out 0444 root bin f none opt/SUNWdtrt/tst/common/java_api/tst.Bean.ksh 0444 root bin diff --git a/usr/src/cmd/dtrace/test/tst/common/java_api/src/TestBean.java b/usr/src/cmd/dtrace/test/tst/common/java_api/src/TestBean.java index c1925875c0..aad4e99a6a 100644 --- a/usr/src/cmd/dtrace/test/tst/common/java_api/src/TestBean.java +++ b/usr/src/cmd/dtrace/test/tst/common/java_api/src/TestBean.java @@ -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" @@ -72,9 +72,13 @@ public class TestBean { "Flow", "KernelSymbolRecord", "UserSymbolRecord", - "UserSymbolRecord$Value" + "UserSymbolRecord$Value", + "Program", + "Program$File" }; + static File file; + static void exit(int status) { @@ -485,6 +489,44 @@ public class TestBean { return v; } + public static Program + getProgram() + { + final String PROGRAM = "syscall:::entry { @[execname] = count(); }"; + Consumer consumer = new LocalConsumer(); + Program p; + try { + consumer.open(); + p = consumer.compile(PROGRAM); + consumer.close(); + } catch (DTraceException e) { + e.printStackTrace(); + p = null; + } + return p; + } + + public static Program.File + getProgram$File() + { + final String PROGRAM = "syscall:::entry { @[execname] = count(); }"; + Consumer consumer = new LocalConsumer(); + Program p; + try { + OutputStream out = new FileOutputStream(file); + out.write(PROGRAM.getBytes(), 0, PROGRAM.length()); + out.flush(); + out.close(); + consumer.open(); + p = consumer.compile(file); + consumer.close(); + } catch (Exception e) { + e.printStackTrace(); + p = null; + } + return Program.File.class.cast(p); + } + static String getString(Object o) { @@ -578,6 +620,11 @@ public class TestBean { exit(1); } + Class c = obj.getClass(); + if (c.getConstructors().length == 0) { + return; + } + System.out.println(classname + ":"); XMLEncoder encoder = getXMLEncoder(file); String encoded = getString(obj); @@ -612,7 +659,7 @@ public class TestBean { classname = args[1]; } - File file = new File(filename); + file = new File(filename); try { if (!file.canRead()) { try { diff --git a/usr/src/cmd/dtrace/test/tst/common/java_api/tst.Abort.ksh b/usr/src/cmd/dtrace/test/tst/common/java_api/tst.Abort.ksh index d55bfcf0a0..85c2c706af 100644 --- a/usr/src/cmd/dtrace/test/tst/common/java_api/tst.Abort.ksh +++ b/usr/src/cmd/dtrace/test/tst/common/java_api/tst.Abort.ksh @@ -21,7 +21,7 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -36,11 +36,4 @@ # ############################################################################ -FLAGS="" -ARCH=`bitarch.exe` - -if [ $ARCH == "64" ]; then - FLAGS="-d64" -fi - -java $FLAGS -cp test.jar TestAbort +java -cp test.jar TestAbort diff --git a/usr/src/cmd/dtrace/test/tst/common/java_api/tst.Bean.ksh b/usr/src/cmd/dtrace/test/tst/common/java_api/tst.Bean.ksh index 8540c8e6b9..99b232eb98 100644 --- a/usr/src/cmd/dtrace/test/tst/common/java_api/tst.Bean.ksh +++ b/usr/src/cmd/dtrace/test/tst/common/java_api/tst.Bean.ksh @@ -21,7 +21,7 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -37,12 +37,5 @@ # ############################################################################ -FLAGS="" -ARCH=`bitarch.exe` - -if [ $ARCH == "64" ]; then - FLAGS="-d64" -fi - -java $FLAGS -cp test.jar TestBean TestBean.out +java -cp test.jar TestBean TestBean.out rm -f TestBean.out diff --git a/usr/src/cmd/dtrace/test/tst/common/java_api/tst.Bean.ksh.out b/usr/src/cmd/dtrace/test/tst/common/java_api/tst.Bean.ksh.out index ffe130bfd5..3e96bb06f7 100644 --- a/usr/src/cmd/dtrace/test/tst/common/java_api/tst.Bean.ksh.out +++ b/usr/src/cmd/dtrace/test/tst/common/java_api/tst.Bean.ksh.out @@ -688,3 +688,9 @@ UserSymbolRecord$Value: UserSymbolRecord$Value: encoded: org.opensolaris.os.dtrace.UserSymbolRecord$Value[processID = 7, address = -1] decoded: org.opensolaris.os.dtrace.UserSymbolRecord$Value[processID = 7, address = -1] +Program: + serialized: org.opensolaris.os.dtrace.Program[contents = syscall:::entry { @[execname] = count(); }, info = null] + deserialized: org.opensolaris.os.dtrace.Program[contents = syscall:::entry { @[execname] = count(); }, info = null] +Program$File: + serialized: org.opensolaris.os.dtrace.Program$File[super = org.opensolaris.os.dtrace.Program[contents = syscall:::entry { @[execname] = count(); }, info = null], file = TestBean.out] + deserialized: org.opensolaris.os.dtrace.Program$File[super = org.opensolaris.os.dtrace.Program[contents = syscall:::entry { @[execname] = count(); }, info = null], file = TestBean.out] diff --git a/usr/src/cmd/dtrace/test/tst/common/java_api/tst.Close.ksh b/usr/src/cmd/dtrace/test/tst/common/java_api/tst.Close.ksh index 5d803745ca..299755c663 100644 --- a/usr/src/cmd/dtrace/test/tst/common/java_api/tst.Close.ksh +++ b/usr/src/cmd/dtrace/test/tst/common/java_api/tst.Close.ksh @@ -21,7 +21,7 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -35,11 +35,4 @@ # ############################################################################ -FLAGS="" -ARCH=`bitarch.exe` - -if [ $ARCH == "64" ]; then - FLAGS="-d64" -fi - -java $FLAGS -cp test.jar TestClose +java -cp test.jar TestClose diff --git a/usr/src/cmd/dtrace/test/tst/common/java_api/tst.Enable.ksh b/usr/src/cmd/dtrace/test/tst/common/java_api/tst.Enable.ksh index cd644b35a9..df1c11f0c2 100644 --- a/usr/src/cmd/dtrace/test/tst/common/java_api/tst.Enable.ksh +++ b/usr/src/cmd/dtrace/test/tst/common/java_api/tst.Enable.ksh @@ -21,7 +21,7 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -37,11 +37,4 @@ # ############################################################################ -FLAGS="" -ARCH=`bitarch.exe` - -if [ $ARCH == "64" ]; then - FLAGS="-d64" -fi - -java $FLAGS -cp test.jar TestEnable +java -cp test.jar TestEnable diff --git a/usr/src/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.ksh b/usr/src/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.ksh index 38968c8b32..e1ffbdfa47 100644 --- a/usr/src/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.ksh +++ b/usr/src/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.ksh @@ -21,7 +21,7 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -36,11 +36,4 @@ # ############################################################################ -FLAGS="" -ARCH=`bitarch.exe` - -if [ $ARCH == "64" ]; then - FLAGS="-d64" -fi - -java $FLAGS -cp test.jar TestFunctionLookup tst.FunctionLookup.exe +java -cp test.jar TestFunctionLookup ./tst.FunctionLookup.exe diff --git a/usr/src/cmd/dtrace/test/tst/common/java_api/tst.MaxConsumers.ksh b/usr/src/cmd/dtrace/test/tst/common/java_api/tst.MaxConsumers.ksh index 9c1f3623e9..992fcb5e8b 100644 --- a/usr/src/cmd/dtrace/test/tst/common/java_api/tst.MaxConsumers.ksh +++ b/usr/src/cmd/dtrace/test/tst/common/java_api/tst.MaxConsumers.ksh @@ -36,19 +36,12 @@ # ############################################################################ -FLAGS="" -ARCH=`bitarch.exe` - -if [ $ARCH == "64" ]; then - FLAGS="-d64" -fi - -java $FLAGS -cp test.jar TestMaxConsumers -java $FLAGS -DJAVA_DTRACE_MAX_CONSUMERS=-1 -cp test.jar TestMaxConsumers -java $FLAGS -DJAVA_DTRACE_MAX_CONSUMERS=0 -cp test.jar TestMaxConsumers -java $FLAGS -DJAVA_DTRACE_MAX_CONSUMERS=1 -cp test.jar TestMaxConsumers -java $FLAGS -DJAVA_DTRACE_MAX_CONSUMERS=2 -cp test.jar TestMaxConsumers -java $FLAGS -DJAVA_DTRACE_MAX_CONSUMERS=7 -cp test.jar TestMaxConsumers -java $FLAGS -DJAVA_DTRACE_MAX_CONSUMERS=8 -cp test.jar TestMaxConsumers -java $FLAGS -DJAVA_DTRACE_MAX_CONSUMERS=9 -cp test.jar TestMaxConsumers -java $FLAGS -DJAVA_DTRACE_MAX_CONSUMERS=19 -cp test.jar TestMaxConsumers +java -cp test.jar TestMaxConsumers +java -DJAVA_DTRACE_MAX_CONSUMERS=-1 -cp test.jar TestMaxConsumers +java -DJAVA_DTRACE_MAX_CONSUMERS=0 -cp test.jar TestMaxConsumers +java -DJAVA_DTRACE_MAX_CONSUMERS=1 -cp test.jar TestMaxConsumers +java -DJAVA_DTRACE_MAX_CONSUMERS=2 -cp test.jar TestMaxConsumers +java -DJAVA_DTRACE_MAX_CONSUMERS=7 -cp test.jar TestMaxConsumers +java -DJAVA_DTRACE_MAX_CONSUMERS=8 -cp test.jar TestMaxConsumers +java -DJAVA_DTRACE_MAX_CONSUMERS=9 -cp test.jar TestMaxConsumers +java -DJAVA_DTRACE_MAX_CONSUMERS=19 -cp test.jar TestMaxConsumers diff --git a/usr/src/cmd/dtrace/test/tst/common/java_api/tst.MultiAggPrinta.ksh b/usr/src/cmd/dtrace/test/tst/common/java_api/tst.MultiAggPrinta.ksh index 2f1c8459a9..6bb864a61e 100644 --- a/usr/src/cmd/dtrace/test/tst/common/java_api/tst.MultiAggPrinta.ksh +++ b/usr/src/cmd/dtrace/test/tst/common/java_api/tst.MultiAggPrinta.ksh @@ -21,7 +21,7 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -35,11 +35,4 @@ # ############################################################################ -FLAGS="" -ARCH=`bitarch.exe` - -if [ $ARCH == "64" ]; then - FLAGS="-d64" -fi - -java $FLAGS -cp test.jar TestMultiAggPrinta tst.printa.d +java -cp test.jar TestMultiAggPrinta tst.printa.d diff --git a/usr/src/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.ksh b/usr/src/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.ksh index 7226387ac3..97f49454e9 100644 --- a/usr/src/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.ksh +++ b/usr/src/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.ksh @@ -21,7 +21,7 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -35,11 +35,4 @@ # ############################################################################ -FLAGS="" -ARCH=`bitarch.exe` - -if [ $ARCH == "64" ]; then - FLAGS="-d64" -fi - -java $FLAGS -cp test.jar TestProbeData tst.ProbeData.exe +java -cp test.jar TestProbeData ./tst.ProbeData.exe diff --git a/usr/src/cmd/dtrace/test/tst/common/java_api/tst.ProbeDescription.ksh b/usr/src/cmd/dtrace/test/tst/common/java_api/tst.ProbeDescription.ksh index 593d3ee2d1..bee1cca6a3 100644 --- a/usr/src/cmd/dtrace/test/tst/common/java_api/tst.ProbeDescription.ksh +++ b/usr/src/cmd/dtrace/test/tst/common/java_api/tst.ProbeDescription.ksh @@ -21,7 +21,7 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -35,18 +35,11 @@ # ############################################################################ -FLAGS="" -ARCH=`bitarch.exe` - -if [ $ARCH == "64" ]; then - FLAGS="-d64" -fi - -java $FLAGS -cp test.jar TestProbeDescription syscall:::entry -java $FLAGS -cp test.jar TestProbeDescription BEGIN -java $FLAGS -cp test.jar TestProbeDescription isdigit entry -java $FLAGS -cp test.jar TestProbeDescription genunix isdigit entry -java $FLAGS -cp test.jar TestProbeDescription fbt genunix isdigit entry -java $FLAGS -cp test.jar TestProbeDescription fbt:genunix:isdigit:entry -java $FLAGS -cp test.jar TestProbeDescription syscall::entry -java $FLAGS -cp test.jar TestProbeDescription syscall:entry +java -cp test.jar TestProbeDescription syscall:::entry +java -cp test.jar TestProbeDescription BEGIN +java -cp test.jar TestProbeDescription isdigit entry +java -cp test.jar TestProbeDescription genunix isdigit entry +java -cp test.jar TestProbeDescription fbt genunix isdigit entry +java -cp test.jar TestProbeDescription fbt:genunix:isdigit:entry +java -cp test.jar TestProbeDescription syscall::entry +java -cp test.jar TestProbeDescription syscall:entry diff --git a/usr/src/cmd/dtrace/test/tst/common/java_api/tst.StateMachine.ksh b/usr/src/cmd/dtrace/test/tst/common/java_api/tst.StateMachine.ksh index cc5cdf3c69..638ce7ace8 100644 --- a/usr/src/cmd/dtrace/test/tst/common/java_api/tst.StateMachine.ksh +++ b/usr/src/cmd/dtrace/test/tst/common/java_api/tst.StateMachine.ksh @@ -21,7 +21,7 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -37,11 +37,4 @@ # ############################################################################ -FLAGS="" -ARCH=`bitarch.exe` - -if [ $ARCH == "64" ]; then - FLAGS="-d64" -fi - -java $FLAGS -cp test.jar TestStateMachine +java -cp test.jar TestStateMachine diff --git a/usr/src/cmd/dtrace/test/tst/common/java_api/tst.StopLock.ksh b/usr/src/cmd/dtrace/test/tst/common/java_api/tst.StopLock.ksh index 23ccf38b9c..4637a7adc7 100644 --- a/usr/src/cmd/dtrace/test/tst/common/java_api/tst.StopLock.ksh +++ b/usr/src/cmd/dtrace/test/tst/common/java_api/tst.StopLock.ksh @@ -21,7 +21,7 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -36,11 +36,4 @@ # ############################################################################ -FLAGS="" -ARCH=`bitarch.exe` - -if [ $ARCH == "64" ]; then - FLAGS="-d64" -fi - -java $FLAGS -cp test.jar TestStopLock +java -cp test.jar TestStopLock diff --git a/usr/src/cmd/dtrace/test/tst/common/profile-n/tst.ufuncsort.ksh b/usr/src/cmd/dtrace/test/tst/common/profile-n/tst.ufuncsort.ksh index 1b01844604..4689355a8e 100644 --- a/usr/src/cmd/dtrace/test/tst/common/profile-n/tst.ufuncsort.ksh +++ b/usr/src/cmd/dtrace/test/tst/common/profile-n/tst.ufuncsort.ksh @@ -21,7 +21,7 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -45,7 +45,7 @@ fi dtrace=$1 -$dtrace -c tst.ufuncsort.exe -s /dev/stdin <<EOF +$dtrace -c ./tst.ufuncsort.exe -s /dev/stdin <<EOF #pragma D option quiet diff --git a/usr/src/lib/libdtrace_jni/java/docs/html/fast.html b/usr/src/lib/libdtrace_jni/java/docs/html/fast.html index 1f5104723c..e5318835c8 100644 --- a/usr/src/lib/libdtrace_jni/java/docs/html/fast.html +++ b/usr/src/lib/libdtrace_jni/java/docs/html/fast.html @@ -1,5 +1,5 @@ <!-- - 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" @@ -133,7 +133,7 @@ Here is a simple example that runs a given D script:<br> <br> Compile the test program as follows: <pre><tt> - java -cp dtrace.jar TestAPI.java + javac -cp /usr/share/lib/java/dtrace.jar TestAPI.java </tt></pre> <br> <h4><a name="Running_hello.d_Script"></a>Running the <tt>hello.d</tt> Script</h4> @@ -149,19 +149,11 @@ simple example that prints "hello, world" and exits:<br> </tt></pre> <br> Run as follows:<br> -On i86:<br> <pre><tt> - java -cp .:dtrace.jar TestAPI hello.d + java -cp .:/usr/share/lib/java/dtrace.jar TestAPI hello.d </tt></pre> <br> -On sparc you need to add the <tt>-d64</tt> option to java: -<pre><tt> - java -d64 -cp .:dtrace.jar TestAPI hello.d</span><br> -</tt></pre> -<br> -You may need to set <tt>LD_LIBRARY_PATH</tt> so that Java can find -<tt>libdtrace_jni.so</tt> on your system. The output should look like -this: +The output should look like this: <pre><tt> org.opensolaris.os.dtrace.ProbeData[epid = 1, cpu = 1, enabledProbeDescription = dtrace:::BEGIN, flow = null, records = @@ -218,16 +210,10 @@ instead of one (<tt>$1</tt>) forces expansion of the macro variable to type string.<br> <br> To run the example Java program using the above D script, you need to -specify an argument to the <tt>execname</tt> placeholder. To be sure of -getting output, let's use "java":<br> -On i86: +specify an argument to the <tt>execname</tt> placeholder, such as +"java":<br> <pre><tt> - java -cp .:dtrace.jar TestAPI syscall.d java -</tt></pre> -<br> -On sparc: -<pre><tt> - java -d64 -cp .:dtrace.jar TestAPI syscall.d java + java -cp .:/usr/share/lib/java/dtrace.jar TestAPI syscall.d java </tt></pre> <br> A data record generated by the <tt>printa()</tt> action is printed to @@ -272,8 +258,8 @@ CPU (a three-element tuple). In this example we drop the <tt>tick</tt> probe to demonstrate a more convenient way to get aggregation data without the use of the <tt>printa()</tt> action. The <a href="../api/org/opensolaris/os/dtrace/Consumer.html#getAggregate%28%29"> -<tt>getAggregate()</tt></a> method allows us to get all aggregations at -once on a programmatic interval.<br> +<tt>getAggregate()</tt></a> method allows us to get a read-consistent +snapshot of all aggregations at once on a programmatic interval.<br> <b>Java program (<a href="../examples/TestAPI2.java">TestAPI2.java</a>)</b> <pre><tt><font color=#aaaaaa> ... @@ -302,17 +288,10 @@ once on a programmatic interval.<br> <br> Compile and run: <pre><tt> - javac -cp dtrace.jar TestAPI2.java -</tt></pre> -<br> -On i86: -<pre><tt> - java -cp .:dtrace.jar TestAPI2 intrstat.d + javac -cp /usr/share/lib/java/dtrace.jar TestAPI2.java </tt></pre> -<br> -On sparc: <pre><tt> - java -d64 -cp .:dtrace.jar TestAPI2 intrstat.d + java -cp .:/usr/share/lib/java/dtrace.jar TestAPI2 intrstat.d </tt></pre> <br> Try removing the <tt>tick</tt> probe from the <tt>syscall.d</tt> example @@ -322,7 +301,7 @@ By default, the requested aggregate includes every aggregation and accumulates running totals. To display values per time interval (instead of running totals), clear the aggregations each time you call <tt>getAggregate()</tt>. Clearing an aggregation resets all counts to -zero without removing any tuples. The following modification to the +zero without removing any elements. The following modification to the example above clears all aggregations: <pre><tt><font color=#aaaaaa> // a = consumer.getAggregate();</font> @@ -368,8 +347,7 @@ brackets and aggregate only a single value: <br> The resulting singleton <a href="../api/org/opensolaris/os/dtrace/Aggregation.html"> -<tt>Aggregation</tt></a> instance has one record that may be obtained as -follows: +<tt>Aggregation</tt></a> has one record that may be obtained as follows: <pre><tt> Aggregate a = consumer.getAggregate(); Aggregation total = a.getAggregation("total"); @@ -387,9 +365,9 @@ process from the very beginning of its execution, rather than sometime after you manually obtain its process ID. The API does this by creating a process that is initially suspended and allowed to start only after <a href="../api/org/opensolaris/os/dtrace/Consumer.html#go%28%29"> -<tt>go()</tt></a> has initiated tracing. For example, we might want to -aggregate all the system calls from start to finish made by the -<tt>date</tt> command:<br> +<tt>go()</tt></a> has initiated tracing. For example, you can aggregate +all the system calls from start to finish made by the <tt>date</tt> +command:<br> <b>D script (<a href="../examples/target.d">target.d</a>)</b> <pre><tt> syscall:::entry @@ -449,17 +427,10 @@ ended: <br> Compile and run: <pre><tt> - javac -cp dtrace.jar TestTarget.java + javac -cp /usr/share/lib/java/dtrace.jar TestTarget.java </tt></pre> -<br> -On i86: -<pre><tt> - java -cp .:dtrace.jar TestTarget target.d date -</tt></pre> -<br> -On sparc: <pre><tt> - java -d64 -cp .:dtrace.jar TestTarget target.d date + java -cp .:/usr/share/lib/java/dtrace.jar TestTarget target.d date </tt></pre> <br> The consumer exits automatically when the target <tt>date</tt> process @@ -525,7 +496,7 @@ need not remove <tt>#!/usr/sbin/dtrace -s</tt> from the top of an executable script. You may want to remove <tt>profile:::tick*</tt> clauses if you plan to use the <tt>Consumer</tt> <a href="../api/org/opensolaris/os/dtrace/Consumer.html#getAggregate%28%29"> -<tt>getAggregate()</tt></a> method and control the aggregating interval +<tt>getAggregate()</tt></a> method and control the data interval programmatically. If the script uses the pre-compiler, you will need to call the <tt>Consumer</tt> <a href="../api/org/opensolaris/os/dtrace/Consumer.html#setOption%28java.lang.String%29"> diff --git a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/Aggregation.java b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/Aggregation.java index 1ec2035619..2da77026f7 100644 --- a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/Aggregation.java +++ b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/Aggregation.java @@ -152,7 +152,7 @@ public final class Aggregation implements Serializable { } } - private void + private final void validate() { if (name == null) { @@ -320,7 +320,11 @@ public final class Aggregation implements Serializable { mapRecords(records); // Check class invariants (only after defensive copy) name = Aggregate.filterUnnamedAggregationName(name); - validate(); + try { + validate(); + } catch (Exception e) { + throw new InvalidObjectException(e.getMessage()); + } } /** diff --git a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/AggregationRecord.java b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/AggregationRecord.java index 4ab439c4c5..a58808e4d9 100644 --- a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/AggregationRecord.java +++ b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/AggregationRecord.java @@ -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" @@ -97,7 +97,7 @@ public final class AggregationRecord implements Record, Serializable { validate(); } - private void + private final void validate() { if (tuple == null) { diff --git a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/AvgValue.java b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/AvgValue.java index bd1257a009..83abbeda6c 100644 --- a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/AvgValue.java +++ b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/AvgValue.java @@ -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" @@ -79,7 +79,7 @@ public final class AvgValue extends AbstractAggregationValue { validate(); } - private void + private final void validate() { if (count < 0) { diff --git a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/CountValue.java b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/CountValue.java index d7c6c39924..277290d824 100644 --- a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/CountValue.java +++ b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/CountValue.java @@ -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" @@ -68,7 +68,7 @@ public final class CountValue extends AbstractAggregationValue { validate(); } - private void + private final void validate() { long count = super.getValue().longValue(); diff --git a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/DataEvent.java b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/DataEvent.java index e863d127c1..6b96a96539 100644 --- a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/DataEvent.java +++ b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/DataEvent.java @@ -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" @@ -60,7 +60,7 @@ public class DataEvent extends EventObject { validate(); } - private void + private final void validate() { if (probeData == null) { diff --git a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/Drop.java b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/Drop.java index a0ade2a93e..60048f5168 100644 --- a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/Drop.java +++ b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/Drop.java @@ -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" @@ -159,7 +159,7 @@ public final class Drop implements Serializable { validate(); } - private void + private final void validate() { if (count < 0) { diff --git a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/DropEvent.java b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/DropEvent.java index 3a621d26ef..e4e508abce 100644 --- a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/DropEvent.java +++ b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/DropEvent.java @@ -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" @@ -58,7 +58,7 @@ public class DropEvent extends EventObject { validate(); } - private void + private final void validate() { if (drop == null) { diff --git a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/Error.java b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/Error.java index b08bdb6692..7d5cb07143 100644 --- a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/Error.java +++ b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/Error.java @@ -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" @@ -156,7 +156,7 @@ public final class Error implements Serializable { validate(); } - private void + private final void validate() { if (probeDescription == null) { diff --git a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/ErrorEvent.java b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/ErrorEvent.java index d956705ac5..0120a1a78b 100644 --- a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/ErrorEvent.java +++ b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/ErrorEvent.java @@ -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" @@ -60,7 +60,7 @@ public class ErrorEvent extends EventObject { validate(); } - private void + private final void validate() { if (error == null) { diff --git a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/InterfaceAttributes.java b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/InterfaceAttributes.java index aa7ab73a81..b886bc0759 100644 --- a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/InterfaceAttributes.java +++ b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/InterfaceAttributes.java @@ -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" @@ -364,7 +364,7 @@ public final class InterfaceAttributes implements Serializable { // thrown the exception } - private void + private final void validate() { if (nameStability == null) { diff --git a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/KernelStackRecord.java b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/KernelStackRecord.java index 7e97c91ca4..60a86657a1 100644 --- a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/KernelStackRecord.java +++ b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/KernelStackRecord.java @@ -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" @@ -167,7 +167,7 @@ public final class KernelStackRecord implements StackValueRecord, validate(); } - private void + private final void validate() { if (rawStackData == null) { diff --git a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/KernelSymbolRecord.java b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/KernelSymbolRecord.java index 7a32427ba4..2154e98844 100644 --- a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/KernelSymbolRecord.java +++ b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/KernelSymbolRecord.java @@ -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" @@ -107,7 +107,7 @@ public final class KernelSymbolRecord implements SymbolValueRecord, validate(); } - private void + private final void validate() { if (symbol == null) { diff --git a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/LocalConsumer.java b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/LocalConsumer.java index dd453601e4..1cb49b324a 100644 --- a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/LocalConsumer.java +++ b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/LocalConsumer.java @@ -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" @@ -411,6 +411,7 @@ public class LocalConsumer implements Consumer { p.contents = Program.getProgramString(program); p.file = program; p.validate(); + p.validateFile(); state = State.COMPILED; return p; diff --git a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/LogDistribution.java b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/LogDistribution.java index fb37303a01..4286a5d045 100644 --- a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/LogDistribution.java +++ b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/LogDistribution.java @@ -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" @@ -170,6 +170,10 @@ public final class LogDistribution extends Distribution throws IOException, ClassNotFoundException { s.defaultReadObject(); - initialize(); + try { + initialize(); + } catch (Exception e) { + throw new InvalidObjectException(e.getMessage()); + } } } diff --git a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/Option.java b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/Option.java index a17380d2b6..5916d3b66c 100644 --- a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/Option.java +++ b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/Option.java @@ -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" @@ -576,7 +576,7 @@ public final class Option implements Serializable { validate(); } - private void + private final void validate() { if (name == null) { diff --git a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/PrintaRecord.java b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/PrintaRecord.java index e24e31896b..9e98d116bc 100644 --- a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/PrintaRecord.java +++ b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/PrintaRecord.java @@ -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" @@ -168,7 +168,7 @@ public final class PrintaRecord implements Record, Serializable { validate(); } - private void + private final void validate() { if (snaptime < 0) { diff --git a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/PrintfRecord.java b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/PrintfRecord.java index cb2ee0cc16..333c175075 100644 --- a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/PrintfRecord.java +++ b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/PrintfRecord.java @@ -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" @@ -86,7 +86,7 @@ public final class PrintfRecord implements Record, Serializable { validate(); } - private void + private final void validate() { if (formattedString == null) { diff --git a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/Probe.java b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/Probe.java index 9d80b7d2b6..5e78b7d47b 100644 --- a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/Probe.java +++ b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/Probe.java @@ -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" @@ -99,7 +99,7 @@ public final class Probe implements Serializable { validate(); } - private void + private final void validate() { if (description == null) { diff --git a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/ProbeData.java b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/ProbeData.java index a57b314c89..87cc4b6b07 100644 --- a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/ProbeData.java +++ b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/ProbeData.java @@ -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" @@ -179,7 +179,7 @@ public final class ProbeData implements Serializable, Comparable <ProbeData> { validate(); } - private void + private final void validate() { if (enabledProbeDescription == null) { diff --git a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/ProbeInfo.java b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/ProbeInfo.java index 3d88c1f205..5e348f8a31 100644 --- a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/ProbeInfo.java +++ b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/ProbeInfo.java @@ -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" @@ -102,7 +102,7 @@ public final class ProbeInfo implements Serializable { validate(); } - private void + private final void validate() { if (probeAttributes == null) { diff --git a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/ProcessEvent.java b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/ProcessEvent.java index 0012464e4c..699b6fe8c7 100644 --- a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/ProcessEvent.java +++ b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/ProcessEvent.java @@ -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" @@ -62,7 +62,7 @@ public class ProcessEvent extends EventObject { validate(); } - private void + private final void validate() { if (processState == null) { diff --git a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/ProcessState.java b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/ProcessState.java index 576dcfff8e..963d8d0ed8 100644 --- a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/ProcessState.java +++ b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/ProcessState.java @@ -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" @@ -175,7 +175,7 @@ public final class ProcessState implements Serializable { validate(); } - private void + private final void validate() { if (processID < 0) { diff --git a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/Program.java b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/Program.java index 5a6ecce0a3..565d272d23 100644 --- a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/Program.java +++ b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/Program.java @@ -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" @@ -77,7 +77,7 @@ public class Program implements Serializable { // Called by LocalConsumer.compile() to ensure that only valid // instances are made accessible to users. Similarly called by // readObject to ensure that only valid instances are deserialized. - void + final void validate() { if (id < 0) { @@ -222,10 +222,9 @@ public class Program implements Serializable { // Called by LocalConsumer.compile() to ensure that only valid // instances are made accessible to users. Similarly called by // readObject to ensure that only valid instances are deserialized. - void - validate() + final void + validateFile() { - super.validate(); if (file == null) { throw new NullPointerException("file is null"); } @@ -243,6 +242,19 @@ public class Program implements Serializable { return file; } + private void + readObject(ObjectInputStream s) + throws IOException, ClassNotFoundException + { + s.defaultReadObject(); + // check class invariants + try { + validateFile(); + } catch (Exception e) { + throw new InvalidObjectException(e.getMessage()); + } + } + public String toString() { diff --git a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/ProgramInfo.java b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/ProgramInfo.java index 0de397a804..f5963ffe4d 100644 --- a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/ProgramInfo.java +++ b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/ProgramInfo.java @@ -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" @@ -110,7 +110,7 @@ public final class ProgramInfo implements Serializable { validate(); } - private void + private final void validate() { if (minimumProbeAttributes == null) { diff --git a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/ScalarRecord.java b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/ScalarRecord.java index cbeafa34df..902caad25a 100644 --- a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/ScalarRecord.java +++ b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/ScalarRecord.java @@ -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" @@ -105,7 +105,7 @@ public final class ScalarRecord implements ValueRecord, Serializable { validate(); } - private void + private final void validate() { if (value == null) { diff --git a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/StackFrame.java b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/StackFrame.java index e18b937f60..32cd4c7b12 100644 --- a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/StackFrame.java +++ b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/StackFrame.java @@ -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" @@ -86,7 +86,7 @@ public final class StackFrame implements Serializable { validate(); } - private void + private final void validate() { if (frame == null) { diff --git a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/UserStackRecord.java b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/UserStackRecord.java index 838beb4b83..2ed722cba2 100644 --- a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/UserStackRecord.java +++ b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/UserStackRecord.java @@ -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" @@ -117,7 +117,7 @@ public final class UserStackRecord implements StackValueRecord, validate(); } - private void + private final void validate() { if (processID < 0) { diff --git a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/UserSymbolRecord.java b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/UserSymbolRecord.java index b53eddef2f..7672179b31 100644 --- a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/UserSymbolRecord.java +++ b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/UserSymbolRecord.java @@ -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" @@ -111,7 +111,7 @@ public final class UserSymbolRecord implements SymbolValueRecord, validate(); } - private void + private final void validate() { if (symbol == null) { @@ -339,7 +339,7 @@ public final class UserSymbolRecord implements SymbolValueRecord, validate(); } - private void + private final void validate() { if (processID < 0) { |