diff --git a/make/common/Release.gmk b/make/common/Release.gmk index ce2dda53d1d9c86e3b6e8ec51e939898a66f02da..b584781eb50355746ef7476b6a714f469d2ff8ac 100644 --- a/make/common/Release.gmk +++ b/make/common/Release.gmk @@ -252,7 +252,7 @@ images:: sanity-images post-sanity-images \ $(INITIAL_IMAGE_JRE) $(INITIAL_IMAGE_JDK) \ trim-image-jre trim-image-jdk \ identify-image-jre identify-image-jdk \ - process-image-jre process-image-jdk sec-files sec-files-win jgss-files + process-image-jre process-image-jdk sec-files sec-files-win jgss-files endif # Don't use these @@ -400,7 +400,8 @@ TOOLS = \ # classes that go into jfr.jar JFR_CLASSES_DIRS= \ com/oracle/jrockit/jfr \ - oracle/jrockit/jfr + oracle/jrockit/jfr \ + jdk/jfr # classes that go into jsse.jar JSSE_CLASSES_DIRS = \ @@ -612,6 +613,7 @@ ifndef JAVASE_EMBEDDED $(ECHO) "oracle/jrockit/jfr/parser/" >> $@ $(ECHO) "oracle/jrockit/jfr/settings/" >> $@ $(ECHO) "oracle/jrockit/jfr/tools/" >> $@ + $(ECHO) "jdk/jfr/" >> $@ endif endif diff --git a/makefiles/CreateJars.gmk b/makefiles/CreateJars.gmk index 64c96b2c97e00bfe6c86a89cb23b90d8069a295e..54531f19ef5a7f86c1338df08700a82eb872e589 100644 --- a/makefiles/CreateJars.gmk +++ b/makefiles/CreateJars.gmk @@ -132,7 +132,7 @@ $(eval $(call SetupArchive,BUILD_LOCALEDATA_JAR,,\ ########################################################################################## # Full JRE exclude list for rt.jar and resources.jar -# This value should exclude types destined for jars other than rt.jar and resources.jar. +# This value should exclude types destined for jars other than rt.jar and resources.jar. # When building a Profile this value augments the profile specific exclusions RT_JAR_EXCLUDES += \ com/oracle/security \ @@ -246,7 +246,8 @@ RT_JAR_EXCLUDES += \ sun/util/resources/cldr \ $(LOCALEDATA_INCLUDES) \ com/oracle/jrockit/jfr \ - oracle/jrockit/jfr + oracle/jrockit/jfr \ + jdk/jfr ifeq ($(OPENJDK_TARGET_OS), macosx) RT_JAR_EXCLUDES += com/sun/nio/sctp \ @@ -337,7 +338,7 @@ $(PROFILE_VERSION_CLASS_TARGETS) : $(PROFILE_VERSION_JAVA_TARGETS) # Support for removing the addPropertyChangeListener and removePropertyChangeListener -# methods from classes that only go into the profile builds. +# methods from classes that only go into the profile builds. BEANLESS_CLASSES = $(IMAGES_OUTPUTDIR)/beanless # When there are $ characters in filenames we have some very subtle interactions between @@ -352,7 +353,7 @@ CLASSES_TO_DEBEAN = \ java/util/jar/Pack200\$$Packer.class \ java/util/jar/Pack200\$$Unpacker.class \ com/sun/java/util/jar/pack/PackerImpl.class \ - com/sun/java/util/jar/pack/UnpackerImpl.class + com/sun/java/util/jar/pack/UnpackerImpl.class ifneq ($(PROFILE),) BEANLESS_CLASSES_TARGETS := $(addprefix $(BEANLESS_CLASSES)/, $(CLASSES_TO_DEBEAN)) @@ -428,7 +429,8 @@ ifeq ($(ENABLE_JFR), true) SRCS:=$(JDK_OUTPUTDIR)/classes,\ SUFFIXES:=.class .jfc .xsd,\ INCLUDES:=com/oracle/jrockit/jfr \ - oracle/jrockit/jfr,\ + oracle/jrockit/jfr \ + jdk/jfr,\ JAR:=$(IMAGES_OUTPUTDIR)/lib/jfr.jar,\ SKIP_METAINF:=true,\ MANIFEST:=$(MAINMANIFEST), \ @@ -468,14 +470,14 @@ $(JCE_MANIFEST): $(MAINMANIFEST) $(MV) $@.tmp $@ ########################################################################################## -# For security and crypto jars, always build the jar, but for closed, install the prebuilt -# signed version instead of the newly built jar. Unsigned jars are treated as intermediate -# targets and explicitly added to the JARS list. For open, signing is not needed. See +# For security and crypto jars, always build the jar, but for closed, install the prebuilt +# signed version instead of the newly built jar. Unsigned jars are treated as intermediate +# targets and explicitly added to the JARS list. For open, signing is not needed. See # SignJars.gmk for more information. # # The source for the crypto jars is not available for all licensees. The BUILD_CRYPTO # variable is set to no if these jars can't be built to skip that step of the build. -# Note that for OPENJDK, the build will fail if BUILD_CRYPTO=no since then there is no +# Note that for OPENJDK, the build will fail if BUILD_CRYPTO=no since then there is no # other way to get the jars than to build them. SUNPKCS11_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/sunpkcs11.jar @@ -738,7 +740,7 @@ $(UCRYPTO_JAR_DST) : $(UCRYPTO_JAR_SRC) @$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt OracleUcrypto provider..." $(install-file) -JARS += $(UCRYPTO_JAR_UNSIGNED) +JARS += $(UCRYPTO_JAR_UNSIGNED) endif endif diff --git a/src/share/classes/java/nio/Buffer.java b/src/share/classes/java/nio/Buffer.java index 068444a975842dedfe120af02da1bd1cb50e90c9..f5a9cd4f6754332969b73ded55201e0636a8d319 100644 --- a/src/share/classes/java/nio/Buffer.java +++ b/src/share/classes/java/nio/Buffer.java @@ -52,7 +52,7 @@ import java.util.Spliterator; *
There is one subclass of this class for each non-boolean primitive type. * * - *
Each subclass of this class defines two categories of get and * put operations:
@@ -78,7 +78,7 @@ import java.util.Spliterator; * current position. * * - *A buffer's mark is the index to which its position will be reset * when the {@link #reset reset} method is invoked. The mark is not always @@ -89,7 +89,7 @@ import java.util.Spliterator; * {@link InvalidMarkException} to be thrown. * * - *
The following invariant holds for the mark, position, limit, and * capacity values: @@ -109,7 +109,7 @@ import java.util.Spliterator; * to zero. * * - *
In addition to methods for accessing the position, limit, and capacity * values and for marking and resetting, this class also defines the following @@ -132,7 +132,7 @@ import java.util.Spliterator; * * * - *
Every buffer is readable, but not every buffer is writable. The
* mutation methods of each buffer class are specified as optional
@@ -143,14 +143,14 @@ import java.util.Spliterator;
* {@link #isReadOnly isReadOnly} method.
*
*
- * Thread safety
+ * Thread safety
*
*
Buffers are not safe for use by multiple concurrent threads. If a * buffer is to be used by more than one thread then access to the buffer * should be controlled by appropriate synchronization. * * - *
Methods in this class that do not otherwise have a value to return are
* specified to return the buffer upon which they are invoked. This allows
diff --git a/src/share/classes/java/nio/MappedByteBuffer.java b/src/share/classes/java/nio/MappedByteBuffer.java
index 1d26276f10c344322684b9698a5282b0bd1037b2..25aa60e0b104663068f24bc8f0c7d401ab56aea0 100644
--- a/src/share/classes/java/nio/MappedByteBuffer.java
+++ b/src/share/classes/java/nio/MappedByteBuffer.java
@@ -45,7 +45,7 @@ import sun.misc.Unsafe;
* this program or another. Whether or not such changes occur, and when they
* occur, is operating-system dependent and therefore unspecified.
*
- * All or part of a mapped byte buffer may become
+ * All or part of a mapped byte buffer may become
* inaccessible at any time, for example if the mapped file is truncated. An
* attempt to access an inaccessible region of a mapped byte buffer will not
* change the buffer's content and will cause an unspecified exception to be
diff --git a/src/share/classes/java/nio/X-Buffer.java.template b/src/share/classes/java/nio/X-Buffer.java.template
index c3037adb4d29973f883bc33904138f6b7ad7ffd8..03a7255c16a477dbf52044cf6e41391456b4bc17 100644
--- a/src/share/classes/java/nio/X-Buffer.java.template
+++ b/src/share/classes/java/nio/X-Buffer.java.template
@@ -44,23 +44,23 @@ import java.util.stream.$Streamtype$Stream;
*
* Absolute and relative {@link #get() get Absolute and relative {@link #get() get} and
+ * {@link #put($type$) put} methods that read and write
* single $type$s; Relative {@link #get($type$[]) Relative {@link #get($type$[]) bulk get}
* methods that transfer contiguous sequences of $type$s from this buffer
* into an array; {#if[!byte]?and} Relative {@link #put($type$[]) Relative {@link #put($type$[]) bulk put}
* methods that transfer contiguous sequences of $type$s from $a$
* $type$ array{#if[char]?, a string,} or some other $type$
* buffer into this buffer;{#if[!byte]? and} Absolute and relative {@link #getChar() Absolute and relative {@link #getChar() get}
+ * and {@link #putChar(char) put} methods that read and
* write values of other primitive types, translating them to and from
* sequences of bytes in a particular byte order; Methods for {@link #compact Methods for {@link #compact compacting}, {@link
+ * #duplicate duplicating}, and {@link #slice slicing}
+ * $a$ $type$ buffer. $Type$ buffers can be created either by {@link #allocate
- * allocation A byte buffer is either direct or non-direct. Given a
* direct byte buffer, the Java virtual machine will make a best effort to
@@ -116,7 +116,7 @@ import java.util.stream.$Streamtype$Stream;
* buffers only when they yield a measureable gain in program performance.
*
* A direct byte buffer may also be created by {@link
- * java.nio.channels.FileChannel#map This class defines methods for reading and writing values of all other
* primitive types, except boolean. Primitive values are translated
@@ -156,7 +156,7 @@ import java.util.stream.$Streamtype$Stream;
* parameters of the absolute get and put methods are in terms of
* bytes rather than of the type being read or written.
*
- *
+ *
*
* For access to homogeneous binary data, that is, sequences of values of
* the same type, this class defines methods that can create views of a
@@ -214,7 +214,7 @@ import java.util.stream.$Streamtype$Stream;
#end[char]
*
#if[byte]
- * Methods in this class that do not otherwise have a value to return are
@@ -297,7 +297,7 @@ public abstract class $Type$Buffer
* The new buffer's position will be zero, its limit will be its
* capacity, its mark will be undefined, and each of its elements will be
* initialized to zero. Whether or not it has a
- * {@link #hasArray The new buffer's position will be zero, its limit will be its
* capacity, its mark will be undefined, and each of its elements will be
- * initialized to zero. It will have a {@link #array
- *
*
- *
*
* } and
- * {@link #put($type$)
put} methods that read and write
+ *
bulk get}
+ *
bulk put}
+ *
get}
- * and {@link #putChar(char)
put} methods that read and
+ *
compacting}, {@link
- * #duplicate
duplicating}, and {@link #slice
- *
slicing} $a$ $type$ buffer.
}, which allocates space for the buffer's
+ * allocation}, which allocates space for the buffer's
*
#if[byte]
*
- * content, or by {@link #wrap($type$[])
wrapping} an
+ * content, or by {@link #wrap($type$[]) wrapping} an
* existing $type$ array {#if[char]?or string} into a buffer.
*
#else[byte]
*
- * content, by {@link #wrap($type$[])
wrapping} an existing
+ * content, by {@link #wrap($type$[]) wrapping} an existing
* $type$ array {#if[char]?or string} into a buffer, or by creating a
* view of an existing byte buffer.
*
@@ -94,8 +94,8 @@ import java.util.stream.$Streamtype$Stream;
*
#if[byte]
*
- *
- *
mapping Direct vs. non-direct buffers
+ *
+ * Direct vs. non-direct buffers
*
* } a region of a file
+ * java.nio.channels.FileChannel#map mapping} a region of a file
* directly into memory. An implementation of the Java platform may optionally
* support the creation of direct byte buffers from native code via JNI. If an
* instance of one of these kinds of buffers refers to an inaccessible region
@@ -129,8 +129,8 @@ import java.util.stream.$Streamtype$Stream;
* that explicit buffer management can be done in performance-critical code.
*
*
- *
- *
backing array Access to binary data
+ *
+ * Access to binary data
*
* Invocation chaining
+ * Invocation chaining
#end[byte]
*
* } is unspecified.
+ * {@link #hasArray backing array} is unspecified.
*
* @param capacity
* The new buffer's capacity, in $type$s
@@ -318,9 +318,8 @@ public abstract class $Type$Buffer
*
*
backing array}, and its {@link #arrayOffset
array
- * offset} will be zero.
+ * initialized to zero. It will have a {@link #array backing array},
+ * and its {@link #arrayOffset array offset} will be zero.
*
* @param capacity
* The new buffer's capacity, in $type$s
@@ -344,8 +343,8 @@ public abstract class $Type$Buffer
* and vice versa. The new buffer's capacity will be
* array.length, its position will be offset, its limit
* will be offset + length, and its mark will be undefined. Its
- * {@link #array
backing array} will be the given array, and
- * its {@link #arrayOffset
array offset} will be zero.
} will be the
- * given array, and its {@link #arrayOffset
array offset} will
+ * undefined. Its {@link #array backing array} will be the
+ * given array, and its {@link #arrayOffset array offset>} will
* be zero.
*
* @param array
@@ -703,6 +702,9 @@ public abstract class $Type$Buffer
*
* src.get(a, 0, a.length)
*
+ * @param dst
+ * The destination array
+ *
* @return This buffer
*
* @throws BufferUnderflowException
@@ -842,6 +844,9 @@ public abstract class $Type$Buffer
*
* dst.put(a, 0, a.length)
*
+ * @param src
+ * The source array
+ *
* @return This buffer
*
* @throws BufferOverflowException
@@ -930,6 +935,9 @@ public abstract class $Type$Buffer
*
* dst.put(s, 0, s.length())
*
+ * @param src
+ * The source string
+ *
* @return This buffer
*
* @throws BufferOverflowException
@@ -1419,7 +1427,7 @@ public abstract class $Type$Buffer
*
* The byte order of $a$ $type$ buffer created by allocation or by
* wrapping an existing $type$ array is the {@link
- * ByteOrder#nativeOrder
native order} of the underlying
+ * ByteOrder#nativeOrder native order} of the underlying
* hardware. The byte order of $a$ $type$ buffer created as a view of a byte buffer is that of the
* byte buffer at the moment that the view is created.
diff --git a/src/share/classes/java/nio/channels/AsynchronousByteChannel.java b/src/share/classes/java/nio/channels/AsynchronousByteChannel.java
index 9fdf7530d16aed6f412898b6c4b7ac6d20d3c1c5..47ffc87a80b6ad856c62e91aa03f5bd5cf18b62b 100644
--- a/src/share/classes/java/nio/channels/AsynchronousByteChannel.java
+++ b/src/share/classes/java/nio/channels/AsynchronousByteChannel.java
@@ -87,6 +87,8 @@ public interface AsynchronousByteChannel
* initiates a read operation before a previous read operation has
* completed then a {@link ReadPendingException} will be thrown.
*
+ * @param
+ * The type of the attachment
* @param dst
* The buffer into which bytes are to be transferred
* @param attachment
@@ -166,6 +168,8 @@ public interface AsynchronousByteChannel
* initiates a write operation before a previous write operation has
* completed then a {@link WritePendingException} will be thrown.
*
+ * @param
+ * The type of the attachment
* @param src
* The buffer from which bytes are to be retrieved
* @param attachment
diff --git a/src/share/classes/java/nio/channels/AsynchronousChannel.java b/src/share/classes/java/nio/channels/AsynchronousChannel.java
index 5aa9fe23b3840ec1a4c6244efa96abc7c5429614..98e30d05e79b6082aa46852b747454f81ddd16ad 100644
--- a/src/share/classes/java/nio/channels/AsynchronousChannel.java
+++ b/src/share/classes/java/nio/channels/AsynchronousChannel.java
@@ -61,7 +61,7 @@ import java.util.concurrent.Future; // javadoc
* may not allow more than one read and one write operation to be outstanding at
* any given time.
*
- * Cancellation
+ * Cancellation
*
* The {@code Future} interface defines the {@link Future#cancel cancel}
* method to cancel execution. This causes all threads waiting on the result of
diff --git a/src/share/classes/java/nio/channels/AsynchronousChannelGroup.java b/src/share/classes/java/nio/channels/AsynchronousChannelGroup.java
index 2eb4b5219d20137b8356f0be6c9f5f80c62cdbeb..ace607323cbc2e65d688cd4e2a22d5b8fc4c26e1 100644
--- a/src/share/classes/java/nio/channels/AsynchronousChannelGroup.java
+++ b/src/share/classes/java/nio/channels/AsynchronousChannelGroup.java
@@ -60,7 +60,7 @@ import java.util.concurrent.TimeUnit;
* default group is not configured then the pooled threads of the default group
* are {@link Thread#isDaemon daemon} threads.
*
- *