May 2014 - core-libs-dev

Re: RFR: 8043592: The basic XML parser based on UKit fails to read XML files encoded in UTF-16BE or LE
by huizhe wang 27 May '14

27 May '14

Thanks Sherman! On 5/27/2014 1:46 PM, Xueming Shen wrote: > One more nit, > > ln#2876-2879 > > Do we really need to create a new ReaderUTF8, if the encoding is > indeed is utf8? > which I would assume should be true for most use scenarios. Maybe the > following > would be better? > > // Encoding is defined by the xml text decl. > reader = enc("UTF-8", is.getByteStream()); > expenc = xml(reader); > if (!expenc.equals("UTF-8")) { > if (expenc.startsWith("UTF-16")) { > panic(FAULT); // UTF-16 must have BOM [#4.3.3] > } > reader = enc(expenc, is.getByteStream()); > } Updated to reflect the above suggestion: http://cr.openjdk.java.net/~joehw/jdk9/8043592/webrev/. For the performance improvement, I'll create a new bug to track it. Reading is buffered in the regular jaxp parser than the UKit one. It would be nice if the benchmark had a separate measurement in parsing performance. We currently have indirect measurement through validation and transform. Buffer size will affect performance, UKit sets the default to 512 (but actually read byte by byte from the underlying stream as you noted), while jaxp parser default to 8k. For a small parser such as UKit, it may make sense to use a smaller buffer. -Joe > > -Sherman > > On 05/27/2014 12:54 PM, Xueming Shen wrote: >> On 05/27/2014 10:46 AM, huizhe wang wrote: >>> Hi, >>> >>> Are you okay with the updated patch? >>> >>> Thanks, >>> Joe >>> >> >> looks fine for me. >> >> Btw, if I took a quick look at the UTF8 reader, my observation >> suggests read byte by byte >> from the underlying stream probably is the bottleneck of the overall >> "parsing". Attached >> is a buffered the version, my simple test (just the parsing, use the >> default handler do noting) >> indicates it might double the parsing speed. Sure the overall >> performance will depends on >> the individual handler, but it might worth considering, any second >> counts :-) The code is >> not fully tested though, just for your reference. >> >> -Sherman >> >> package jdk.internal.util.xml.impl; >> >> import java.io.Reader; >> import java.io.InputStream; >> import java.io.IOException; >> import java.io.UnsupportedEncodingException; >> >> /** >> * UTF-8 transformed UCS-2 character stream reader. >> * >> * This reader converts UTF-8 transformed UCS-2 characters to Java >> characters. >> * The UCS-2 subset of UTF-8 transformation is described in RFC-2279 #2 >> * "UTF-8 definition": >> * 0000 0000-0000 007F 0xxxxxxx >> * 0000 0080-0000 07FF 110xxxxx 10xxxxxx >> * 0000 0800-0000 FFFF 1110xxxx 10xxxxxx 10xxxxxx >> * >> * This reader will return incorrect last character on broken UTF-8 >> stream. >> */ >> public class ReaderUTF8 extends Reader { >> >> private InputStream is; >> >> private static int DEFAULT_BUFFER_SIZE = 8192; >> private byte buf[]; >> private int pos, limit; >> >> /** >> * Constructor. >> * >> * @param is A byte input stream. >> */ >> public ReaderUTF8(InputStream is) { >> this.is = is; >> this.buf = new byte[DEFAULT_BUFFER_SIZE]; >> this.pos = limit = 0; >> } >> >> private void fill() throws IOException { >> if (pos >= buf.length) { // no room left in buffer >> pos = limit = 0; >> } >> int n = is.read(buf, pos, buf.length - pos); >> if (n > 0) { >> limit = n + pos; >> } >> } >> >> /** >> * Reads characters into a portion of an array. >> * >> * @param cbuf Destination buffer. >> * @param off Offset at which to start storing characters. >> * @param len Maximum number of characters to read. >> * @exception IOException If any IO errors occur. >> * @exception UnsupportedEncodingException If UCS-4 character >> occur in the stream. >> */ >> public int read(char[] cbuf, int off, int len) throws IOException { >> int off0 = off; >> int end = off + len; >> while (off < len) { >> if (pos >= limit) { >> fill(); >> if (pos >= limit) { >> return (off != off0) ? off - off0 : -1; >> } >> } >> int val = buf[pos] & 0xff; >> if (val >= 0x80) { >> break; >> } >> cbuf[off++] = (char) val; >> pos++; >> } >> while (off < end) { >> if (pos >= limit) { >> fill(); >> if (pos >= limit) { >> return (off != off0) ? off - off0 : -1; >> } >> } >> int val = buf[pos++] & 0xff; >> switch (val & 0xf0) { >> case 0xc0: >> case 0xd0: >> if (pos >= limit) { >> fill(); >> } >> if (pos >= limit) { >> cbuf[off++] = (char) (((val & 0x1f) << 6) | >> (is.read() & 0x3f)); >> } else { >> cbuf[off++] = (char) (((val & 0x1f) << 6) | >> (buf[pos++] & 0x3f)); >> } >> break; >> case 0xe0: >> if (pos >= limit) { >> fill(); >> } >> val = (val & 0x0f) << 12; >> if (pos >= limit) { >> val |= ((is.read() & 0x3f) << 6); >> } else { >> val |= ((buf[pos++] & 0x3f) << 6); >> } >> if (pos >= limit) { >> val |= (buf[pos++] & 0x3f); >> } else { >> val |= (is.read() & 0x3f); >> } >> cbuf[off++] = (char) val; >> break; >> case 0xf0: // UCS-4 character >> throw new UnsupportedEncodingException("UTF-32 >> (or UCS-4) encoding not supported."); >> default: >> cbuf[off++] = (char) val; >> break; >> } >> } >> return off - off0; >> >> } >> >> /** >> * Reads a single character. >> * >> * @return The character read, as an integer in the range 0 to 65535 >> * (0x00-0xffff), or -1 if the end of the stream has been reached. >> * @exception IOException If any IO errors occur. >> * @exception UnsupportedEncodingException If UCS-4 character >> occur in the stream. >> */ >> public int read() throws IOException { >> int val; >> if (pos >= limit) { >> val = is.read(); >> } else { >> val = buf[pos++] & 0xff; >> } >> switch (val & 0xf0) { >> case 0xc0: >> case 0xd0: >> if (pos >= limit) { >> val = ((val & 0x1f) << 6) | (is.read() & 0x3f); >> } else { >> val = ((val & 0x1f) << 6) | (buf[pos++] & 0x3f); >> } >> break; >> case 0xe0: >> val = (val & 0x0f) << 12; >> if (pos >= limit) { >> val |= ((is.read() & 0x3f) << 6); >> } else { >> val |= ((buf[pos++] & 0x3f) << 6); >> } >> if (pos >= limit) { >> val |= (is.read() & 0x3f); >> } else { >> val |= (buf[pos++] & 0x3f); >> } >> break; >> case 0xf0: // UCS-4 character >> throw new UnsupportedEncodingException(); >> default: >> break; >> } >> return val; >> } >> >> /** >> * Closes the stream. >> * >> * @exception IOException If any IO errors occur. >> */ >> public void close() throws IOException { >> is.close(); >> } >> } >> >

2 1

RFR JDK-8043495: add native FileChannelImpl.transferTo0() implementation for AIX
by Jonathan Lu 27 May '14

27 May '14

Hello, May I have following patch reviewed ? http://cr.openjdk.java.net/~luchsh/JDK-8043495/ The patch will add native FileChannelImpl.transferTo0() implementation for AIX by using the 'send_file' API, http://www-01.ibm.com/support/knowledgecenter/ssw_aix_71/com.ibm.aix.commtr… Thanks Jonathan

4 6

RFR [8043476] java/util/BitSet/BSMethods.java failed with: java.lang.OutOfMemoryError: Java heap space
by Ivan Gerasimov 26 May '14

26 May '14

Hello! There was a bug in BitSet.toString() fixed with JDK-8040806. Unfortunately, the test that had come with this change started to fail with OOM. This is because it needs to create a BitSet with the bit Integer.MAX_VALUE set, so this BitSet occupies 256M. In particular, the test fails on 32-bit platforms. The proposed fix for this is: First, run in othervm mode, so we're sure that no other tests consume the heap space. And second, explicitly check that VM is able to allocate enough memory. Experiments showed that 380M seem to be the needed minimum, so I set the boundary to 512M. I've checked the updated test with JPRT on all available platforms, no failures. Would you please review the fix? BUGURL: https://bugs.openjdk.java.net/browse/JDK-8043476 WEBREV: http://cr.openjdk.java.net/~igerasim/8043476/0/webrev/ Sincerely yours, Ivan

2 2

8043958: Remove unused com.sun.pept classes from jdk repository
by Alan Bateman 26 May '14

26 May '14

As part of modularity motivated clean-up, I'd like to remove the PEPt [1] classes from the jdk repository. The classes are excluded by the build so removing them should not have any impact. The removal not impact the copy of these classes in the corba repository (in a different package), these will continue to be compiled in with the CORBA code. The red webrev with the changes is here: http://cr.openjdk.java.net/~alanb/8043958/webrev/ -Alan. [1] http://haroldcarr.net/computerScience/pept/indexPept.html

2 1

RFR: 8043762: Remove unused files from jaxws repository
by Miroslav Kos 26 May '14

26 May '14

Hi everybody, here is the request for review for 8043762: Remove unused files from jaxws repository JBS: https://bugs.openjdk.java.net/browse/JDK-8043762 webrev: http://cr.openjdk.java.net/~mkos/8043762/jaxws.01/ Simple fix removing unused files in jaxws repo, no tests necessary. Thanks Miran

3 2

RFR: 8043666: Remove unused files from jaxp repository
by huizhe wang 26 May '14

26 May '14

Removing unused files in jaxp repository. Most of them are META-INF/services files used by Apache build process. The COPYING files at the bottom came with SAX, but they are included in the THIRD_PARTY_README file already. Please review. http://cr.openjdk.java.net/~joehw/jdk9/8043666/webrev/ Thanks, Joe

3 2

JDK 9 RFR of 8043916: Fix fallthrough lint warnings in java/lang/UNIXProcess.java
by Joe Darcy 23 May '14

23 May '14

Hello, Please review the patch below to address 8043916: Fix fallthrough lint warnings in java/lang/UNIXProcess.java diff -r f142c0938978 src/solaris/classes/java/lang/UNIXProcess.java --- a/src/solaris/classes/java/lang/UNIXProcess.java Fri May 23 09:05:24 2014 -0700 +++ b/src/solaris/classes/java/lang/UNIXProcess.java Fri May 23 11:59:34 2014 -0700 @@ -97,6 +97,7 @@ EnumSet.copyOf(Arrays.asList(launchMechanisms)); } + @SuppressWarnings("fallthrough") private String helperPath(String javahome, String osArch) { switch (this) { case SOLARIS: The code of the switch in question is case SOLARIS: if (osArch.equals("x86")) { osArch = "i386"; } else if (osArch.equals("x86_64")) { osArch = "amd64"; } // fall through... case LINUX: case AIX: return javahome + "/lib/" + osArch + "/jspawnhelper"; Thanks, -Joe

3 2

RFR (S) 8035974: Refactor DigestBase.engineUpdate() method for better code generation by JIT compiler
by Vladimir Kozlov 23 May '14

23 May '14

http://cr.openjdk.java.net/~kvn/8035974/webrev https://bugs.openjdk.java.net/browse/JDK-8035974 Contributed by James Cheng and modified by me. To use intrinsics to accelerate SHA operations on multiple blocks [1], it is needed to pull a loop out of DigestBase.engineUpdate() and make a new method implCompressMultiBlock() which contains only the loop and can be intrinsified. On platforms which does not use intrinsic implCompressMultiBlock() method will be inlined by JIT and the same code will be generated as before. So no performance regression with the pure Java SUN provider is expected. About arithmetic change. limit = ofs + len will not overflow integer because ofs <= b.length - len (there is check). Tested with jdk jtreg tests and new hotspot jtreg test James wrote for 8035968. Thanks, Vladimir [1] https://bugs.openjdk.java.net/browse/JDK-8035968

5 5

RFR - 8041451: com.sun.jndi.ldap.Connection:ReadTimeout should abandon ldap request
by Rob McKenna 23 May '14

23 May '14

Hi folks, Very simple fix to ensure that a slow server isn't left waiting around for a request we have already given up on. http://cr.openjdk.java.net/~robm/8041451/webrev.01/ -Rob

2 1

RFR: 8043592: The basic XML parser based on UKit fails to read XML files encoded in UTF-16BE or LE
by huizhe wang 23 May '14

23 May '14

Refer to 8042889, while verifying/testing 8042889, we noticed that the tiny XML parser failed on UTF-16BE or LE. The cause of the failure was that the parser was actually implemented to abide by the XML specification that required entities encoded in UTF-16 to begin with BOM. The test we used sent a byte array to the parser without BOM, thus failed. Since it's not uncommon for a XML to not have BOM, I borrowed the technique used in Xerces to add an additional check for UTF-16 encoding. Please review. http://cr.openjdk.java.net/~joehw/jdk9/8043592/webrev/ Thanks, Joe

3 3