Re: Request for Review: 6905552
Christopher Hegarty - Sun Microsystems Ireland wrote: Hi Alan, Michael, Since we don't typically build on non-IPv6 systems, over a number of years the net/nio code has not maintained clean non-IPv6 code. This patch addresses that by excluding IPv6 specific code where AF_INET6 is not defined. 6905552: libnet/nio portability issues Webrev: http://cr.openjdk.java.net/~chegar/6905552/webrev.0/webrev/ -Chris. This looks okay to me. One thing I don't understand is the change to the getMTU method in src/solaris/native/java/net/NetworkInterface.c - it looks like this will fail on Solaris if IPv6 is not enabled - do I have this right? In the same place there the comment "Try wIth an ..." can probably be used. Minor comment is that there are a few inconsistencies in the comments. In some places it's #endif /* AF_INET6 */, others it is #endif // AF_INET6, and no comments in the rest. -Alan.
Re: Request for Review: 6905552
On 27/01/2010 14:55, Alan Bateman wrote: Christopher Hegarty - Sun Microsystems Ireland wrote: Hi Alan, Michael, Since we don't typically build on non-IPv6 systems, over a number of years the net/nio code has not maintained clean non-IPv6 code. This patch addresses that by excluding IPv6 specific code where AF_INET6 is not defined. 6905552: libnet/nio portability issues Webrev: http://cr.openjdk.java.net/~chegar/6905552/webrev.0/webrev/ -Chris. This looks okay to me. One thing I don't understand is the change to the getMTU method in src/solaris/native/java/net/NetworkInterface.c - it looks like this will fail on Solaris if IPv6 is not enabled - do I have this right? In the same place there the comment "Try wIth an ..." can probably be used. What we found is that on Solaris if an interface has only IPv6 addresses assigned to it, then you need to use a socket created with AF_INET6 when querying the ioclt. By default, we always try to with an AF_INET socket first and on Solaris fall back to try with an AF_INET6 socket if that fails (see L1533 in the new file). In the case that we are building without AF_INET6 defined it doesn't make sense to try with an AF_INET6 socket if the ioctl fails with AF_INET. Make sense? Is this what you were asking about? Minor comment is that there are a few inconsistencies in the comments. In some places it's #endif /* AF_INET6 */, others it is #endif // AF_INET6, and no comments in the rest. I'll make the comment consistent. I only added a comment in cases where I thought it was not obvious what the endif was for. Thanks, -Chris. -Alan.
Re: Request for Review: 6905552
Christopher Hegarty - Sun Microsystems Ireland wrote: : What we found is that on Solaris if an interface has only IPv6 addresses assigned to it, then you need to use a socket created with AF_INET6 when querying the ioclt. By default, we always try to with an AF_INET socket first and on Solaris fall back to try with an AF_INET6 socket if that fails (see L1533 in the new file). In the case that we are building without AF_INET6 defined it doesn't make sense to try with an AF_INET6 socket if the ioctl fails with AF_INET. Make sense? Is this what you were asking about? That helps - I was mostly trying to understand what the behavior would be if we were compiled without IPv6 support but encountered a network interface that didn't have an IPv4 address plumbed. It looks like it will fail with an IOException with the error message from the ioctl. Now compare that with running today with java.net.preferIPv4Stack=true. I think today it will still create the IPv6 socket and return the MTU. It's probably not worth thinking about this as Solaris had had IPv6 support in its header files since at least Solaris 8 and it's highly unlikely someone where compile this without AF_INET6 being defined. -Alan.
hg: jdk7/tl/jdk: 6905552: libnet/nio portability issues
Changeset: 8df0ffac7f4d Author:chegar Date: 2010-01-27 16:11 + URL: http://hg.openjdk.java.net/jdk7/tl/jdk/rev/8df0ffac7f4d 6905552: libnet/nio portability issues Reviewed-by: alanb ! src/share/native/java/net/net_util.c ! src/solaris/native/java/net/Inet4AddressImpl.c ! src/solaris/native/java/net/Inet6AddressImpl.c ! src/solaris/native/java/net/NetworkInterface.c ! src/solaris/native/java/net/PlainDatagramSocketImpl.c ! src/solaris/native/java/net/net_util_md.c ! src/solaris/native/java/net/net_util_md.h ! src/solaris/native/sun/net/spi/SdpProvider.c ! src/solaris/native/sun/nio/ch/Net.c ! src/solaris/native/sun/nio/ch/SctpNet.c
hg: jdk7/tl/jdk: 6920143: test/java/awt/TestArea/UsingWithMouse.java needs realSync()
Changeset: 4192f6edbbf4 Author:ptisnovs Date: 2010-01-27 17:47 +0100 URL: http://hg.openjdk.java.net/jdk7/tl/jdk/rev/4192f6edbbf4 6920143: test/java/awt/TestArea/UsingWithMouse.java needs realSync() Summary: Added small delay to make sure that TextArea animation have finished Reviewed-by: anthony ! test/java/awt/TextArea/UsingWithMouse/SelectionAutoscrollTest.java
hg: jdk7/tl: 3 new changesets
Changeset: 432cbbdc44bc Author:andrew Date: 2010-01-07 23:17 + URL: http://hg.openjdk.java.net/jdk7/tl/rev/432cbbdc44bc 6914986: Make sure openjdk doc generation not turned off with JDK_UPDATE_VERSION Summary: Only turn off documentation for updates when not building OpenJDK Reviewed-by: ohair ! make/Defs-internal.gmk Changeset: a3242906c774 Author:mikejwre Date: 2010-01-20 17:09 -0800 URL: http://hg.openjdk.java.net/jdk7/tl/rev/a3242906c774 Merge Changeset: 8403096d1fe7 Author:mikejwre Date: 2010-01-21 11:12 -0800 URL: http://hg.openjdk.java.net/jdk7/tl/rev/8403096d1fe7 Added tag jdk7-b80 for changeset a3242906c774 ! .hgtags
hg: jdk7/tl/corba: 3 new changesets
Changeset: d4c077d44a64 Author:andrew Date: 2010-01-16 01:04 + URL: http://hg.openjdk.java.net/jdk7/tl/corba/rev/d4c077d44a64 6917485: Corba doc warnings Summary: Fix warnings generated by javadoc Reviewed-by: darcy ! src/share/classes/com/sun/tools/corba/se/idl/constExpr/Expression.java ! src/share/classes/javax/rmi/PortableRemoteObject.java ! src/share/classes/org/omg/CORBA/SetOverrideType.java ! src/share/classes/org/omg/CORBA/TCKind.java ! src/share/classes/org/omg/CORBA/UnknownUserException.java ! src/share/classes/org/omg/CORBA/portable/ServantObject.java ! src/share/classes/org/omg/CosNaming/nameservice.idl ! src/share/classes/org/omg/PortableInterceptor/Interceptors.idl Changeset: 0336e70ca0ae Author:mikejwre Date: 2010-01-20 17:09 -0800 URL: http://hg.openjdk.java.net/jdk7/tl/corba/rev/0336e70ca0ae Merge Changeset: e08a42a2a94d Author:mikejwre Date: 2010-01-21 11:12 -0800 URL: http://hg.openjdk.java.net/jdk7/tl/corba/rev/e08a42a2a94d Added tag jdk7-b80 for changeset 0336e70ca0ae ! .hgtags
hg: jdk7/tl/hotspot: 34 new changesets
Changeset: 40e7c1d24e4a Author:twisti Date: 2010-01-04 00:22 -0800 URL: http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/40e7c1d24e4a 6909153: Fix broken options on Zero Summary: Smaller fixes to ensure that Zero still works with non-standard options. Reviewed-by: twisti Contributed-by: Gary Benson ! src/share/vm/compiler/compileBroker.cpp ! src/share/vm/runtime/arguments.cpp Changeset: 896da934748c Author:twisti Date: 2010-01-04 03:34 -0800 URL: http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/896da934748c 6913869: Zero assert fix Summary: Zero currently won't build on zSeries or PowerPC machines with assertions turned on. Reviewed-by: twisti Contributed-by: Gary Benson ! src/share/vm/prims/jni.cpp Changeset: aa62b9388fce Author:twisti Date: 2010-01-04 15:52 +0100 URL: http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/aa62b9388fce 6894206: JVM needs a way to traverse method handle structures Summary: We need a way to walk chained method handles in the JVM to call the right methods and to generate required bytecode adapters for the compilers. Reviewed-by: kvn ! src/cpu/x86/vm/methodHandles_x86.cpp ! src/share/vm/classfile/javaClasses.cpp ! src/share/vm/classfile/javaClasses.hpp ! src/share/vm/classfile/vmSymbols.cpp ! src/share/vm/classfile/vmSymbols.hpp ! src/share/vm/includeDB_core + src/share/vm/prims/methodHandleWalk.cpp + src/share/vm/prims/methodHandleWalk.hpp Changeset: 0910903272e5 Author:twisti Date: 2010-01-04 07:04 -0800 URL: http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/0910903272e5 Merge Changeset: e66fd840cb6b Author:twisti Date: 2010-01-04 18:38 +0100 URL: http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/e66fd840cb6b 6893081: method handle & invokedynamic code needs additional cleanup (post 6815692, 6858164) Summary: During the work for 6829187 we have fixed a number of basic bugs which are logically grouped with 6815692 and 6858164 but which must be reviewed and pushed separately. Reviewed-by: kvn, never ! src/cpu/x86/vm/frame_x86.cpp ! src/cpu/x86/vm/methodHandles_x86.cpp ! src/cpu/x86/vm/runtime_x86_32.cpp ! src/cpu/x86/vm/sharedRuntime_x86_64.cpp ! src/cpu/x86/vm/templateInterpreter_x86_32.cpp ! src/cpu/x86/vm/templateInterpreter_x86_64.cpp ! src/share/vm/c1/c1_IR.hpp ! src/share/vm/ci/ciStreams.cpp ! src/share/vm/classfile/javaClasses.hpp ! src/share/vm/classfile/systemDictionary.cpp ! src/share/vm/classfile/systemDictionary.hpp ! src/share/vm/classfile/vmSymbols.hpp ! src/share/vm/code/codeBlob.hpp ! src/share/vm/code/debugInfoRec.cpp ! src/share/vm/code/debugInfoRec.hpp ! src/share/vm/code/nmethod.cpp ! src/share/vm/code/nmethod.hpp ! src/share/vm/code/pcDesc.hpp ! src/share/vm/compiler/methodLiveness.cpp ! src/share/vm/interpreter/bytecode.cpp ! src/share/vm/interpreter/bytecode.hpp ! src/share/vm/interpreter/bytecodes.cpp ! src/share/vm/interpreter/interpreter.cpp ! src/share/vm/interpreter/linkResolver.cpp ! src/share/vm/interpreter/linkResolver.hpp ! src/share/vm/opto/doCall.cpp ! src/share/vm/opto/output.cpp ! src/share/vm/opto/runtime.cpp ! src/share/vm/runtime/arguments.cpp ! src/share/vm/runtime/sharedRuntime.cpp ! src/share/vm/runtime/thread.cpp ! src/share/vm/runtime/thread.hpp Changeset: 4b84186a8248 Author:kvn Date: 2010-01-04 15:21 -0800 URL: http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/4b84186a8248 6913075: EA identifies escape state incorrectly after 6895383 fix Summary: EA incorrectly identifies escape state of an allocation passed as call argument. Reviewed-by: never ! src/share/vm/opto/escape.cpp Changeset: 97125851f396 Author:twisti Date: 2010-01-05 13:05 +0100 URL: http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/97125851f396 6829187: compiler optimizations required for JSR 292 Summary: C2 implementation for invokedynamic support. Reviewed-by: kvn, never ! src/cpu/sparc/vm/sparc.ad ! src/cpu/x86/vm/frame_x86.inline.hpp ! src/cpu/x86/vm/x86_32.ad ! src/cpu/x86/vm/x86_64.ad + src/share/vm/ci/ciCPCache.cpp + src/share/vm/ci/ciCPCache.hpp ! src/share/vm/ci/ciClassList.hpp ! src/share/vm/ci/ciEnv.cpp ! src/share/vm/ci/ciEnv.hpp ! src/share/vm/ci/ciMethod.cpp ! src/share/vm/ci/ciMethod.hpp ! src/share/vm/ci/ciObject.hpp ! src/share/vm/ci/ciObjectFactory.cpp ! src/share/vm/ci/ciStreams.cpp ! src/share/vm/ci/ciStreams.hpp ! src/share/vm/ci/ciTypeFlow.cpp ! src/share/vm/includeDB_compiler2 ! src/share/vm/includeDB_core ! src/share/vm/opto/bytecodeInfo.cpp ! src/share/vm/opto/callGenerator.cpp ! src/share/vm/opto/callGenerator.hpp ! src/share/vm/opto/callnode.hpp ! src/share/vm/opto/doCall.cpp ! src/share/vm/opto/graphKit.cpp ! src/share/vm/opto/lcm.cpp ! src/share/vm/opto/machnode.cpp ! src/share/vm/opto/machnode.hpp ! src/share/vm/opto/matcher.cpp ! src/share/vm/opto/matcher.hpp ! src/share/vm/opto/output.cpp ! src/share/vm/opto/type.cpp Changeset: dd57230ba8fe Author:twisti Date: 2010-01-05 15:21 +0100 URL: http://hg.openjdk.java.ne
hg: jdk7/tl/jaxp: Added tag jdk7-b80 for changeset 9219574db593
Changeset: 204e59d488cd Author:mikejwre Date: 2010-01-21 11:12 -0800 URL: http://hg.openjdk.java.net/jdk7/tl/jaxp/rev/204e59d488cd Added tag jdk7-b80 for changeset 9219574db593 ! .hgtags
hg: jdk7/tl/jaxws: Added tag jdk7-b80 for changeset 447767dee56a
Changeset: f051045fe94a Author:mikejwre Date: 2010-01-21 11:12 -0800 URL: http://hg.openjdk.java.net/jdk7/tl/jaxws/rev/f051045fe94a Added tag jdk7-b80 for changeset 447767dee56a ! .hgtags
hg: jdk7/tl/jdk: 28 new changesets
Changeset: 9956e8d71e06
Author:tbell
Date: 2009-12-18 09:40 -0800
URL: http://hg.openjdk.java.net/jdk7/tl/jdk/rev/9956e8d71e06
6899737: JDK build fails in make/java/jli because of _vsnprintf macro
redefinition
Summary: Use stdio.h instead when building with Visual Studio 2008 or later
Reviewed-by: art, ohair
! src/share/native/java/util/zip/zlib-1.2.3/zutil.h
Changeset: 39b9564ff01c
Author:ohair
Date: 2010-01-05 15:17 -0800
URL: http://hg.openjdk.java.net/jdk7/tl/jdk/rev/39b9564ff01c
Merge
Changeset: 447c9e535234
Author:ohair
Date: 2010-01-13 15:37 -0800
URL: http://hg.openjdk.java.net/jdk7/tl/jdk/rev/447c9e535234
Merge
Changeset: e0905e36766a
Author:yhuang
Date: 2009-12-06 22:18 -0800
URL: http://hg.openjdk.java.net/jdk7/tl/jdk/rev/e0905e36766a
6868106: Ukrainian currency has wrong format
Reviewed-by: yhuang, peytoia
! src/share/classes/sun/text/resources/FormatData_uk.java
! src/share/classes/sun/util/resources/CurrencyNames_uk_UA.properties
! test/sun/text/resources/LocaleData
Changeset: d9080b33ba74
Author:yhuang
Date: 2009-12-08 21:14 -0800
URL: http://hg.openjdk.java.net/jdk7/tl/jdk/rev/d9080b33ba74
6610748: Dateformat - AM-PM indicator in Finnish appears to be from English
Reviewed-by: yhuang, peytoia
! src/share/classes/sun/text/resources/FormatData_fi.java
! test/sun/text/resources/LocaleData
! test/sun/text/resources/LocaleDataTest.java
Changeset: ac9e284db030
Author:yhuang
Date: 2009-12-08 21:19 -0800
URL: http://hg.openjdk.java.net/jdk7/tl/jdk/rev/ac9e284db030
6645271: Wrong date format for Croatian (hr) locale
Reviewed-by: yhuang, peytoia
! src/share/classes/sun/text/resources/FormatData_hr_HR.java
Changeset: 3ab178316aa0
Author:yhuang
Date: 2009-12-08 21:26 -0800
URL: http://hg.openjdk.java.net/jdk7/tl/jdk/rev/3ab178316aa0
6609737: DateFormat incorrect for German locale
Reviewed-by: yhuang, peytoia
! src/share/classes/sun/text/resources/FormatData_de.java
! src/share/classes/sun/util/resources/TimeZoneNames_de.java
Changeset: 4910b580a725
Author:yhuang
Date: 2009-12-08 21:30 -0800
URL: http://hg.openjdk.java.net/jdk7/tl/jdk/rev/4910b580a725
6507067: TimeZone country/area message error
Reviewed-by: peytoia
! src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java
Changeset: 06df47459ecf
Author:yhuang
Date: 2009-12-10 17:26 -0800
URL: http://hg.openjdk.java.net/jdk7/tl/jdk/rev/06df47459ecf
6873931: New Turkish currency since 2009
Reviewed-by: yhuang, peytoia
! src/share/classes/sun/util/resources/CurrencyNames_tr_TR.properties
! test/sun/text/resources/LocaleData
! test/sun/text/resources/LocaleDataTest.java
Changeset: ddc4a80f25f4
Author:yhuang
Date: 2009-12-17 02:00 -0800
URL: http://hg.openjdk.java.net/jdk7/tl/jdk/rev/ddc4a80f25f4
6450945: The week day for Saturday and the first week day in Romania locale are
incorrect
Reviewed-by: yhuang, peytoia
! src/share/classes/sun/text/resources/FormatData_ro.java
! src/share/classes/sun/util/resources/CalendarData_ro.properties
! test/sun/text/resources/LocaleData
! test/sun/text/resources/LocaleDataTest.java
Changeset: cd5d46887546
Author:yhuang
Date: 2009-12-17 02:12 -0800
URL: http://hg.openjdk.java.net/jdk7/tl/jdk/rev/cd5d46887546
6645268: Country/language names with locale fi_FI are incorrect for
FRANCE/FRENCH
Reviewed-by: yhuang, peytoia
! src/share/classes/sun/util/resources/LocaleNames_fi.properties
! test/sun/text/resources/LocaleData
! test/sun/text/resources/LocaleDataTest.java
! test/sun/util/resources/Locale/Bug4429024.java
Changeset: 946a0a09a477
Author:yhuang
Date: 2009-12-17 02:28 -0800
URL: http://hg.openjdk.java.net/jdk7/tl/jdk/rev/946a0a09a477
6646611: Incorrect spelling of month name in locale for Belarusian language
("be", "BY")
Reviewed-by: yhuang, peytoia
! src/share/classes/sun/text/resources/FormatData_be.java
! test/sun/text/resources/LocaleData
! test/sun/text/resources/LocaleDataTest.java
Changeset: e8fa2b2cb1e8
Author:yhuang
Date: 2009-12-17 22:24 -0800
URL: http://hg.openjdk.java.net/jdk7/tl/jdk/rev/e8fa2b2cb1e8
6650730: Lithuanian locale date and number formats mismatch.
Reviewed-by: yhuang, peytoia
! src/share/classes/sun/text/resources/FormatData_lt.java
! test/sun/text/resources/LocaleData
! test/sun/text/resources/LocaleDataTest.java
Changeset: e9b09f76d281
Author:yhuang
Date: 2009-12-17 22:25 -0800
URL: http://hg.openjdk.java.net/jdk7/tl/jdk/rev/e9b09f76d281
6645405: Errors in Hungarian local-specific formatting. (L10N part of 6609703)
Reviewed-by: yhuang, peytoia
! src/share/classes/sun/text/resources/FormatData_hu_HU.java
Changeset: 3b78f3769688
Author:yhuang
Date: 2009-12-20 19:31 -0800
URL: http://hg.openjdk.java.net/jdk7/tl/jdk/rev/3b78f3769688
6910489: Slovenia Locale, wrong firstDayOfWeek number
Reviewed-by: yhuang, peytoia
! src/shar
hg: jdk7/tl/langtools: 3 new changesets
Changeset: 250a580ab046 Author:mikejwre Date: 2010-01-21 11:12 -0800 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/250a580ab046 Added tag jdk7-b80 for changeset f0074aa48d4e ! .hgtags Changeset: cfabfcf9f110 Author:lana Date: 2010-01-22 09:34 -0800 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/cfabfcf9f110 Merge Changeset: ff7a01f9eff3 Author:lana Date: 2010-01-27 14:46 -0800 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/ff7a01f9eff3 Merge
hg: jdk7/tl/jdk: 6920732: opensource test/java/nio/charset
Changeset: 946b30073247 Author:sherman Date: 2010-01-27 19:39 -0800 URL: http://hg.openjdk.java.net/jdk7/tl/jdk/rev/946b30073247 6920732: opensource test/java/nio/charset Summary: move the test cases to openjdk Reviewed-by: martin + test/java/nio/charset/Charset/AvailableCharsetNames.java + test/java/nio/charset/Charset/CharsetContainmentTest.java + test/java/nio/charset/Charset/Contains.java + test/java/nio/charset/Charset/Default.java + test/java/nio/charset/Charset/EmptyCharsetName.java + test/java/nio/charset/Charset/EncDec.java + test/java/nio/charset/Charset/IllegalCharsetName.java + test/java/nio/charset/Charset/NIOCharsetAvailabilityTest.java + test/java/nio/charset/Charset/NullCharsetName.java + test/java/nio/charset/Charset/RegisteredCharsets.java + test/java/nio/charset/Charset/default.sh + test/java/nio/charset/CharsetDecoder/AverageMax.java + test/java/nio/charset/CharsetDecoder/EmptyInput.java + test/java/nio/charset/CharsetEncoder/CanEncode.java + test/java/nio/charset/CharsetEncoder/Flush.java + test/java/nio/charset/RemovingSunIO/SunioAlias.java + test/java/nio/charset/RemovingSunIO/TestCOMP.java + test/java/nio/charset/RemovingSunIO/TestUnmappableForLength.java + test/java/nio/charset/coders/BashCache.java + test/java/nio/charset/coders/BashStreams.java + test/java/nio/charset/coders/Check.java + test/java/nio/charset/coders/CheckSJISMappingProp.sh + test/java/nio/charset/coders/Errors.java + test/java/nio/charset/coders/FullRead.java + test/java/nio/charset/coders/IOCoders.java + test/java/nio/charset/coders/IsLegalReplacement.java + test/java/nio/charset/coders/ResetISO2022JP.java + test/java/nio/charset/coders/SJISPropTest.java + test/java/nio/charset/coders/StreamTimeout.java + test/java/nio/charset/coders/Surrogate.java + test/java/nio/charset/coders/Surrogates.java + test/java/nio/charset/coders/Util.java + test/java/nio/charset/coders/ref.shift_jis + test/java/nio/charset/coders/ref.windows-31j + test/java/nio/charset/spi/FooCharset.java + test/java/nio/charset/spi/FooProvider.java + test/java/nio/charset/spi/Test.java + test/java/nio/charset/spi/basic.sh + test/java/nio/charset/spi/charsetProvider.sp + test/java/nio/charset/spi/default-pol
