hg: jdk8/tl/jdk: 7110151: Use underlying platform's zlib library for Java zlib support
Changeset: 35e024c6a62c
Author:andrew
Date: 2012-08-15 14:35 +0100
URL: http://hg.openjdk.java.net/jdk8/tl/jdk/rev/35e024c6a62c
7110151: Use underlying platform's zlib library for Java zlib support
Summary: Make SYSTEM_ZLIB more flexible by using ZLIB_{CFLAGS,LIBS} and
building on more than just MACOSX.
Reviewed-by: sherman, alanb
! make/com/sun/java/pack/Makefile
! make/common/Program.gmk
! make/common/shared/Defs-linux.gmk
! make/common/shared/Defs-macosx.gmk
! make/common/shared/Defs-solaris.gmk
! make/java/jli/Makefile
! make/java/zip/Makefile
! make/jdk_generic_profile.sh
! make/sun/splashscreen/Makefile
! src/share/native/com/sun/java/util/jar/pack/defines.h
! src/share/native/java/util/zip/Adler32.c
! src/share/native/java/util/zip/CRC32.c
! src/share/native/java/util/zip/Deflater.c
! src/share/native/java/util/zip/Inflater.c
! src/share/native/java/util/zip/zip_util.c
Re: RFR: 7056731: Race condition in CORBA code causes re-use of ABORTed connections
Hi Sean, This looks good. Best Lance On Aug 14, 2012, at 12:38 PM, Seán Coffey wrote: I'm looking to forward port this corba fix from 6u34 to jdk8 (and eventually port to 7u) d.macdon...@auckland.ac.nz originally reported this issue and I'll be marking the fix as contributed by him. He's already signed the OCA. There's a good description in bug report. We have a race like condition if the corba server is shut down while there are still workers/client threads in a waiting queue waiting for server. The issue arises when the purgeCalls method marks a socket state as ABORTed or CLOSE_RECVD but fails to remove that socket from the socket connectionCache. Fix is to wrap the removal of the socket in a finally block. The CorbaResponseWaitingRoomImpl changes are more focused on ensuring that the Map holding these clients is better synchronized. webrev : http://cr.openjdk.java.net/~coffeys/webrev.7056731.jdk8/ http://cr.openjdk.java.net/%7Ecoffeys/webrev.7056731.jdk8/ bug report : http://bugs.sun.com/view_bug.do?bug_id=7056731 Regards, Sean. Lance Andersen| Principal Member of Technical Staff | +1.781.442.2037 Oracle Java Engineering 1 Network Drive Burlington, MA 01803 lance.ander...@oracle.com
Re: PING: [PATCH FOR REVIEW] System Zlib Support
- Original Message - Yes, you are good to go. Thanks! Pushed: http://hg.openjdk.java.net/jdk8/tl/jdk/rev/35e024c6a62c Thanks! -Sherman On 8/14/2012 6:13 AM, Andrew Hughes wrote: - Original Message - On 14/08/2012 13:36, Andrew Hughes wrote: : Do you have a static libz.a installed (from zlib1g-dev) and all dependent static libraries? I think you're right about the static linking but this was just a quick test to see if SYSTEM_ZLIB=true worked with everything else as default. Ah right. pack200 has C++ so that explains why we see it there and not when building libzip. Right. BTW, it appears gcc 4.5 and later have a new option -static-libstdc++. I don't know if that would work better than the options currently used. http://gcc.gnu.org/gcc-4.5/changes.html $ dpkg -s zlib1g-dev Package: zlib1g-dev Status: install ok installed Multi-Arch: same Priority: optional Section: libdevel Installed-Size: 366 Maintainer: Ubuntu Developers ubuntu-devel-disc...@lists.ubuntu.com Architecture: i386 Source: zlib Version: 1:1.2.3.4.dfsg-3ubuntu4 Provides: libz-dev Depends: zlib1g (= 1:1.2.3.4.dfsg-3ubuntu4), libc6-dev | libc-dev Conflicts: zlib1-dev Description: compression library - development zlib is a library implementing the deflate compression method found in gzip and PKZIP. This package includes the development support files. Homepage: http://zlib.net/ Original-Maintainer: Mark Brown broo...@debian.org $ apt-file search libz.a lib64z1-dev: /usr/lib64/libz.a zlib1g-dev: /usr/lib/i386-linux-gnu/libz.a $ ls -l /usr/lib/i386-linux-gnu/libz.a -rw-r--r-- 1 root root 98772 Nov 10 2011 /usr/lib/i386-linux-gnu/libz.a I suspect you'll get the same failure with or without my patch (though you'll probably need the change to defines.h to get this far...) SYSTEM_ZLIB is currently Mac only so I wouldn't expect to have got very far without your changes. Yes, the defines.h change I refer to is the one that removes the Mac clause. It fails earlier without that change (I've been hitting it on most builds now I have SYSTEM_ZLIB set), so the patch is an improvement, even if it doesn't work in all cases. I'd guess you have STATIC_CXX set to true (the default apparently): I didn't specify any other build options so it's using the default. An odd default, though I can understand why, given OpenJDK's history. BTW: I should mention that I don't have any issues with the patch proposed as it works as it does now because SYSTEM_ZLIB is false. It may be that there is follow-up to allow SYSTEM_ZLIB=true and static linking to work together. Can I take that as it's good to push? :-D -Alan. Thanks, -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07
hg: jdk8/tl/langtools: 7191449: update copyright year to match last edit in jdk8 langtools repository
Changeset: 9d47f4850714 Author:jjh Date: 2012-08-15 13:48 -0700 URL: http://hg.openjdk.java.net/jdk8/tl/langtools/rev/9d47f4850714 7191449: update copyright year to match last edit in jdk8 langtools repository Reviewed-by: jjh Contributed-by: steve.si...@oracle.com ! make/jprt.properties ! make/tools/anttasks/CompilePropertiesTask.java ! make/tools/anttasks/GenStubsTask.java ! make/tools/anttasks/SelectToolTask.java ! make/tools/compileproperties/CompileProperties.java ! make/tools/genstubs/GenStubs.java ! src/share/classes/com/sun/tools/javac/code/Source.java ! src/share/classes/com/sun/tools/javac/code/Type.java ! src/share/classes/com/sun/tools/javac/comp/AttrContext.java ! src/share/classes/com/sun/tools/javac/comp/TransTypes.java ! src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java ! src/share/classes/com/sun/tools/javac/main/Main.java ! src/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java ! test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh ! test/tools/javac/api/7086261/T7086261.java ! test/tools/javac/api/T6397104.java ! test/tools/javac/diags/CheckExamples.java ! test/tools/javac/diags/MessageInfo.java ! test/tools/javac/diags/RunExamples.java ! test/tools/javac/diags/examples/ApplicableMethodFound1.java ! test/tools/javac/diags/examples/IllegalDot.java ! test/tools/javac/diags/examples/InconvertibleTypes.java ! test/tools/javac/diags/examples/KindnameConstructor.java ! test/tools/javac/diags/examples/NotApplicableMethodFound.java ! test/tools/javac/diags/examples/PossibleLossPrecision.java ! test/tools/javac/diags/examples/ResourceNotApplicableToType.java ! test/tools/javac/diags/examples/VarargsArgumentMismatch.java ! test/tools/javac/diags/examples/VerboseResolveMulti1.java ! test/tools/javac/diags/examples/WhereCaptured.java ! test/tools/javac/diags/examples/WhereCaptured1.java ! test/tools/javac/diags/examples/WhereIntersection.java ! test/tools/javac/diags/examples/WhereTypeVar.java ! test/tools/javac/generics/typevars/T7148242.java ! test/tools/javac/newlines/Newlines.sh ! test/tools/javac/parser/T4881269.java ! test/tools/javac/processing/TestWarnErrorCount.java
hg: jdk8/tl/jdk: 6931128: (spec) File attribute tests fail when run as root.
Changeset: da14e2c90bcb Author:robm Date: 2012-08-15 22:46 +0100 URL: http://hg.openjdk.java.net/jdk8/tl/jdk/rev/da14e2c90bcb 6931128: (spec) File attribute tests fail when run as root. Reviewed-by: alanb ! src/share/classes/java/io/File.java ! test/java/io/File/Basic.java ! test/java/io/File/SetAccess.java ! test/java/io/File/SetReadOnly.java ! test/java/io/File/SymLinks.java + test/java/io/File/Util.java
Request for review: 7191777: test/java/lang/ProcessBuilder/Basic.java failing intermittently due to additions for 4244896
Hi folks, One of the tests from 4244896 failed once during nightly testing. It isn't known how much of a delay will be necessary in order for it to pass. In any case the tolerance can't really be loosened much more without making the test meaningless so I've decided to remove it. http://cr.openjdk.java.net/~robm/7191777/webrev.01/ http://cr.openjdk.java.net/%7Erobm/7191777/webrev.01/ Thanks, -Rob
Re: Request for review: 7191777: test/java/lang/ProcessBuilder/Basic.java failing intermittently due to additions for 4244896
Hi Rob, On 16/08/2012 9:09 AM, Rob McKenna wrote: Hi folks, One of the tests from 4244896 failed once during nightly testing. It isn't known how much of a delay will be necessary in order for it to pass. In any case the tolerance can't really be loosened much more without making the test meaningless so I've decided to remove it. http://cr.openjdk.java.net/~robm/7191777/webrev.01/ http://cr.openjdk.java.net/%7Erobm/7191777/webrev.01/ Can we not leave the waitFor in place but simply not check how long we waited? That way if it really takes too long we hit the default test timeout. David - Thanks, -Rob
