From Alan.Bateman at Sun.COM Mon Feb 1 04:49:51 2010 From: Alan.Bateman at Sun.COM (Alan Bateman) Date: Mon, 01 Feb 2010 12:49:51 +0000 Subject: -Werror in make/java/sun_nio/Makefile In-Reply-To: <17c6771e1001291819v4abb2fabkb4bc731664c6df03@mail.gmail.com> References: <17c6771e1001281446i6bf5e070w332d5ea1942f72@mail.gmail.com> <4B621A80.9060402@sun.com> <17c6771e1001291819v4abb2fabkb4bc731664c6df03@mail.gmail.com> Message-ID: <4B66CDEF.9010708@sun.com> Andrew John Hughes wrote: > : > Ok, that's what I've done in this webrev: > > http://cr.openjdk.java.net/~andrew/warnings/webrev.01/ > > It also fixes a number of unchecked and redundant cast warnings that > occur when building with JAVAC_MAX_WARNINGS=true. With this patch, > sun_io now compiles when JAVAC_MAX_WARNINGS=true. > > Does this look ok? > Looks good to me. I think this is first webrev that I've reviewed with changes that make use of the diamond operator. I've created a bug to track this: 6921740: Eliminate warnings from sun.io converters and allow compiling with JAVAC_MAX_WARNINGS=true -Alan. From uckelman at nomic.net Mon Feb 1 05:22:35 2010 From: uckelman at nomic.net (Joel Uckelman) Date: Mon, 01 Feb 2010 14:22:35 +0100 Subject: zipfs patches In-Reply-To: <4B648DDF.9030703@sun.com> References: <20100129193739.D2F4010076@charybdis.ellipsis.cx> <4B648DDF.9030703@sun.com> Message-ID: <20100201132235.5571A100B5@charybdis.ellipsis.cx> Thus spake Alan Bateman: > Joel Uckelman wrote: > > Two more zipfs patches: > > > > * Implemented readAttributes(). > > * copyTo() should return target, not this. > > > > > Thanks for taking these bugs. The map key is the attribute name rather > than view:attribute and so I assume map.put(attr, ..) should be > map.put(name, ...). Yes. > Another comment is that you've implemented it to use > getAttribute, and if I read the patch correctly, it means that a bulk > read turns into a sequence of gets where each reads the zip entry. With > caching this might not be noticeable but I'm interested to know if > you've compared it to reading the zip entry once and then populating the > map with the requested attributes. > readAttribtues does delegate to getAttribute, yes. The problem I see with reading the ZipEntry once is that the stuff which handles ZipEntries isn't visible to ZipFilePath---all of the handling code is burried inside the the three possible Attributes classes (ZipFileAttributes, JarFileAttributes, ZipFileBasicAttributes). Since ZipEntries are cached, I'm not worried about overhead of getting the ZipEntries multiple times; rather, I'm worried about the huge amount of gargage which will be generated by calling readAttributes: For each attribute we read, we construct a new View and a new Attributes object. Since the Views for zipfs are immutable objects, we could store them in ZipFilePath as volatile members, so they don't need to be recreated each time they're asked for. We could also cache the Attributes objects, but in a read-write scenario those could go stale. (This is problem is easy to solve in my RW implementation, since ZipEntries can go stale, too, and I'm already handling that.) What I'm unsure about, and unsure how to even test, is whether caching this stuff is worth it. The Views, at least, should be among the cheapest objects to create. Maybe they should just be cached locally, within readlAttributes, so that each call creates at most one of each? -- J. From alan.bateman at sun.com Mon Feb 1 06:42:51 2010 From: alan.bateman at sun.com (alan.bateman at sun.com) Date: Mon, 01 Feb 2010 14:42:51 +0000 Subject: hg: nio/nio: 14 new changesets Message-ID: <20100201144251.86E4A4196B@hg.openjdk.java.net> Changeset: 382219a27386 Author: ohair Date: 2009-11-18 16:41 -0800 URL: http://hg.openjdk.java.net/nio/nio/rev/382219a27386 6727046: Add message when docs are skipped in control build 6864011: typo? in top level Makefile: DAYE_STAMP Reviewed-by: jjg ! Makefile ! make/Defs-internal.gmk ! make/jdk-rules.gmk ! make/sanity-rules.gmk Changeset: 0619361ff7c5 Author: ohair Date: 2009-11-04 11:19 -0800 URL: http://hg.openjdk.java.net/nio/nio/rev/0619361ff7c5 Merge Changeset: c8b63075403d Author: ohair Date: 2009-11-08 14:46 -0800 URL: http://hg.openjdk.java.net/nio/nio/rev/c8b63075403d Merge Changeset: 1f17ca8353ba Author: katleman Date: 2009-11-12 15:35 -0800 URL: http://hg.openjdk.java.net/nio/nio/rev/1f17ca8353ba Added tag jdk7-b76 for changeset c8b63075403d ! .hgtags Changeset: 08f13b9af1b2 Author: tbell Date: 2009-11-23 19:55 -0800 URL: http://hg.openjdk.java.net/nio/nio/rev/08f13b9af1b2 Merge Changeset: 721c1696c124 Author: mikejwre Date: 2009-12-03 12:52 -0800 URL: http://hg.openjdk.java.net/nio/nio/rev/721c1696c124 Added tag jdk7-b77 for changeset 1f17ca8353ba ! .hgtags Changeset: 80161484b6b1 Author: tbell Date: 2009-12-08 09:14 -0800 URL: http://hg.openjdk.java.net/nio/nio/rev/80161484b6b1 Merge Changeset: ea77a8b9b028 Author: ohair Date: 2009-12-16 12:51 -0800 URL: http://hg.openjdk.java.net/nio/nio/rev/ea77a8b9b028 6909462: Fix nbproject/private references in .hgignore Summary: See bugzilla issue 100097 Reviewed-by: tbell Contributed-by: Jesse Glick ! .hgignore Changeset: ab4ae8f45146 Author: mikejwre Date: 2009-12-16 23:38 -0800 URL: http://hg.openjdk.java.net/nio/nio/rev/ab4ae8f45146 Merge Changeset: 20aeeb517139 Author: mikejwre Date: 2009-12-17 14:10 -0800 URL: http://hg.openjdk.java.net/nio/nio/rev/20aeeb517139 Added tag jdk7-b78 for changeset ab4ae8f45146 ! .hgtags Changeset: b1952d19290d Author: katleman Date: 2010-01-14 15:48 -0800 URL: http://hg.openjdk.java.net/nio/nio/rev/b1952d19290d Added tag jdk7-b79 for changeset 20aeeb517139 ! .hgtags Changeset: 432cbbdc44bc Author: andrew Date: 2010-01-07 23:17 +0000 URL: http://hg.openjdk.java.net/nio/nio/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/nio/nio/rev/a3242906c774 Merge Changeset: 8403096d1fe7 Author: mikejwre Date: 2010-01-21 11:12 -0800 URL: http://hg.openjdk.java.net/nio/nio/rev/8403096d1fe7 Added tag jdk7-b80 for changeset a3242906c774 ! .hgtags From alan.bateman at sun.com Mon Feb 1 06:43:02 2010 From: alan.bateman at sun.com (alan.bateman at sun.com) Date: Mon, 01 Feb 2010 14:43:02 +0000 Subject: hg: nio/nio/corba: 12 new changesets Message-ID: <20100201144319.B157F4196C@hg.openjdk.java.net> Changeset: 6995f81e3b53 Author: ohair Date: 2009-11-04 11:19 -0800 URL: http://hg.openjdk.java.net/nio/nio/corba/rev/6995f81e3b53 Merge Changeset: 937144222e22 Author: ohair Date: 2009-11-08 14:49 -0800 URL: http://hg.openjdk.java.net/nio/nio/corba/rev/937144222e22 Merge Changeset: 086bf925ee95 Author: katleman Date: 2009-11-12 15:35 -0800 URL: http://hg.openjdk.java.net/nio/nio/corba/rev/086bf925ee95 Added tag jdk7-b76 for changeset 937144222e22 ! .hgtags Changeset: 28b983e5bb5f Author: gbenson Date: 2009-11-23 10:04 +0000 URL: http://hg.openjdk.java.net/nio/nio/corba/rev/28b983e5bb5f 6903453: Zero build on ARM and IA-64 Summary: Correctly set uname on ARM, and correctly build fdlibm on IA-64 Reviewed-by: ohair ! make/common/shared/Platform.gmk Changeset: 6881f0383f62 Author: ohair Date: 2009-11-25 11:05 -0800 URL: http://hg.openjdk.java.net/nio/nio/corba/rev/6881f0383f62 Merge Changeset: 6977ccc8827e Author: mikejwre Date: 2009-12-03 12:52 -0800 URL: http://hg.openjdk.java.net/nio/nio/corba/rev/6977ccc8827e Added tag jdk7-b77 for changeset 6881f0383f62 ! .hgtags Changeset: a7f7276b48cd Author: ohair Date: 2009-12-16 12:51 -0800 URL: http://hg.openjdk.java.net/nio/nio/corba/rev/a7f7276b48cd 6909462: Fix nbproject/private references in .hgignore Summary: See bugzilla issue 100097 Reviewed-by: tbell Contributed-by: Jesse Glick ! .hgignore Changeset: ec0421b5703b Author: mikejwre Date: 2009-12-17 14:10 -0800 URL: http://hg.openjdk.java.net/nio/nio/corba/rev/ec0421b5703b Added tag jdk7-b78 for changeset a7f7276b48cd ! .hgtags Changeset: fdbc85b2d15c Author: katleman Date: 2010-01-14 15:48 -0800 URL: http://hg.openjdk.java.net/nio/nio/corba/rev/fdbc85b2d15c Added tag jdk7-b79 for changeset ec0421b5703b ! .hgtags Changeset: d4c077d44a64 Author: andrew Date: 2010-01-16 01:04 +0000 URL: http://hg.openjdk.java.net/nio/nio/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/nio/nio/corba/rev/0336e70ca0ae Merge Changeset: e08a42a2a94d Author: mikejwre Date: 2010-01-21 11:12 -0800 URL: http://hg.openjdk.java.net/nio/nio/corba/rev/e08a42a2a94d Added tag jdk7-b80 for changeset 0336e70ca0ae ! .hgtags From gnu_andrew at member.fsf.org Mon Feb 1 06:51:07 2010 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Mon, 1 Feb 2010 14:51:07 +0000 Subject: -Werror in make/java/sun_nio/Makefile In-Reply-To: <4B66CDEF.9010708@sun.com> References: <17c6771e1001281446i6bf5e070w332d5ea1942f72@mail.gmail.com> <4B621A80.9060402@sun.com> <17c6771e1001291819v4abb2fabkb4bc731664c6df03@mail.gmail.com> <4B66CDEF.9010708@sun.com> Message-ID: <17c6771e1002010651h7aa4555csce107a3aed76a5bc@mail.gmail.com> On 1 February 2010 12:49, Alan Bateman wrote: > Andrew John Hughes wrote: >> >> : >> Ok, that's what I've done in this webrev: >> >> http://cr.openjdk.java.net/~andrew/warnings/webrev.01/ >> >> It also fixes a number of unchecked and redundant cast warnings that >> occur when building with JAVAC_MAX_WARNINGS=true. ?With this patch, >> sun_io now compiles when JAVAC_MAX_WARNINGS=true. >> >> Does this look ok? >> > > Looks good to me. I think this is first webrev that I've reviewed with > changes that make use of the diamond operator. > > I've created a bug to track this: > ?6921740: Eliminate warnings from sun.io converters and allow compiling with > JAVAC_MAX_WARNINGS=true > > -Alan. > > Great! Is it ok to push this now or does it need further review? Thanks, -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From alan.bateman at sun.com Mon Feb 1 06:44:58 2010 From: alan.bateman at sun.com (alan.bateman at sun.com) Date: Mon, 01 Feb 2010 14:44:58 +0000 Subject: hg: nio/nio/hotspot: 131 new changesets Message-ID: <20100201145142.B7B974196F@hg.openjdk.java.net> Changeset: 08780c8a9f04 Author: kamg Date: 2009-10-20 16:34 -0400 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/08780c8a9f04 6893483: DTrace probe return values for a couple JNI methods are wrong Summary: Fix the shadowing and incorrect macro usages Reviewed-by: coleenp ! src/share/vm/prims/jni.cpp Changeset: a3b9e96881fe Author: xlu Date: 2009-10-23 18:44 -0700 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/a3b9e96881fe Merge Changeset: d912f17c1ae4 Author: xlu Date: 2009-10-28 10:37 -0700 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/d912f17c1ae4 Merge Changeset: 0a46d0c5dccb Author: never Date: 2009-10-15 11:47 -0700 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/0a46d0c5dccb 6891750: deopt blob kills values in O5 Reviewed-by: kvn, twisti ! src/cpu/sparc/vm/sharedRuntime_sparc.cpp + test/compiler/6891750/Test6891750.java Changeset: 71fdc5052e49 Author: cfang Date: 2009-10-16 16:14 -0700 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/71fdc5052e49 Merge Changeset: 987e948ebbc8 Author: jrose Date: 2009-10-17 19:51 -0700 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/987e948ebbc8 6815692: method handle code needs some cleanup (post-6655638) Summary: correctly raise exceptions, support safe bitwise "raw" conversions, fix bugs revealed by VerifyMethodHandles, remove dead code, improve debugging support Reviewed-by: never, twisti ! src/cpu/x86/vm/methodHandles_x86.cpp ! src/cpu/x86/vm/templateInterpreter_x86_32.cpp ! src/share/vm/classfile/javaClasses.hpp ! src/share/vm/classfile/systemDictionary.cpp ! src/share/vm/oops/instanceKlass.cpp ! src/share/vm/oops/instanceKlass.hpp ! src/share/vm/oops/klass.cpp ! src/share/vm/oops/klass.hpp ! src/share/vm/oops/markOop.cpp ! src/share/vm/oops/methodOop.cpp ! src/share/vm/prims/methodHandles.cpp ! src/share/vm/prims/methodHandles.hpp Changeset: 873ec3787992 Author: kvn Date: 2009-10-21 09:15 -0700 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/873ec3787992 6892186: SA does not dump debug info for scalar replaced objects Summary: Implement scalar replaced objects debug info dump in SA. Reviewed-by: twisti ! agent/make/saenv.sh ! agent/make/saenv64.sh ! agent/src/share/classes/sun/jvm/hotspot/CommandProcessor.java ! agent/src/share/classes/sun/jvm/hotspot/code/CodeCache.java ! agent/src/share/classes/sun/jvm/hotspot/code/NMethod.java ! agent/src/share/classes/sun/jvm/hotspot/code/PCDesc.java ! agent/src/share/classes/sun/jvm/hotspot/code/ScopeDesc.java ! agent/src/share/classes/sun/jvm/hotspot/ui/classbrowser/HTMLGenerator.java ! agent/src/share/classes/sun/jvm/hotspot/utilities/soql/sa.js ! src/share/vm/opto/callnode.cpp ! src/share/vm/runtime/vmStructs.cpp Changeset: f875b4f472f7 Author: twisti Date: 2009-10-27 03:00 -0700 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/f875b4f472f7 6893554: SPECjvm2008 mpegaudio fails with SecurityException Summary: The problem occurs with negative numbers, as the 32-bit input values are sign extended into the 64-bit registers. Reviewed-by: kvn ! src/cpu/sparc/vm/sparc.ad Changeset: 4926bf2d292f Author: cfang Date: 2009-10-29 08:49 -0700 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/4926bf2d292f Merge Changeset: fc06cd9b42c7 Author: tonyp Date: 2009-10-23 14:34 -0400 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/fc06cd9b42c7 6886024: G1: assert(recent_avg_pause_time_ratio() < 1.00,"All GC?") Summary: the assert is incorrect and can fire incorrectly due to floating point inaccuracy. Reviewed-by: apetrusenko, ysr, jcoomes ! src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp Changeset: 6270f80a7331 Author: tonyp Date: 2009-09-30 14:50 -0400 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/6270f80a7331 6890137: G1: revamp reachable object dump Summary: Revamp the reachable object dump debugging facility. Reviewed-by: jmasa, apetrusenko ! src/share/vm/gc_implementation/g1/concurrentMark.cpp ! src/share/vm/gc_implementation/g1/concurrentMark.hpp ! src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp ! src/share/vm/gc_implementation/g1/g1_globals.hpp Changeset: fa2f65ebeb08 Author: apetrusenko Date: 2009-10-27 02:42 -0700 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/fa2f65ebeb08 6870843: G1: G1 GC memory leak Summary: The fix addresses two memory leaks in G1 code: (1) _evac_failure_scan_stack - a resource object allocated on the C heap was not freed; (2) RSHashTable were linked into deleted list which was only cleared at full GC. Reviewed-by: tonyp, iveresov ! src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp ! src/share/vm/gc_implementation/g1/sparsePRT.cpp ! src/share/vm/gc_implementation/g1/sparsePRT.hpp Changeset: 72a6752ac432 Author: ysr Date: 2009-10-28 11:16 -0700 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/72a6752ac432 6818264: Heap dumper unexpectedly adds .hprof suffix Summary: Restore old behaviour wrt HeapDumpPath; first dump goes to , th dump goes to ., with default value of the same as before. Reviewed-by: alanb, jcoomes, tonyp ! src/share/vm/services/heapDumper.cpp Changeset: beb8f45ee9f0 Author: johnc Date: 2009-10-29 09:42 -0700 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/beb8f45ee9f0 6889740: G1: OpenDS fails with "unhandled exception in compiled code" Summary: Incorrect code was being generated for the store operation in the null case of the aastore bytecode template. The bad code was generated by the store_heap_oop routine which takes a Register as its second argument. Passing NULL_WORD (0) as the second argument causes the value to be converted to Register(0), which is rax. Thus the generated store was "mov (dst), $rax" instead of "mov (dst), $0x0". Changed calls to store_heap_oop that pass NULL_WORD as the second argument to a new routine store_heap_oop_null. Reviewed-by: kvn, twisti ! src/cpu/x86/vm/assembler_x86.cpp ! src/cpu/x86/vm/assembler_x86.hpp ! src/cpu/x86/vm/templateTable_x86_64.cpp Changeset: 29adffcb6a61 Author: tonyp Date: 2009-10-30 13:31 -0400 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/29adffcb6a61 Merge Changeset: a6280c71758e Author: trims Date: 2009-11-05 15:44 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/a6280c71758e Merge Changeset: 50c16f09ddf5 Author: trims Date: 2009-11-05 15:58 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/50c16f09ddf5 6898707: Bump the HS17 build number to 05 Summary: Update the HS17 build number to 05 Reviewed-by: jcoomes ! make/hotspot_version Changeset: 26f1542097f1 Author: ysr Date: 2009-11-03 16:43 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/26f1542097f1 6801625: CDS: HeapDump tests crash with internal error in compactingPermGenGen.cpp Summary: Allow iteration over the shared spaces when using CDS, repealing previous proscription. Deferred further required CDS-related cleanups of perm gen to CR 6897789. Reviewed-by: phh, jmasa ! src/share/vm/memory/compactingPermGenGen.cpp ! src/share/vm/memory/compactingPermGenGen.hpp ! src/share/vm/memory/generation.cpp Changeset: 9174bb32e934 Author: trims Date: 2009-11-06 00:41 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/9174bb32e934 Merge Changeset: 455105fc81d9 Author: katleman Date: 2009-11-12 15:35 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/455105fc81d9 Added tag jdk7-b76 for changeset 9174bb32e934 ! .hgtags Changeset: 7589c1b72907 Author: mikejwre Date: 2009-12-03 12:52 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/7589c1b72907 Added tag jdk7-b77 for changeset 455105fc81d9 ! .hgtags Changeset: e703499b4b51 Author: ohair Date: 2009-12-16 12:51 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/e703499b4b51 6909462: Fix nbproject/private references in .hgignore Summary: See bugzilla issue 100097 Reviewed-by: tbell Contributed-by: Jesse Glick ! .hgignore Changeset: 1cf572922ff1 Author: mikejwre Date: 2009-12-17 14:10 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/1cf572922ff1 Added tag jdk7-b78 for changeset e703499b4b51 ! .hgtags Changeset: f334aec453a1 Author: kvn Date: 2009-10-29 16:57 -0700 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/f334aec453a1 6896084: VM does not reserve protected page below heap for compressed oops implicit null checks Summary: Set narrow_oop_base and narrow_oop_use_implicit_null_checks in Universe::preferred_heap_base(). Reviewed-by: twisti, jcoomes ! src/share/vm/memory/universe.cpp Changeset: 73a726751507 Author: cfang Date: 2009-10-30 10:12 -0700 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/73a726751507 6852078: HSX 14/16 in jdk 5.0: api/javax_management api/org_omg jck tests crashes or make tnameserv crash Summary: Disable SuperWord optimization for unsafe read/write Reviewed-by: kvn, phh ! src/share/vm/opto/superword.cpp + test/compiler/6852078/Test6852078.java Changeset: 389049f3f393 Author: jrose Date: 2009-10-30 16:22 -0700 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/389049f3f393 6858164: invokedynamic code needs some cleanup (post-6655638) Summary: Fix several crashers, remove needless paths for boxed-style bootstrap method call, refactor & simplify APIs for rewriter constantPoolOop, remove sun.dyn.CallSiteImpl Reviewed-by: kvn ! src/cpu/sparc/vm/templateInterpreter_sparc.cpp ! src/cpu/x86/vm/templateInterpreter_x86_32.cpp ! src/cpu/x86/vm/templateInterpreter_x86_64.cpp ! src/cpu/x86/vm/templateTable_x86_32.cpp ! src/share/vm/ci/ciEnv.cpp ! src/share/vm/classfile/javaClasses.cpp ! src/share/vm/classfile/javaClasses.hpp ! src/share/vm/classfile/systemDictionary.cpp ! src/share/vm/classfile/systemDictionary.hpp ! src/share/vm/classfile/verifier.cpp ! src/share/vm/classfile/vmSymbols.hpp ! src/share/vm/includeDB_core ! src/share/vm/interpreter/bytecodeTracer.cpp ! src/share/vm/interpreter/interpreter.cpp ! src/share/vm/interpreter/interpreterRuntime.cpp ! src/share/vm/interpreter/interpreterRuntime.hpp ! src/share/vm/interpreter/linkResolver.cpp ! src/share/vm/interpreter/rewriter.cpp ! src/share/vm/interpreter/rewriter.hpp ! src/share/vm/interpreter/templateInterpreter.cpp ! src/share/vm/interpreter/templateInterpreter.hpp ! src/share/vm/interpreter/templateInterpreterGenerator.hpp ! src/share/vm/oops/constantPoolOop.cpp ! src/share/vm/oops/constantPoolOop.hpp ! src/share/vm/oops/cpCacheOop.cpp ! src/share/vm/oops/cpCacheOop.hpp ! src/share/vm/oops/generateOopMap.cpp ! src/share/vm/oops/instanceKlassKlass.cpp ! src/share/vm/prims/jvm.cpp ! src/share/vm/prims/methodHandles.cpp Changeset: 323bd24c6520 Author: roland Date: 2009-11-02 11:17 +0100 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/323bd24c6520 6769124: various 64-bit fixes for c1 Reviewed-by: never ! src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp ! src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp ! src/cpu/x86/vm/assembler_x86.cpp ! src/cpu/x86/vm/assembler_x86.hpp ! src/cpu/x86/vm/c1_LIRAssembler_x86.cpp ! src/cpu/x86/vm/c1_LIRGenerator_x86.cpp ! src/cpu/x86/vm/vm_version_x86.cpp ! src/share/vm/c1/c1_GraphBuilder.cpp ! src/share/vm/c1/c1_LIRGenerator.cpp ! src/share/vm/c1/c1_LinearScan.cpp ! src/share/vm/runtime/arguments.cpp + test/compiler/6769124/TestArrayCopy6769124.java + test/compiler/6769124/TestDeoptInt6769124.java + test/compiler/6769124/TestUnalignedLoad6769124.java Changeset: 09572fede9d1 Author: kvn Date: 2009-11-04 14:16 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/09572fede9d1 6896370: CTW fails share/vm/opto/matcher.cpp:1475 "duplicating node that's already been matched" Summary: Move DecodeN code outside the memory nodes only code. Reviewed-by: never ! src/share/vm/opto/matcher.cpp Changeset: dcdcc8c16e20 Author: kvn Date: 2009-11-04 14:43 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/dcdcc8c16e20 6896352: CTW fails hotspot/src/share/vm/opto/escape.cpp:1155 Summary: Always call C->get_alias_index(phase->type(address)) during parsing. Reviewed-by: never ! src/share/vm/opto/escape.cpp ! src/share/vm/opto/memnode.cpp Changeset: 2f1ec89b9995 Author: cfang Date: 2009-11-10 17:00 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/2f1ec89b9995 Merge ! src/cpu/x86/vm/assembler_x86.cpp ! src/cpu/x86/vm/assembler_x86.hpp Changeset: 473cce303f13 Author: phh Date: 2009-10-28 16:25 -0400 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/473cce303f13 6887571: Increase default heap config sizes Summary: Apply modification of existing server heap size ergo to all collectors except CMS. Reviewed-by: jmasa, ysr, xlu ! src/cpu/sparc/vm/c1_globals_sparc.hpp ! src/cpu/sparc/vm/c2_globals_sparc.hpp ! src/cpu/sparc/vm/globals_sparc.hpp ! src/cpu/x86/vm/c1_globals_x86.hpp ! src/cpu/x86/vm/c2_globals_x86.hpp ! src/cpu/x86/vm/globals_x86.hpp ! src/cpu/zero/vm/globals_zero.hpp ! src/os_cpu/linux_x86/vm/globals_linux_x86.hpp ! src/os_cpu/solaris_x86/vm/globals_solaris_x86.hpp ! src/os_cpu/windows_x86/vm/globals_windows_x86.hpp ! src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.cpp ! src/share/vm/memory/collectorPolicy.cpp ! src/share/vm/runtime/arguments.cpp ! src/share/vm/runtime/arguments.hpp ! src/share/vm/runtime/globals.cpp ! src/share/vm/runtime/globals.hpp ! src/share/vm/runtime/globals_extension.hpp ! src/share/vm/services/management.cpp Changeset: c4ecde2f6b3c Author: xlu Date: 2009-10-30 17:24 -0700 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/c4ecde2f6b3c Merge Changeset: 97b36138b494 Author: kamg Date: 2009-11-06 15:04 -0500 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/97b36138b494 Merge Changeset: ba7ea42fc66e Author: phh Date: 2009-11-04 16:49 -0500 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/ba7ea42fc66e 6898160: Need serviceability support for new vm argument type 'uint64_t' Summary: Add serviceability support for uint64_t. Flags of unknown type assert in debug builds and are ignored in product builds. Reviewed-by: never, xlu, mchung, dcubed ! src/share/vm/runtime/globals.cpp ! src/share/vm/services/attachListener.cpp ! src/share/vm/services/management.cpp Changeset: db0d21039f34 Author: kamg Date: 2009-11-06 16:05 -0500 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/db0d21039f34 Merge Changeset: fb4c00faa9da Author: kamg Date: 2009-11-11 09:13 -0500 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/fb4c00faa9da Merge ! src/share/vm/runtime/arguments.cpp Changeset: 87b2fdd4bf98 Author: never Date: 2009-11-11 23:39 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/87b2fdd4bf98 6892079: live value must not be garbage failure after fix for 6854812 Reviewed-by: kvn ! src/share/vm/opto/parse1.cpp Changeset: b18963243361 Author: twisti Date: 2009-11-19 03:41 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/b18963243361 6902000: use ShouldNotReachHere() for btos/ctos/stos in TemplateInterpreterGenerator::set_short_entry_points Summary: set_entry_point is only ever used with the tos states of bytecode templates in templateTable.cpp and none of those use the subword tos states like btos, ctos and stos. Reviewed-by: kvn ! src/share/vm/interpreter/templateInterpreter.cpp Changeset: 7ef1d2e14917 Author: kvn Date: 2009-11-19 14:32 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/7ef1d2e14917 6902036: WorldWind asserts on escape.cpp:1153: assert(addr->is_AddP(),"AddP required") Summary: Remove the assert. Reviewed-by: twisti ! src/share/vm/opto/escape.cpp Changeset: de44705e6b33 Author: cfang Date: 2009-11-24 11:49 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/de44705e6b33 Merge Changeset: 84cb6f20afb3 Author: phh Date: 2009-11-20 16:22 -0500 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/84cb6f20afb3 6900899: vm fails to start when -Xmx value is less than OldSize + NewSize Summary: Set minimum heap size to min(OldSize + NewSize, MaxHeapSize) in Arguments::set_heap_size(). Reviewed-by: kvn, ysr, tonyp ! src/share/vm/runtime/arguments.cpp Changeset: a75edfd400ea Author: acorn Date: 2009-11-11 15:49 -0500 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/a75edfd400ea 6893504: LinkageError for bootstrap duplicate class definitions. Reviewed-by: kamg, xlu ! src/share/vm/classfile/systemDictionary.cpp ! src/share/vm/classfile/systemDictionary.hpp Changeset: 1920bd911283 Author: acorn Date: 2009-11-23 16:24 -0500 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/1920bd911283 Merge ! src/share/vm/classfile/systemDictionary.cpp ! src/share/vm/classfile/systemDictionary.hpp Changeset: e1fb452ad949 Author: kamg Date: 2009-11-25 09:03 -0500 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/e1fb452ad949 Merge Changeset: 8e7adf982378 Author: twisti Date: 2009-11-27 07:56 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/8e7adf982378 6896043: first round of zero fixes Reviewed-by: kvn Contributed-by: Gary Benson ! src/cpu/zero/vm/cppInterpreter_zero.cpp ! src/cpu/zero/vm/frame_zero.cpp ! src/cpu/zero/vm/frame_zero.hpp ! src/cpu/zero/vm/globals_zero.hpp ! src/cpu/zero/vm/sharedRuntime_zero.cpp ! src/cpu/zero/vm/sharkFrame_zero.hpp ! src/share/vm/interpreter/bytecodeInterpreter.cpp ! src/share/vm/prims/jni.cpp ! src/share/vm/prims/jvmtiManageCapabilities.cpp ! src/share/vm/runtime/os.hpp Changeset: 6400f475effe Author: iveresov Date: 2009-12-01 14:49 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/6400f475effe Merge Changeset: 7c57aead6d3e Author: never Date: 2009-11-12 09:24 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/7c57aead6d3e 6892658: C2 should optimize some stringbuilder patterns Reviewed-by: kvn, twisti ! src/share/vm/ci/ciEnv.cpp ! src/share/vm/ci/ciEnv.hpp ! src/share/vm/ci/ciInstanceKlass.cpp ! src/share/vm/ci/ciInstanceKlass.hpp ! src/share/vm/ci/ciObjectFactory.cpp ! src/share/vm/classfile/systemDictionary.hpp ! src/share/vm/classfile/vmSymbols.cpp ! src/share/vm/classfile/vmSymbols.hpp ! src/share/vm/includeDB_compiler2 ! src/share/vm/includeDB_core ! src/share/vm/memory/universe.cpp ! src/share/vm/memory/universe.hpp ! src/share/vm/opto/c2_globals.cpp ! src/share/vm/opto/c2_globals.hpp ! src/share/vm/opto/callGenerator.cpp ! src/share/vm/opto/callGenerator.hpp ! src/share/vm/opto/callnode.cpp ! src/share/vm/opto/callnode.hpp ! src/share/vm/opto/compile.cpp ! src/share/vm/opto/compile.hpp ! src/share/vm/opto/doCall.cpp ! src/share/vm/opto/graphKit.cpp ! src/share/vm/opto/graphKit.hpp ! src/share/vm/opto/macro.cpp ! src/share/vm/opto/memnode.cpp ! src/share/vm/opto/node.hpp ! src/share/vm/opto/parseHelper.cpp ! src/share/vm/opto/phase.hpp ! src/share/vm/opto/phaseX.hpp + src/share/vm/opto/stringopts.cpp + src/share/vm/opto/stringopts.hpp ! src/share/vm/opto/type.hpp ! src/share/vm/runtime/globals.cpp ! src/share/vm/runtime/globals_extension.hpp ! src/share/vm/utilities/growableArray.hpp Changeset: bd12fff78df5 Author: cfang Date: 2009-11-25 12:09 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/bd12fff78df5 6904191: OptimizeStringConcat should be product instead of experimental Summary: Make OptimizeStringConcat a product VM option(contributed by never) Reviewed-by: never ! src/share/vm/opto/c2_globals.hpp Changeset: facbc74580c3 Author: iveresov Date: 2009-12-01 22:11 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/facbc74580c3 Merge ! src/share/vm/classfile/systemDictionary.hpp Changeset: 8b22f86d1740 Author: cfang Date: 2009-12-02 13:29 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/8b22f86d1740 6901572: JVM 1.6.16 crash on loops: assert(has_node(i),"") Summary: Skip the secondary induction variable handling if it is dead Reviewed-by: never, kvn ! src/share/vm/opto/loopnode.cpp + test/compiler/6901572/Test.java Changeset: 5f932a151fd4 Author: johnc Date: 2009-11-06 11:10 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/5f932a151fd4 6895788: G1: SATB and update buffer allocation code allocates too much space Summary: The type in the NEW_C_HEAP_ARRRY and FREE_C_HEAP_ARRAY calls in the buffer allocation code was changed from void* to char as the size argument had already been mulitipled by the byte size of an object pointer. Reviewed-by: ysr, tonyp ! src/share/vm/gc_implementation/g1/ptrQueue.cpp Changeset: 0e2d7ae2bc67 Author: jmasa Date: 2009-11-10 11:32 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/0e2d7ae2bc67 6898857: [Regression] -XX:NewRatio with -XX:+UseConcMarkSweepGC causes fatal error Summary: Use CollectorPolicy information instead of MaxNewSize Reviewed-by: ysr, jcoomes ! src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp Changeset: 89f1b9ae8991 Author: ysr Date: 2009-11-13 11:55 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/89f1b9ae8991 6898948: G1: forensic instrumentation for out-of-bounds recent_avg_pause_time_ratio() Summary: Added instrumentation and (temporary) assert in non-product mode; clipped the value when found out-of-bounds in product mode. Fix of original issue will follow collection of data from this instrumentation. Reviewed-by: jcoomes, tonyp ! src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp ! src/share/vm/utilities/numberSeq.cpp ! src/share/vm/utilities/numberSeq.hpp Changeset: 23b9a8d315fc Author: ysr Date: 2009-11-19 10:19 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/23b9a8d315fc 6902701: G1: protect debugging code related to 6898948 with a debug flag Summary: Protected stats dump with a new develop flag; other than for the dump, reconciled product and non-product behaviour in face of the error. Reviewed-by: tonyp ! src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp ! src/share/vm/gc_implementation/g1/g1_globals.hpp Changeset: 3fc996d4edd2 Author: ysr Date: 2009-11-19 13:43 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/3fc996d4edd2 6902303: G1: ScavengeALot should cause an incremental, rather than a full, collection Summary: ScavengeALot now causes an incremental (but possibly partially young, in the G1 sense) collection. Some such collections may be abandoned on account of MMU specs. Band-aided a native leak associated with abandoned pauses, as well as an MMU tracker overflow related to frequent scavenge events in the face of a large MMU denominator interval; the latter is protected by a product flag that defaults to false. Reviewed-by: tonyp ! src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp ! src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp ! src/share/vm/gc_implementation/g1/g1MMUTracker.cpp ! src/share/vm/gc_implementation/g1/g1MMUTracker.hpp ! src/share/vm/gc_implementation/g1/g1_globals.hpp ! src/share/vm/gc_implementation/g1/vm_operations_g1.cpp ! src/share/vm/gc_implementation/g1/vm_operations_g1.hpp ! src/share/vm/memory/sharedHeap.hpp Changeset: db0d5eba9d20 Author: tonyp Date: 2009-11-20 14:47 -0500 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/db0d5eba9d20 6815790: G1: Missing MemoryPoolMXBeans with -XX:+UseG1GC Summary: It introduces the necessary memory pools for G1. Reviewed-by: mchung, ysr ! src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp ! src/share/vm/gc_implementation/includeDB_gc_g1 + src/share/vm/services/g1MemoryPool.cpp + src/share/vm/services/g1MemoryPool.hpp ! src/share/vm/services/memoryManager.cpp ! src/share/vm/services/memoryManager.hpp ! src/share/vm/services/memoryService.cpp ! src/share/vm/services/memoryService.hpp Changeset: fa357420e7d2 Author: johnc Date: 2009-11-24 15:19 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/fa357420e7d2 6899058: G1: Internal error in ptrQueue.cpp:201 in nightly tests Summary: Fixes a race on the dirty card queue completed buffer list between worker thread(s) performing a flush of a deferred store barrier (enqueueing a newly completed buffer) and worker thread(s) in the RSet updating code claiming completed buffers. Removed the routine that removes elements from the completed update buffer queue using a CAS. Reviewed-by: ysr, tonyp ! src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp ! src/share/vm/gc_implementation/g1/dirtyCardQueue.hpp Changeset: 6aa7255741f3 Author: ysr Date: 2009-12-03 15:01 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/6aa7255741f3 6906727: UseCompressedOops: some card-marking fixes related to object arrays Summary: Introduced a new write_ref_array(HeapWords* start, size_t count) method that does the requisite MemRegion range calculation so (some of the) clients of the erstwhile write_ref_array(MemRegion mr) do not need to worry. This removed all external uses of array_size(), which was also simplified and made private. Asserts were added to catch other possible issues. Further, less essential, fixes stemming from this investigation are deferred to CR 6904516 (to follow shortly in hs17). Reviewed-by: kvn, coleenp, jmasa ! src/share/vm/classfile/javaClasses.cpp ! src/share/vm/includeDB_core ! src/share/vm/memory/barrierSet.cpp ! src/share/vm/memory/barrierSet.hpp ! src/share/vm/memory/barrierSet.inline.hpp ! src/share/vm/memory/cardTableModRefBS.cpp ! src/share/vm/oops/objArrayKlass.cpp ! src/share/vm/oops/objArrayOop.hpp Changeset: ed52bcc32739 Author: tonyp Date: 2009-12-04 07:44 -0500 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/ed52bcc32739 6880903: G1: G1 reports incorrect Runtime.maxMemory() Summary: G1 reports committed memory instead of reserved memory from the Runtime.maxMemory() method Reviewed-by: ysr, jmasa ! src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp ! src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp ! src/share/vm/services/g1MemoryPool.cpp ! src/share/vm/services/g1MemoryPool.hpp Changeset: afc30fccf324 Author: tonyp Date: 2009-12-04 07:44 -0500 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/afc30fccf324 6906565: G1: deal with compilation warning in g1MemoryPool.hpp Summary: size_t max_size() hides size_t max_size() const. Reviewed-by: jmasa, ysr ! src/share/vm/services/g1MemoryPool.cpp ! src/share/vm/services/g1MemoryPool.hpp Changeset: 9118860519b6 Author: tonyp Date: 2009-12-07 14:22 -0500 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/9118860519b6 6904967: G1: some CollectionUsageThreshold tests fail Summary: ensure that max and committed are non-zero (currently: at least as large as the region size). Reviewed-by: iveresov, mchung ! src/share/vm/services/g1MemoryPool.cpp Changeset: 7bfd295ec074 Author: ysr Date: 2009-12-08 15:12 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/7bfd295ec074 6908208: UseCompressedOops: array_size() returns incorrect size for MAX_INT object array following 6906727 Summary: In array_size() cast to an unsigned to avoid overflow of intermediate value. Reviewed-by: kvn, tonyp, jmasa, jcoomes, coleenp ! src/share/vm/oops/objArrayOop.hpp Changeset: 84a2da7f454c Author: jmasa Date: 2009-12-11 08:39 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/84a2da7f454c Merge ! src/share/vm/classfile/javaClasses.cpp ! src/share/vm/includeDB_core Changeset: 74e00f62c726 Author: trims Date: 2009-12-11 16:38 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/74e00f62c726 Merge Changeset: 61b46f7853d4 Author: trims Date: 2009-12-22 16:32 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/61b46f7853d4 Merge Changeset: c5d3d979ae27 Author: never Date: 2009-12-08 16:27 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/c5d3d979ae27 6908167: jbb2005, OptimizeStringConcat causes assert in EA Reviewed-by: kvn ! src/share/vm/opto/graphKit.cpp Changeset: f96a1a986f7b Author: kvn Date: 2009-12-09 16:40 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/f96a1a986f7b 6895383: JCK test throws NPE for method compiled with Escape Analysis Summary: Add missing checks for MemBar nodes in EA. Reviewed-by: never ! src/share/vm/opto/compile.cpp ! src/share/vm/opto/escape.cpp ! src/share/vm/opto/escape.hpp ! src/share/vm/opto/lcm.cpp ! src/share/vm/opto/macro.cpp ! src/share/vm/opto/memnode.cpp ! src/share/vm/opto/memnode.hpp ! src/share/vm/opto/node.hpp ! src/share/vm/opto/parse3.cpp + test/compiler/6895383/Test.java Changeset: 7fee0a6cc6d4 Author: kvn Date: 2009-12-09 19:50 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/7fee0a6cc6d4 6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys Summary: Move instance store's memory users to corresponding memory slices when updating its memory edge. Reviewed-by: never ! src/share/vm/opto/escape.cpp ! src/share/vm/opto/escape.hpp + test/compiler/6896727/Test.java Changeset: 6dc5471e0f66 Author: iveresov Date: 2009-12-15 17:19 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/6dc5471e0f66 Merge Changeset: 9dc2adf2cbe0 Author: johnc Date: 2009-12-09 23:51 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/9dc2adf2cbe0 6908215: G1: SEGV with G1PolicyVerbose=2 debug flag Summary: Change CollectionSetChooser::printSortedHeapRegions to handle null entries in _markedRegions growable array. Reviewed-by: jmasa, tonyp, iveresov ! src/share/vm/gc_implementation/g1/collectionSetChooser.cpp Changeset: 27f9477e879b Author: jmasa Date: 2009-12-11 09:30 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/27f9477e879b Merge Changeset: cf9a9a50e763 Author: jmasa Date: 2009-12-17 07:02 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/cf9a9a50e763 Merge Changeset: 22e4972db0a6 Author: trims Date: 2009-12-22 16:33 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/22e4972db0a6 Merge Changeset: 920875ae1277 Author: trims Date: 2009-12-22 16:35 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/920875ae1277 6912782: Bump the HS17 build number to 06 Summary: Update the HS17 build number to 06 Reviewed-by: jcoomes ! make/hotspot_version Changeset: 85f13cdfbc1d Author: twisti Date: 2009-12-16 12:48 +0100 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/85f13cdfbc1d 6829192: JSR 292 needs to support 64-bit x86 Summary: changes for method handles and invokedynamic Reviewed-by: kvn ! src/cpu/x86/vm/assembler_x86.cpp ! src/cpu/x86/vm/interp_masm_x86_32.cpp ! src/cpu/x86/vm/interp_masm_x86_64.cpp ! src/cpu/x86/vm/interp_masm_x86_64.hpp ! src/cpu/x86/vm/interpreter_x86_64.cpp ! src/cpu/x86/vm/methodHandles_x86.cpp ! src/cpu/x86/vm/stubGenerator_x86_64.cpp ! src/cpu/x86/vm/templateInterpreter_x86_64.cpp ! src/cpu/x86/vm/templateTable_x86_32.cpp ! src/cpu/x86/vm/templateTable_x86_64.cpp ! src/cpu/x86/vm/templateTable_x86_64.hpp ! src/share/vm/classfile/classFileParser.cpp Changeset: 032260830071 Author: never Date: 2009-12-16 22:15 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/032260830071 5057818: codecache full and compiler disabled in bigapps fastdebug run Reviewed-by: kvn ! src/share/vm/code/nmethod.cpp ! src/share/vm/code/nmethod.hpp Changeset: 1ea456c6f2b7 Author: iveresov Date: 2009-12-22 17:56 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/1ea456c6f2b7 Merge Changeset: 44f61c24ddab Author: iveresov Date: 2009-12-16 15:12 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/44f61c24ddab 6862387: tune concurrent refinement further Summary: Reworked the concurrent refinement: threads activation, feedback-based threshold adjustment, other miscellaneous fixes. Reviewed-by: apetrusenko, tonyp ! src/share/vm/gc_implementation/g1/concurrentG1Refine.cpp ! src/share/vm/gc_implementation/g1/concurrentG1Refine.hpp ! src/share/vm/gc_implementation/g1/concurrentG1RefineThread.cpp ! src/share/vm/gc_implementation/g1/concurrentG1RefineThread.hpp ! src/share/vm/gc_implementation/g1/concurrentMark.cpp ! src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp ! src/share/vm/gc_implementation/g1/dirtyCardQueue.hpp ! src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp ! src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp ! src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp ! src/share/vm/gc_implementation/g1/g1_globals.hpp ! src/share/vm/gc_implementation/g1/ptrQueue.cpp ! src/share/vm/gc_implementation/g1/ptrQueue.hpp ! src/share/vm/gc_implementation/g1/satbQueue.cpp ! src/share/vm/gc_implementation/g1/satbQueue.hpp ! src/share/vm/gc_implementation/includeDB_gc_g1 Changeset: cc0ca4f00e89 Author: jmasa Date: 2009-12-22 22:35 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/cc0ca4f00e89 Merge Changeset: 7ac7d558e895 Author: jmasa Date: 2009-12-23 00:47 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/7ac7d558e895 Merge Changeset: 9749fbc4859b Author: trims Date: 2009-12-23 02:57 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/9749fbc4859b Merge Changeset: 4b966d9946a3 Author: mchung Date: 2009-11-25 08:37 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/4b966d9946a3 6888880: JKernel VM to inject the sun.jkernel.DownloadManager as a boot classloader hook Summary: Call sun.jkernel.DownloadManager.setBootClassLoaderHook during the kernel VM initialization Reviewed-by: alanb, coleenp, acorn ! src/share/vm/classfile/vmSymbols.hpp ! src/share/vm/runtime/thread.cpp Changeset: 0018cf203583 Author: coleenp Date: 2009-12-02 07:59 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/0018cf203583 Merge Changeset: 95e9083cf4a7 Author: dholmes Date: 2009-12-01 22:29 -0500 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/95e9083cf4a7 6822370: ReentrantReadWriteLock: threads hung when there are no threads holding onto the lock (Netra x4450) Summary: This day one bug is caused by missing memory barriers in various Parker::park() paths that can result in lost wakeups and hangs. Reviewed-by: dice, acorn ! src/os/linux/vm/os_linux.cpp ! src/os/solaris/vm/os_solaris.cpp Changeset: 3115100553b5 Author: dholmes Date: 2009-12-02 20:32 -0500 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/3115100553b5 Merge Changeset: 547f81740344 Author: minqi Date: 2009-12-11 11:09 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/547f81740344 6361589: Print out stack trace for target thread of GC crash Summary: If GC crashed with java thread involved, print out the java stack trace in error report Reviewed-by: never, ysr, coleenp, dholmes ! src/share/vm/runtime/frame.cpp ! src/share/vm/runtime/globals.hpp ! src/share/vm/runtime/thread.cpp ! src/share/vm/runtime/thread.hpp ! src/share/vm/runtime/vmStructs.cpp ! src/share/vm/runtime/vmThread.cpp ! src/share/vm/runtime/vmThread.hpp ! src/share/vm/utilities/vmError.cpp Changeset: 9127aa69352e Author: dcubed Date: 2009-12-14 09:51 -0700 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/9127aa69352e 6648438: 4/4 src/share/vm/prims/jvmtiEnv.cpp:457 assert(phase == JVMTI_PHASE_LIVE,"sanity check") Summary: Return error on invalid JVMTI_PHASE instead of asserting. Reviewed-by: dholmes, ohair ! src/share/vm/prims/jvmtiEnv.cpp Changeset: 98cd9901c161 Author: dcubed Date: 2009-12-14 10:05 -0700 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/98cd9901c161 6849968: 3/2 JVMTI tests fails on jdk5.0 with hs14 Summary: If a JVMTI agent asks for version 1.0, then it should get version 1.0 semantics. Reviewed-by: dholmes, ohair ! src/share/vm/prims/jvmtiEnv.cpp ! src/share/vm/prims/jvmtiEnvBase.cpp ! src/share/vm/prims/jvmtiEnvBase.hpp ! src/share/vm/prims/jvmtiExport.cpp ! src/share/vm/prims/jvmtiExport.hpp ! src/share/vm/prims/jvmtiHpp.xsl Changeset: dcb15a6f342d Author: dcubed Date: 2009-12-14 13:26 -0700 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/dcb15a6f342d Merge ! src/share/vm/prims/jvmtiEnv.cpp ! src/share/vm/prims/jvmtiEnvBase.cpp ! src/share/vm/prims/jvmtiEnvBase.hpp ! src/share/vm/prims/jvmtiExport.cpp Changeset: 167c2986d91b Author: phh Date: 2009-12-16 12:54 -0500 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/167c2986d91b 6843629: Make current hotspot build part of jdk5 control build Summary: Source changes for older compilers plus makefile changes. Reviewed-by: xlu ! make/linux/makefiles/debug.make ! make/linux/makefiles/fastdebug.make ! make/linux/makefiles/jsig.make ! make/linux/makefiles/jvmg.make ! make/linux/makefiles/launcher.make ! make/linux/makefiles/saproc.make ! make/linux/makefiles/vm.make ! make/solaris/makefiles/debug.make ! make/solaris/makefiles/dtrace.make ! make/solaris/makefiles/fastdebug.make ! make/solaris/makefiles/jsig.make ! make/solaris/makefiles/jvmg.make ! make/solaris/makefiles/launcher.make ! make/solaris/makefiles/saproc.make ! make/solaris/makefiles/sparcWorks.make ! make/solaris/makefiles/vm.make ! src/os/linux/vm/os_linux.cpp ! src/os/solaris/dtrace/libjvm_db.c ! src/os/solaris/vm/os_solaris.cpp ! src/os/windows/vm/os_windows.cpp ! src/share/vm/ci/bcEscapeAnalyzer.hpp ! src/share/vm/code/dependencies.cpp ! src/share/vm/code/dependencies.hpp ! src/share/vm/memory/heap.cpp ! src/share/vm/memory/referenceProcessor.cpp ! src/share/vm/oops/instanceRefKlass.cpp ! src/share/vm/oops/oop.hpp ! src/share/vm/runtime/os.hpp Changeset: 2e8bdfdd3ba2 Author: xlu Date: 2009-12-16 13:16 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/2e8bdfdd3ba2 6899467: System property java.class.version out-of-sync with VM for jdk 5.0 with HS 16 in nightly build Reviewed-by: kvn, never, dholmes, ysr ! src/share/vm/classfile/classFileParser.cpp Changeset: d48983315b71 Author: xlu Date: 2009-12-16 13:19 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/d48983315b71 Merge Changeset: 933a3e806ce6 Author: xlu Date: 2009-12-16 14:27 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/933a3e806ce6 6895168: JCK api/signaturetest/sigtest.basic.html#basic test fails for jdk 5.0 with HS 16 in nightly build Reviewed-by: dholmes, acorn, jrose ! src/share/vm/oops/instanceKlass.cpp ! src/share/vm/oops/instanceKlass.hpp ! src/share/vm/prims/jvm.cpp Changeset: ba60f0a5d714 Author: xlu Date: 2009-12-16 15:44 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/ba60f0a5d714 Merge Changeset: 6952ed8677bf Author: xlu Date: 2009-12-17 01:19 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/6952ed8677bf Merge Changeset: a5a6adfca6ec Author: trims Date: 2009-12-23 03:12 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/a5a6adfca6ec Merge ! src/share/vm/classfile/classFileParser.cpp ! src/share/vm/classfile/vmSymbols.hpp Changeset: 1bc68593a110 Author: katleman Date: 2010-01-14 15:48 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/1bc68593a110 Added tag jdk7-b79 for changeset a5a6adfca6ec ! .hgtags Changeset: 40e7c1d24e4a Author: twisti Date: 2010-01-04 00:22 -0800 URL: http://hg.openjdk.java.net/nio/nio/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/nio/nio/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/nio/nio/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/nio/nio/hotspot/rev/0910903272e5 Merge Changeset: e66fd840cb6b Author: twisti Date: 2010-01-04 18:38 +0100 URL: http://hg.openjdk.java.net/nio/nio/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/nio/nio/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/nio/nio/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.net/nio/nio/hotspot/rev/dd57230ba8fe 6893268: additional dynamic language related optimizations in C2 Summary: C2 needs some additional optimizations to be able to handle MethodHandle invokes and invokedynamic instructions at the best performance. Reviewed-by: kvn, never ! src/share/vm/ci/ciCPCache.cpp + src/share/vm/ci/ciCallSite.cpp + src/share/vm/ci/ciCallSite.hpp ! src/share/vm/ci/ciClassList.hpp ! src/share/vm/ci/ciEnv.cpp ! src/share/vm/ci/ciEnv.hpp ! src/share/vm/ci/ciExceptionHandler.cpp ! src/share/vm/ci/ciField.cpp ! src/share/vm/ci/ciField.hpp ! src/share/vm/ci/ciInstanceKlass.cpp ! src/share/vm/ci/ciInstanceKlass.hpp ! src/share/vm/ci/ciKlass.cpp ! src/share/vm/ci/ciKlass.hpp ! src/share/vm/ci/ciMethod.hpp + src/share/vm/ci/ciMethodHandle.cpp + src/share/vm/ci/ciMethodHandle.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/ciSymbol.cpp ! src/share/vm/ci/ciSymbol.hpp ! src/share/vm/classfile/classFileParser.cpp ! src/share/vm/classfile/vmSymbols.cpp ! src/share/vm/classfile/vmSymbols.hpp ! src/share/vm/code/nmethod.cpp ! src/share/vm/includeDB_compiler2 ! src/share/vm/includeDB_core ! src/share/vm/interpreter/bytecode.hpp ! src/share/vm/interpreter/bytecodeTracer.cpp ! src/share/vm/interpreter/interpreterRuntime.cpp ! src/share/vm/interpreter/rewriter.cpp ! src/share/vm/interpreter/rewriter.hpp ! src/share/vm/oops/constMethodOop.hpp ! src/share/vm/oops/constantPoolOop.hpp ! src/share/vm/oops/generateOopMap.cpp ! src/share/vm/oops/methodOop.hpp ! src/share/vm/oops/symbolOop.cpp ! src/share/vm/oops/symbolOop.hpp ! src/share/vm/opto/bytecodeInfo.cpp ! src/share/vm/opto/callGenerator.cpp ! src/share/vm/opto/callGenerator.hpp ! src/share/vm/opto/doCall.cpp ! src/share/vm/opto/parse3.cpp ! src/share/vm/prims/methodHandleWalk.cpp ! src/share/vm/prims/methodHandleWalk.hpp ! src/share/vm/prims/methodHandles.cpp ! src/share/vm/runtime/frame.cpp ! src/share/vm/runtime/frame.hpp ! src/share/vm/runtime/sharedRuntime.cpp ! src/share/vm/runtime/sharedRuntime.hpp ! src/share/vm/utilities/constantTag.hpp Changeset: b6f06e395428 Author: never Date: 2010-01-05 11:14 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/b6f06e395428 6908267: Zero fails to unlock synchronized native methods on exception Reviewed-by: never Contributed-by: Gary Benson ! src/cpu/zero/vm/cppInterpreter_zero.cpp Changeset: 1f6d42899c3a Author: never Date: 2010-01-05 11:16 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/1f6d42899c3a Merge Changeset: b1f619d38249 Author: never Date: 2010-01-05 16:12 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/b1f619d38249 6914002: unsigned compare problem after 5057818 Reviewed-by: kvn, twisti ! src/share/vm/code/nmethod.cpp ! src/share/vm/code/nmethod.hpp Changeset: 4ce7240d622c Author: never Date: 2010-01-06 14:22 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/4ce7240d622c 6914300: ciEnv should export all well known classes Reviewed-by: kvn, twisti ! agent/src/share/classes/sun/jvm/hotspot/memory/SystemDictionary.java ! src/share/vm/c1/c1_Runtime1.cpp ! src/share/vm/ci/ciEnv.cpp ! src/share/vm/ci/ciEnv.hpp ! src/share/vm/ci/ciField.cpp ! src/share/vm/ci/ciInstance.cpp ! src/share/vm/ci/ciInstanceKlass.cpp ! src/share/vm/ci/ciObjectFactory.cpp ! src/share/vm/ci/ciType.cpp ! src/share/vm/ci/ciUtilities.hpp ! src/share/vm/classfile/classFileParser.cpp ! src/share/vm/classfile/classLoader.cpp ! src/share/vm/classfile/javaAssertions.cpp ! src/share/vm/classfile/javaClasses.cpp ! src/share/vm/classfile/javaClasses.hpp ! src/share/vm/classfile/systemDictionary.cpp ! src/share/vm/classfile/systemDictionary.hpp ! src/share/vm/classfile/verifier.cpp ! src/share/vm/gc_interface/collectedHeap.cpp ! src/share/vm/interpreter/interpreterRuntime.cpp ! src/share/vm/interpreter/linkResolver.cpp ! src/share/vm/memory/classify.cpp ! src/share/vm/memory/dump.cpp ! src/share/vm/memory/referenceProcessor.cpp ! src/share/vm/memory/space.cpp ! src/share/vm/memory/universe.cpp ! src/share/vm/oops/arrayKlass.cpp ! src/share/vm/oops/arrayKlass.hpp ! src/share/vm/oops/constantPoolOop.cpp ! src/share/vm/oops/instanceKlass.cpp ! src/share/vm/oops/instanceRefKlass.cpp ! src/share/vm/oops/klass.cpp ! src/share/vm/oops/methodOop.cpp ! src/share/vm/oops/objArrayKlass.cpp ! src/share/vm/oops/objArrayKlassKlass.cpp ! src/share/vm/opto/runtime.cpp ! src/share/vm/prims/jni.cpp ! src/share/vm/prims/jniCheck.cpp ! src/share/vm/prims/jvm.cpp ! src/share/vm/prims/jvmtiEnter.xsl ! src/share/vm/prims/jvmtiEnv.cpp ! src/share/vm/prims/jvmtiEnvBase.cpp ! src/share/vm/prims/jvmtiExport.cpp ! src/share/vm/prims/jvmtiRedefineClasses.cpp ! src/share/vm/prims/jvmtiTagMap.cpp ! src/share/vm/prims/methodHandleWalk.cpp ! src/share/vm/prims/methodHandles.cpp ! src/share/vm/prims/nativeLookup.cpp ! src/share/vm/runtime/jniHandles.cpp ! src/share/vm/runtime/os.cpp ! src/share/vm/runtime/reflection.cpp ! src/share/vm/runtime/reflectionUtils.cpp ! src/share/vm/runtime/sharedRuntime.cpp ! src/share/vm/runtime/statSampler.cpp ! src/share/vm/runtime/thread.cpp ! src/share/vm/runtime/vframe.cpp ! src/share/vm/runtime/vmStructs.cpp ! src/share/vm/services/attachListener.cpp ! src/share/vm/services/heapDumper.cpp ! src/share/vm/services/lowMemoryDetector.cpp ! src/share/vm/services/management.cpp ! src/share/vm/services/serviceUtil.hpp ! src/share/vm/services/threadService.cpp ! src/share/vm/utilities/exceptions.cpp Changeset: aad340e07bc4 Author: never Date: 2010-01-06 14:25 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/aad340e07bc4 Merge Changeset: 9b9c1ee9b3f6 Author: iveresov Date: 2010-01-06 22:21 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/9b9c1ee9b3f6 Merge ! src/share/vm/classfile/classFileParser.cpp ! src/share/vm/classfile/vmSymbols.hpp ! src/share/vm/memory/referenceProcessor.cpp ! src/share/vm/oops/instanceKlass.cpp ! src/share/vm/oops/instanceRefKlass.cpp ! src/share/vm/prims/jvm.cpp ! src/share/vm/prims/jvmtiEnv.cpp ! src/share/vm/prims/jvmtiEnvBase.cpp ! src/share/vm/prims/jvmtiExport.cpp ! src/share/vm/runtime/frame.cpp ! src/share/vm/runtime/thread.cpp ! src/share/vm/runtime/thread.hpp ! src/share/vm/runtime/vmStructs.cpp Changeset: e018e6884bd8 Author: ysr Date: 2009-12-23 09:23 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/e018e6884bd8 6631166: CMS: better heuristics when combatting fragmentation Summary: Autonomic per-worker free block cache sizing, tunable coalition policies, fixes to per-size block statistics, retuned gain and bandwidth of some feedback loop filters to allow quicker reactivity to abrupt changes in ambient demand, and other heuristics to reduce fragmentation of the CMS old gen. Also tightened some assertions, including those related to locking. Reviewed-by: jmasa ! src/share/vm/gc_implementation/concurrentMarkSweep/binaryTreeDictionary.cpp ! src/share/vm/gc_implementation/concurrentMarkSweep/binaryTreeDictionary.hpp ! src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.cpp ! src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.hpp ! src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp ! src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp ! src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp ! src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp ! src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.hpp ! src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.cpp ! src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.hpp ! src/share/vm/gc_implementation/concurrentMarkSweep/freeList.cpp ! src/share/vm/gc_implementation/concurrentMarkSweep/freeList.hpp ! src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep ! src/share/vm/gc_implementation/includeDB_gc_serial ! src/share/vm/gc_implementation/parNew/parNewGeneration.cpp ! src/share/vm/gc_implementation/parNew/parNewGeneration.hpp ! src/share/vm/gc_implementation/shared/allocationStats.hpp ! src/share/vm/gc_implementation/shared/gcUtil.cpp ! src/share/vm/gc_implementation/shared/gcUtil.hpp ! src/share/vm/includeDB_gc_parallel ! src/share/vm/memory/defNewGeneration.cpp ! src/share/vm/memory/generation.hpp ! src/share/vm/runtime/arguments.cpp ! src/share/vm/runtime/globals.hpp ! src/share/vm/services/classLoadingService.cpp Changeset: 504830073409 Author: jmasa Date: 2010-01-04 07:58 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/504830073409 Merge ! src/share/vm/runtime/globals.hpp Changeset: 75bd253e25dd Author: ysr Date: 2010-01-04 14:51 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/75bd253e25dd 6637203: Classunloading messages go to stdout rather than Xloggc file, causing hangs when stdout is closed Summary: Decoupled TraceClassUnloading from verbose:gc, JVMTI_VERBOSE_GC and PrintGC[Details], making it settable in a manner identical to TraceClassLoading. Reverted an inadvertent change of TraceClassUnloading output in a previous changeset from gclog back to tty. Reviewed-by: coleenp, dholmes, jmasa, poonam ! src/share/vm/prims/jvmtiEnv.cpp ! src/share/vm/runtime/arguments.cpp ! src/share/vm/services/classLoadingService.cpp Changeset: 05b775309e59 Author: jmasa Date: 2010-01-07 08:14 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/05b775309e59 6912018: CMS: guarantee(head() != 0,"The head of the list cannot be NULL") Summary: Block too small to split was not correctly putback to free lists. Reviewed-by: ysr ! src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp Changeset: 0579c695832f Author: ysr Date: 2010-01-09 09:01 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/0579c695832f Merge ! src/share/vm/prims/jvmtiEnv.cpp ! src/share/vm/runtime/arguments.cpp Changeset: f62a22282a47 Author: kvn Date: 2010-01-07 16:24 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/f62a22282a47 6914622: Print values of all flags for product VM Summary: Change the flag -XX:+PrintFlagsFinal to product and add new product flag -XX:+PrintFlagsInitial. Reviewed-by: phh, ysr Contributed-by: gbenson at redhat.com ! src/share/vm/runtime/arguments.cpp ! src/share/vm/runtime/globals.cpp ! src/share/vm/runtime/globals.hpp Changeset: 1271af4ec18c Author: kvn Date: 2010-01-07 16:26 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/1271af4ec18c 6912517: JIT bug compiles out (and stops running) code that needs to be run. Causes NPE. Summary: Add missing check that value is used in memory expression in instructions with embedded load. Reviewed-by: never, jrose ! src/share/vm/opto/lcm.cpp + test/compiler/6912517/Test.java Changeset: cd37471eaecc Author: twisti Date: 2010-01-08 11:09 +0100 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/cd37471eaecc 6914206: change way of permission checking for generated MethodHandle adapters Summary: Put generated MH adapter in InvokeDynamic/MethodHandle classes to be able to indentify them easily in the compiler. Reviewed-by: kvn, never, jrose ! src/share/vm/ci/ciMethod.cpp ! src/share/vm/ci/ciMethod.hpp ! src/share/vm/classfile/systemDictionary.hpp ! src/share/vm/includeDB_core ! src/share/vm/oops/methodOop.cpp ! src/share/vm/oops/methodOop.hpp ! src/share/vm/opto/library_call.cpp ! src/share/vm/prims/methodHandleWalk.cpp ! src/share/vm/prims/methodHandleWalk.hpp ! src/share/vm/runtime/reflection.cpp ! src/share/vm/runtime/vframe.cpp Changeset: bea7a22a6f79 Author: kvn Date: 2010-01-08 09:42 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/bea7a22a6f79 6915110: IfNode::up_one_dom moves beyond RootNode bug in src/share/vm/opto/ifnode.cpp Summary: Check RootNode before check Loop in IfNode::up_one_dom(). Reviewed-by: never Contributed-by: kevin.brown at sun.com ! src/share/vm/opto/ifnode.cpp Changeset: 174ade00803b Author: kvn Date: 2010-01-08 09:51 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/174ade00803b 6910484: incorrect integer optimization (loosing and op-r in a given example) Summary: Remove AND operation only if mask is equal to shift. Reviewed-by: never ! src/share/vm/opto/divnode.cpp + test/compiler/6910484/Test.java Changeset: 4e6abf09f540 Author: jrose Date: 2010-01-08 13:47 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/4e6abf09f540 6912062: disassembler plugin needs to produce symbolic information in product mode Summary: More informative disassembly in product mode. Also, a more consistent CompileCommand syntax. Reviewed-by: never ! src/share/vm/code/codeBlob.hpp ! src/share/vm/code/nmethod.cpp ! src/share/vm/code/nmethod.hpp ! src/share/vm/compiler/compilerOracle.cpp ! src/share/vm/compiler/disassembler.cpp ! src/share/vm/includeDB_core ! src/share/vm/memory/genCollectedHeap.cpp ! src/share/vm/oops/arrayKlassKlass.cpp ! src/share/vm/oops/arrayKlassKlass.hpp ! src/share/vm/oops/compiledICHolderKlass.cpp ! src/share/vm/oops/compiledICHolderKlass.hpp ! src/share/vm/oops/constMethodKlass.cpp ! src/share/vm/oops/constMethodKlass.hpp ! src/share/vm/oops/constantPoolKlass.cpp ! src/share/vm/oops/constantPoolKlass.hpp ! src/share/vm/oops/cpCacheKlass.cpp ! src/share/vm/oops/cpCacheKlass.hpp ! src/share/vm/oops/instanceKlass.cpp ! src/share/vm/oops/instanceKlass.hpp ! src/share/vm/oops/instanceKlassKlass.cpp ! src/share/vm/oops/instanceKlassKlass.hpp ! src/share/vm/oops/klass.cpp ! src/share/vm/oops/klass.hpp ! src/share/vm/oops/klassKlass.cpp ! src/share/vm/oops/klassKlass.hpp ! src/share/vm/oops/methodDataKlass.cpp ! src/share/vm/oops/methodDataKlass.hpp ! src/share/vm/oops/methodKlass.cpp ! src/share/vm/oops/methodKlass.hpp ! src/share/vm/oops/objArrayKlass.cpp ! src/share/vm/oops/objArrayKlass.hpp ! src/share/vm/oops/objArrayKlassKlass.cpp ! src/share/vm/oops/objArrayKlassKlass.hpp ! src/share/vm/oops/oop.cpp ! src/share/vm/oops/symbolKlass.cpp ! src/share/vm/oops/symbolKlass.hpp ! src/share/vm/oops/typeArrayKlassKlass.cpp ! src/share/vm/oops/typeArrayKlassKlass.hpp ! src/share/vm/runtime/arguments.cpp Changeset: 136ac23d6ded Author: jrose Date: 2010-01-08 15:17 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/136ac23d6ded Merge Changeset: c3b315a0d58a Author: jrose Date: 2010-01-08 13:58 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/c3b315a0d58a 6912063: inlining parameters need to be adjusted for some uses of the JVM Summary: Put all inline-related switches into product mode, to allow tuning by dynamic language implementors. Reviewed-by: twisti, kvn ! src/share/vm/opto/bytecodeInfo.cpp ! src/share/vm/opto/doCall.cpp ! src/share/vm/opto/parse.hpp ! src/share/vm/runtime/globals.hpp Changeset: f2e64cfc2020 Author: jrose Date: 2010-01-08 18:27 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/f2e64cfc2020 Merge Changeset: 5b06c5db3e89 Author: jrose Date: 2010-01-08 22:02 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/5b06c5db3e89 Merge Changeset: f24201449cac Author: never Date: 2010-01-09 00:59 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/f24201449cac 6909839: missing unsigned compare cases for some cmoves in sparc.ad Reviewed-by: kvn, jrose ! src/cpu/sparc/vm/sparc.ad + test/compiler/6909839/Test6909839.java Changeset: 1fc01a2425ce Author: iveresov Date: 2010-01-12 13:54 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/1fc01a2425ce Merge ! src/share/vm/runtime/arguments.cpp ! src/share/vm/runtime/globals.hpp Changeset: d749b1813f40 Author: trims Date: 2010-01-15 14:25 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/d749b1813f40 Merge Changeset: 3003ddd1d433 Author: trims Date: 2010-01-15 14:28 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/3003ddd1d433 6917463: Bump the HS17 build number to 07 Summary: Update the HS17 build number to 07 Reviewed-by: jcoomes ! make/hotspot_version Changeset: 359445e739ac Author: mikejwre Date: 2010-01-21 11:12 -0800 URL: http://hg.openjdk.java.net/nio/nio/hotspot/rev/359445e739ac Added tag jdk7-b80 for changeset 3003ddd1d433 ! .hgtags From alan.bateman at sun.com Mon Feb 1 06:55:52 2010 From: alan.bateman at sun.com (alan.bateman at sun.com) Date: Mon, 01 Feb 2010 14:55:52 +0000 Subject: hg: nio/nio/jaxp: 8 new changesets Message-ID: <20100201145552.7B88A41971@hg.openjdk.java.net> Changeset: cc17d7ea1b76 Author: ohair Date: 2009-11-11 11:17 -0800 URL: http://hg.openjdk.java.net/nio/nio/jaxp/rev/cc17d7ea1b76 6900341: jaxp/jaxws ant scripts using ant runtime in classpath, needs to be explicit Reviewed-by: tbell ! build.properties ! build.xml ! make/Makefile Changeset: 86cc67d46db5 Author: katleman Date: 2009-11-12 15:35 -0800 URL: http://hg.openjdk.java.net/nio/nio/jaxp/rev/86cc67d46db5 Added tag jdk7-b76 for changeset 233a4871d336 ! .hgtags Changeset: bfadab8c7b1b Author: tbell Date: 2009-11-17 10:23 -0800 URL: http://hg.openjdk.java.net/nio/nio/jaxp/rev/bfadab8c7b1b Merge Changeset: 90bbdc1a6258 Author: mikejwre Date: 2009-12-03 12:52 -0800 URL: http://hg.openjdk.java.net/nio/nio/jaxp/rev/90bbdc1a6258 Added tag jdk7-b77 for changeset bfadab8c7b1b ! .hgtags Changeset: 7a12d3789e1b Author: ohair Date: 2009-12-16 12:52 -0800 URL: http://hg.openjdk.java.net/nio/nio/jaxp/rev/7a12d3789e1b 6909462: Fix nbproject/private references in .hgignore Summary: See bugzilla issue 100097 Reviewed-by: tbell Contributed-by: Jesse Glick ! .hgignore Changeset: b1005c504358 Author: mikejwre Date: 2009-12-17 14:10 -0800 URL: http://hg.openjdk.java.net/nio/nio/jaxp/rev/b1005c504358 Added tag jdk7-b78 for changeset 7a12d3789e1b ! .hgtags Changeset: 9219574db593 Author: katleman Date: 2010-01-14 15:48 -0800 URL: http://hg.openjdk.java.net/nio/nio/jaxp/rev/9219574db593 Added tag jdk7-b79 for changeset b1005c504358 ! .hgtags Changeset: 204e59d488cd Author: mikejwre Date: 2010-01-21 11:12 -0800 URL: http://hg.openjdk.java.net/nio/nio/jaxp/rev/204e59d488cd Added tag jdk7-b80 for changeset 9219574db593 ! .hgtags From alan.bateman at sun.com Mon Feb 1 06:56:01 2010 From: alan.bateman at sun.com (alan.bateman at sun.com) Date: Mon, 01 Feb 2010 14:56:01 +0000 Subject: hg: nio/nio/jaxws: 8 new changesets Message-ID: <20100201145601.CC9F241972@hg.openjdk.java.net> Changeset: 4023edcd8433 Author: ohair Date: 2009-11-11 11:19 -0800 URL: http://hg.openjdk.java.net/nio/nio/jaxws/rev/4023edcd8433 6900341: jaxp/jaxws ant scripts using ant runtime in classpath, needs to be explicit Reviewed-by: tbell ! build.properties ! build.xml ! make/Makefile Changeset: 701ccbf55ae5 Author: katleman Date: 2009-11-12 15:35 -0800 URL: http://hg.openjdk.java.net/nio/nio/jaxws/rev/701ccbf55ae5 Added tag jdk7-b76 for changeset 765d2077d1e6 ! .hgtags Changeset: 5b4968c11047 Author: tbell Date: 2009-11-17 10:23 -0800 URL: http://hg.openjdk.java.net/nio/nio/jaxws/rev/5b4968c11047 Merge Changeset: 96e510caa8e7 Author: mikejwre Date: 2009-12-03 12:52 -0800 URL: http://hg.openjdk.java.net/nio/nio/jaxws/rev/96e510caa8e7 Added tag jdk7-b77 for changeset 5b4968c11047 ! .hgtags Changeset: fc1c72d1dfbb Author: ohair Date: 2009-12-16 12:52 -0800 URL: http://hg.openjdk.java.net/nio/nio/jaxws/rev/fc1c72d1dfbb 6909462: Fix nbproject/private references in .hgignore Summary: See bugzilla issue 100097 Reviewed-by: tbell Contributed-by: Jesse Glick ! .hgignore Changeset: c08894f5b6e5 Author: mikejwre Date: 2009-12-17 14:10 -0800 URL: http://hg.openjdk.java.net/nio/nio/jaxws/rev/c08894f5b6e5 Added tag jdk7-b78 for changeset fc1c72d1dfbb ! .hgtags Changeset: 447767dee56a Author: katleman Date: 2010-01-14 15:48 -0800 URL: http://hg.openjdk.java.net/nio/nio/jaxws/rev/447767dee56a Added tag jdk7-b79 for changeset c08894f5b6e5 ! .hgtags Changeset: f051045fe94a Author: mikejwre Date: 2010-01-21 11:12 -0800 URL: http://hg.openjdk.java.net/nio/nio/jaxws/rev/f051045fe94a Added tag jdk7-b80 for changeset 447767dee56a ! .hgtags From Xueming.Shen at Sun.COM Mon Feb 1 08:00:06 2010 From: Xueming.Shen at Sun.COM (Xueming Shen) Date: Mon, 01 Feb 2010 08:00:06 -0800 Subject: [Fwd: Re: -Werror in make/java/sun_nio/Makefile] In-Reply-To: <4B646893.4000004@sun.com> References: <4B646893.4000004@sun.com> Message-ID: <4B66FA86.3010007@sun.com> Looks fine. Sherman > > ------------------------------------------------------------------------ > > Subject: > Re: -Werror in make/java/sun_nio/Makefile > From: > Andrew John Hughes > Date: > Sat, 30 Jan 2010 02:19:55 +0000 > To: > Alan Bateman > > To: > Alan Bateman > CC: > nio-dev > > > On 28 January 2010 23:15, Alan Bateman wrote: > >> Andrew John Hughes wrote: >> >>> : >>> >>> It seems that ByteToCharConverter was marked as deprecated with the >>> intention of removing it in JDK6: >>> >>> * @deprecated Replaced by {@link java.nio.charset}. THIS API WILL BE >>> * REMOVED IN J2SE 1.6. >>> >>> This still being present in OpenJDK7 suggests that never happened. >>> >>> >> Unfortunately we haven't been able to remove the legacy converters as >> planned. JDBC drivers are the main problem. Sherman and Martin may want to >> chime in with more history on this. >> >> >>> I'd suggest we either drop the local -Werror or add -deprecation after >>> serial to make the build with maximum warnings complete. Long term, >>> we can look at getting rid of that code if appropriate, though I doubt >>> we'll ever be able to do a build with the deprecation warning and >>> -Werror on simply because of legacy code. >>> >>> >> I'd prefer not drop -Werror as that would let warnings creep in. Add >> -deprecation is probably better. >> >> > > Ok, that's what I've done in this webrev: > > http://cr.openjdk.java.net/~andrew/warnings/webrev.01/ > > It also fixes a number of unchecked and redundant cast warnings that > occur when building with JAVAC_MAX_WARNINGS=true. With this patch, > sun_io now compiles when JAVAC_MAX_WARNINGS=true. > > Does this look ok? > > >> -Alan. >> >> > > > > From alan.bateman at sun.com Mon Feb 1 08:53:03 2010 From: alan.bateman at sun.com (alan.bateman at sun.com) Date: Mon, 01 Feb 2010 16:53:03 +0000 Subject: hg: nio/nio/langtools: 48 new changesets Message-ID: <20100201165514.415F441993@hg.openjdk.java.net> Changeset: cff85998bf4d Author: jjg Date: 2009-11-17 16:45 -0800 URL: http://hg.openjdk.java.net/nio/nio/langtools/rev/cff85998bf4d 6898585: restructure langtools build.xml to facilitate more options for macro Reviewed-by: ohair ! make/build.xml Changeset: a509a22f9845 Author: jjg Date: 2009-11-19 11:38 -0800 URL: http://hg.openjdk.java.net/nio/nio/langtools/rev/a509a22f9845 6902264: fix indentation of tableswitch and lookupswitch Reviewed-by: ksrini ! src/share/classes/com/sun/tools/classfile/Instruction.java ! src/share/classes/com/sun/tools/javap/CodeWriter.java Changeset: 2ebae181a4ab Author: jjg Date: 2009-11-19 11:43 -0800 URL: http://hg.openjdk.java.net/nio/nio/langtools/rev/2ebae181a4ab 6900511: javac command line help broken Reviewed-by: ksrini ! src/share/classes/com/sun/tools/javac/main/JavacOption.java Changeset: b1bb8164a9bd Author: jjg Date: 2009-11-19 11:49 -0800 URL: http://hg.openjdk.java.net/nio/nio/langtools/rev/b1bb8164a9bd 6902720: javac pretty printer does not handle enums correctly Reviewed-by: mcimadamore ! src/share/classes/com/sun/tools/javac/tree/Pretty.java + test/tools/javac/6902720/E1.java + test/tools/javac/6902720/E2.java + test/tools/javac/6902720/Test.java Changeset: 243d0be1ba99 Author: jjg Date: 2009-11-20 10:15 -0800 URL: http://hg.openjdk.java.net/nio/nio/langtools/rev/243d0be1ba99 6903456: 6898585 drops javadoc doclet.xml from JDK Reviewed-by: ohair ! make/build.xml Changeset: 4325b440eb3e Author: jjg Date: 2009-11-20 11:18 -0800 URL: http://hg.openjdk.java.net/nio/nio/langtools/rev/4325b440eb3e 6902337: fix langtools build to allow forward refs into jdk/ repo Reviewed-by: ohair, mcimadamore ! make/Makefile ! make/build.properties ! make/build.xml + make/tools/GenStubs/GenStubs.java Changeset: 4c8c6159159c Author: katleman Date: 2009-11-12 15:36 -0800 URL: http://hg.openjdk.java.net/nio/nio/langtools/rev/4c8c6159159c Added tag jdk7-b76 for changeset 8fb9b4be3cb1 ! .hgtags Changeset: 0398ae15b90a Author: tbell Date: 2009-11-17 10:35 -0800 URL: http://hg.openjdk.java.net/nio/nio/langtools/rev/0398ae15b90a Merge - src/share/classes/com/sun/tools/classfile/ModuleExportTable_attribute.java - src/share/classes/com/sun/tools/classfile/ModuleMemberTable_attribute.java - src/share/classes/com/sun/tools/classfile/Module_attribute.java Changeset: b1508b6affd8 Author: tbell Date: 2009-11-23 19:58 -0800 URL: http://hg.openjdk.java.net/nio/nio/langtools/rev/b1508b6affd8 Merge Changeset: 121e0ebf1658 Author: darcy Date: 2009-12-03 14:03 -0800 URL: http://hg.openjdk.java.net/nio/nio/langtools/rev/121e0ebf1658 6906748: Project Coin: Minor strings in switch cleanup Reviewed-by: jjg ! src/share/classes/com/sun/tools/javac/code/Source.java ! src/share/classes/com/sun/tools/javac/comp/Lower.java Changeset: ea89c5d4af08 Author: jjg Date: 2009-12-07 14:35 -0800 URL: http://hg.openjdk.java.net/nio/nio/langtools/rev/ea89c5d4af08 6907660: stupid typo in ZipFileIndex guarantees NPE Reviewed-by: darcy ! src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java Changeset: ff823a039e16 Author: darcy Date: 2009-12-10 20:35 -0800 URL: http://hg.openjdk.java.net/nio/nio/langtools/rev/ff823a039e16 6909538: Clarify meaning of "element" in javax.lang.model.element API Reviewed-by: ahe ! src/share/classes/javax/lang/model/element/package-info.java Changeset: 4011f49b4af8 Author: jjg Date: 2009-12-11 14:26 -0800 URL: http://hg.openjdk.java.net/nio/nio/langtools/rev/4011f49b4af8 6906175: bridge JSR199 and JSR 203 APIs Reviewed-by: darcy, alanb ! make/build.properties ! make/build.xml ! src/share/classes/com/sun/tools/javac/file/BaseFileObject.java - src/share/classes/com/sun/tools/javac/file/CloseableURLClassLoader.java ! src/share/classes/com/sun/tools/javac/file/JavacFileManager.java ! src/share/classes/com/sun/tools/javac/file/Paths.java + src/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java + src/share/classes/com/sun/tools/javac/nio/PathFileManager.java + src/share/classes/com/sun/tools/javac/nio/PathFileObject.java + src/share/classes/com/sun/tools/javac/util/BaseFileManager.java + src/share/classes/com/sun/tools/javac/util/CloseableURLClassLoader.java ! src/share/classes/javax/tools/StandardJavaFileManager.java + test/tools/javac/nio/compileTest/CompileTest.java + test/tools/javac/nio/compileTest/HelloPathWorld.java Changeset: fbeb560f39e7 Author: jjg Date: 2009-12-12 09:28 -0800 URL: http://hg.openjdk.java.net/nio/nio/langtools/rev/fbeb560f39e7 6907575: [classfile] add support for classfile dependency analysis Reviewed-by: ksrini + src/share/classes/com/sun/tools/classfile/Dependencies.java + src/share/classes/com/sun/tools/classfile/Dependency.java + test/tools/javap/classfile/deps/GetDeps.java + test/tools/javap/classfile/deps/T6907575.java + test/tools/javap/classfile/deps/T6907575.out + test/tools/javap/classfile/deps/p/C1.java Changeset: 0666a8f87661 Author: jjg Date: 2009-12-15 13:26 -0800 URL: http://hg.openjdk.java.net/nio/nio/langtools/rev/0666a8f87661 6910317: [classfile] typo and other issues in Dependency classes Reviewed-by: ksrini ! src/share/classes/com/sun/tools/classfile/Dependencies.java ! src/share/classes/com/sun/tools/classfile/Dependency.java ! test/tools/javap/classfile/deps/GetDeps.java Changeset: 96c71cbc544b Author: darcy Date: 2009-12-18 11:15 -0800 URL: http://hg.openjdk.java.net/nio/nio/langtools/rev/96c71cbc544b 6911854: Update TestElementsAnnotatedWith.java to use @compile/proc Reviewed-by: jjg ! test/tools/javac/processing/environment/round/TestElementsAnnotatedWith.java Changeset: 45bd41dcb614 Author: mikejwre Date: 2009-12-03 12:53 -0800 URL: http://hg.openjdk.java.net/nio/nio/langtools/rev/45bd41dcb614 Added tag jdk7-b77 for changeset 0398ae15b90a ! .hgtags Changeset: ceb2857fce7d Author: tbell Date: 2009-12-08 09:16 -0800 URL: http://hg.openjdk.java.net/nio/nio/langtools/rev/ceb2857fce7d Merge Changeset: 381399872958 Author: ohair Date: 2009-12-16 12:52 -0800 URL: http://hg.openjdk.java.net/nio/nio/langtools/rev/381399872958 6909462: Fix nbproject/private references in .hgignore Summary: See bugzilla issue 100097 Reviewed-by: tbell Contributed-by: Jesse Glick ! .hgignore Changeset: acc1e40a5874 Author: mikejwre Date: 2009-12-16 23:39 -0800 URL: http://hg.openjdk.java.net/nio/nio/langtools/rev/acc1e40a5874 Merge Changeset: 44022ba69c2f Author: mikejwre Date: 2009-12-17 14:10 -0800 URL: http://hg.openjdk.java.net/nio/nio/langtools/rev/44022ba69c2f Added tag jdk7-b78 for changeset acc1e40a5874 ! .hgtags Changeset: ac5b4c5644ce Author: tbell Date: 2009-12-19 10:26 -0800 URL: http://hg.openjdk.java.net/nio/nio/langtools/rev/ac5b4c5644ce Merge - src/share/classes/com/sun/tools/javac/file/CloseableURLClassLoader.java Changeset: 0220a3ab1a40 Author: jjg Date: 2010-01-06 13:09 -0800 URL: http://hg.openjdk.java.net/nio/nio/langtools/rev/0220a3ab1a40 6307206: missing lint control for pkg-info Reviewed-by: darcy ! src/share/classes/com/sun/tools/javac/resources/compiler.properties Changeset: d4e0ae9b4ecb Author: jjg Date: 2010-01-06 13:16 -0800 URL: http://hg.openjdk.java.net/nio/nio/langtools/rev/d4e0ae9b4ecb 6855236: Compiler Tree API TreePath class generates NullPointerException from Iterator Reviewed-by: darcy + test/tools/javac/T6855236.java Changeset: c315df443ff2 Author: jjg Date: 2010-01-08 11:11 -0800 URL: http://hg.openjdk.java.net/nio/nio/langtools/rev/c315df443ff2 6878147: Keywords.log is declared and initialized but unused Reviewed-by: darcy ! src/share/classes/com/sun/tools/javac/parser/Keywords.java Changeset: 2d15bf467aea Author: jjg Date: 2010-01-08 11:16 -0800 URL: http://hg.openjdk.java.net/nio/nio/langtools/rev/2d15bf467aea 6878146: incorrect unused value should be deleted Reviewed-by: darcy ! src/share/classes/com/sun/tools/javac/util/LayoutCharacters.java Changeset: 0e75f9f6d1d4 Author: jjg Date: 2010-01-08 11:28 -0800 URL: http://hg.openjdk.java.net/nio/nio/langtools/rev/0e75f9f6d1d4 6665791: com.sun.source.tree.MethodTree.toString() does not output default values Reviewed-by: darcy ! src/share/classes/com/sun/tools/javac/tree/Pretty.java + test/tools/javac/T6665791.java Changeset: aa06467be3a2 Author: jjg Date: 2010-01-08 11:32 -0800 URL: http://hg.openjdk.java.net/nio/nio/langtools/rev/aa06467be3a2 6915078: ALT_JDK_IMPORT_PATH typo in langtools/make/Makefile Reviewed-by: tbell ! make/Makefile Changeset: 96c56220dcc2 Author: jjg Date: 2010-01-08 13:14 -0800 URL: http://hg.openjdk.java.net/nio/nio/langtools/rev/96c56220dcc2 6915152: langtools build failures with import.jdk on Windows Reviewed-by: ohair ! make/build.xml Changeset: d02e99d31cc0 Author: jjg Date: 2010-01-11 14:05 -0800 URL: http://hg.openjdk.java.net/nio/nio/langtools/rev/d02e99d31cc0 6326754: Compiler will fail to handle -Xmaxerrs with -ve numbers Reviewed-by: ksrini ! src/share/classes/com/sun/tools/javac/util/Log.java + test/tools/javac/T6326754.java + test/tools/javac/T6326754.out Changeset: f983c1dca202 Author: jjg Date: 2010-01-11 14:09 -0800 URL: http://hg.openjdk.java.net/nio/nio/langtools/rev/f983c1dca202 6764569: [PATCH] Fix unused imports in list resource bundles Reviewed-by: ksrini Contributed-by: jesse.glick at sun.com ! make/tools/CompileProperties/CompileProperties.java ! make/tools/CompileProperties/CompilePropertiesTask.java Changeset: ca6bc36b2305 Author: jjg Date: 2010-01-11 14:12 -0800 URL: http://hg.openjdk.java.net/nio/nio/langtools/rev/ca6bc36b2305 6915476: java.util.regex.PatternSyntaxException in com.sun.tools.javac.nio.PathFileObject Reviewed-by: darcy ! src/share/classes/com/sun/tools/javac/nio/PathFileObject.java ! test/tools/javac/nio/compileTest/CompileTest.java Changeset: 14a4c45ef734 Author: jjg Date: 2010-01-11 14:17 -0800 URL: http://hg.openjdk.java.net/nio/nio/langtools/rev/14a4c45ef734 6915497: test test/tools/javac/nio/compileTest/CompileTest.java fails under Hudson Reviewed-by: darcy ! test/tools/javac/nio/compileTest/CompileTest.java Changeset: 51011e02c02f Author: jjg Date: 2010-01-11 16:18 -0800 URL: http://hg.openjdk.java.net/nio/nio/langtools/rev/51011e02c02f 6909470: langtools stub generator should prune unnecessary imports Reviewed-by: darcy ! make/tools/GenStubs/GenStubs.java Changeset: ccd51af119b4 Author: jjg Date: 2010-01-13 17:39 -0800 URL: http://hg.openjdk.java.net/nio/nio/langtools/rev/ccd51af119b4 6472751: SourcePositions.getStartPos returns incorrect value for enum constants 6567414: javac compiler reports no source file or line on enum constant declaration error Reviewed-by: darcy ! src/share/classes/com/sun/tools/javac/parser/JavacParser.java + test/tools/javac/T6472751.java + test/tools/javac/T6567414.java + test/tools/javac/T6567414.out Changeset: b96ad32c004a Author: jjg Date: 2010-01-14 17:18 -0800 URL: http://hg.openjdk.java.net/nio/nio/langtools/rev/b96ad32c004a 6917122: provide utility method to find the inner most type of a type tree Reviewed-by: darcy, jjg Contributed-by: mali at csail.mit.edu, mernst at cs.washington.edu ! src/share/classes/com/sun/tools/javac/tree/Pretty.java ! src/share/classes/com/sun/tools/javac/tree/TreeInfo.java Changeset: 2d0f4e7b44b2 Author: jjg Date: 2010-01-14 17:23 -0800 URL: http://hg.openjdk.java.net/nio/nio/langtools/rev/2d0f4e7b44b2 6916986: handle spaces in langtools launcher path Reviewed-by: darcy, jjg Contributed-by: mali at csail.mit.edu, mernst at cs.washington.edu ! src/share/bin/launcher.sh-template Changeset: f0074aa48d4e Author: katleman Date: 2010-01-14 15:48 -0800 URL: http://hg.openjdk.java.net/nio/nio/langtools/rev/f0074aa48d4e Added tag jdk7-b79 for changeset ac5b4c5644ce ! .hgtags Changeset: a84062774f0e Author: lana Date: 2010-01-15 15:37 -0800 URL: http://hg.openjdk.java.net/nio/nio/langtools/rev/a84062774f0e Merge Changeset: f23b985beb78 Author: jjg Date: 2010-01-19 14:28 -0800 URL: http://hg.openjdk.java.net/nio/nio/langtools/rev/f23b985beb78 6917067: refactor type annotations code from TransTypes into new TypeAnnotations class Reviewed-by: jjg, darcy Contributed-by: mali at csail.mit.edu, mernst at cs.washington.edu + src/share/classes/com/sun/tools/javac/code/TypeAnnotations.java ! src/share/classes/com/sun/tools/javac/comp/TransTypes.java Changeset: 0eaf89e08564 Author: jjg Date: 2010-01-20 16:12 -0800 URL: http://hg.openjdk.java.net/nio/nio/langtools/rev/0eaf89e08564 6918127: improve handling of TypeAnnotationPosition fields Reviewed-by: jjg, darcy Contributed-by: mali at csail.mit.edu, mernst at cs.washington.edu ! src/share/classes/com/sun/tools/classfile/ExtendedAnnotation.java ! src/share/classes/com/sun/tools/javac/code/TypeAnnotationPosition.java ! src/share/classes/com/sun/tools/javac/jvm/Code.java ! src/share/classes/com/sun/tools/javac/jvm/Gen.java Changeset: da0e3e2dd3ef Author: jjg Date: 2010-01-26 11:15 -0800 URL: http://hg.openjdk.java.net/nio/nio/langtools/rev/da0e3e2dd3ef 6919944: incorrect position given for duplicate annotation value error Reviewed-by: darcy ! src/share/classes/com/sun/tools/javac/comp/Check.java ! test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateAnnotationValue.java ! test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateAnnotationValue.out ! test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateAnnotationValue.java ! test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateAnnotationValue.out ! test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateAnnotationValue.java ! test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateAnnotationValue.out ! test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateAnnotationValue.java ! test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateAnnotationValue.out ! test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateAnnotationValue.java ! test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateAnnotationValue.out ! test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateAnnotationValue.java ! test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateAnnotationValue.out ! test/tools/javac/typeAnnotations/failures/common/typeArgs/DuplicateAnnotationValue.java ! test/tools/javac/typeAnnotations/failures/common/typeArgs/DuplicateAnnotationValue.out ! test/tools/javac/typeAnnotations/failures/common/typeparams/DuplicateAnnotationValue.java ! test/tools/javac/typeAnnotations/failures/common/typeparams/DuplicateAnnotationValue.out ! test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateAnnotationValue.java ! test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateAnnotationValue.out Changeset: 59167312ed4e Author: jjg Date: 2010-01-26 11:23 -0800 URL: http://hg.openjdk.java.net/nio/nio/langtools/rev/59167312ed4e 6917130: should test that annotations that have been optimized away are not emitted to classfile Reviewed-by: jjg, darcy Contributed-by: mali at csail.mit.edu, mernst at cs.washington.edu + test/tools/javac/typeAnnotations/classfile/DeadCode.java Changeset: 250a580ab046 Author: mikejwre Date: 2010-01-21 11:12 -0800 URL: http://hg.openjdk.java.net/nio/nio/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/nio/nio/langtools/rev/cfabfcf9f110 Merge Changeset: ff7a01f9eff3 Author: lana Date: 2010-01-27 14:46 -0800 URL: http://hg.openjdk.java.net/nio/nio/langtools/rev/ff7a01f9eff3 Merge Changeset: 699ecefbdd4e Author: jjg Date: 2010-01-29 16:06 -0800 URL: http://hg.openjdk.java.net/nio/nio/langtools/rev/699ecefbdd4e 6919889: assorted position errors in compiler syntax trees Reviewed-by: darcy ! src/share/classes/com/sun/tools/javac/code/Flags.java ! src/share/classes/com/sun/tools/javac/parser/JavacParser.java ! src/share/classes/com/sun/tools/javac/tree/TreeInfo.java ! src/share/classes/com/sun/tools/javac/tree/TreeMaker.java + test/tools/javac/T6654037.java ! test/tools/javac/generics/diamond/neg/Neg01.out ! test/tools/javac/generics/diamond/neg/Neg02.out ! test/tools/javac/generics/diamond/neg/Neg03.out ! test/tools/javac/generics/diamond/neg/Neg04.out + test/tools/javac/treepostests/TreePosTest.java Changeset: 8e638442522a Author: jjg Date: 2010-01-29 16:54 -0800 URL: http://hg.openjdk.java.net/nio/nio/langtools/rev/8e638442522a 6499119: Created package-info class file modeled improperly 6920317: package-info.java file has to be specified on the javac cmdline, else it will not be avail. Reviewed-by: darcy ! src/share/classes/com/sun/tools/javac/code/Symbol.java ! src/share/classes/com/sun/tools/javac/comp/Enter.java ! src/share/classes/com/sun/tools/javac/comp/Lower.java ! src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java + test/tools/javac/processing/6499119/ClassProcessor.java + test/tools/javac/processing/6499119/package-info.java + test/tools/javac/processing/T6920317.java From Alan.Bateman at Sun.COM Tue Feb 2 00:20:39 2010 From: Alan.Bateman at Sun.COM (Alan Bateman) Date: Tue, 02 Feb 2010 08:20:39 +0000 Subject: -Werror in make/java/sun_nio/Makefile In-Reply-To: <17c6771e1002010651h7aa4555csce107a3aed76a5bc@mail.gmail.com> References: <17c6771e1001281446i6bf5e070w332d5ea1942f72@mail.gmail.com> <4B621A80.9060402@sun.com> <17c6771e1001291819v4abb2fabkb4bc731664c6df03@mail.gmail.com> <4B66CDEF.9010708@sun.com> <17c6771e1002010651h7aa4555csce107a3aed76a5bc@mail.gmail.com> Message-ID: <4B67E057.7050000@sun.com> Andrew John Hughes wrote: > : > Great! Is it ok to push this now or does it need further review? > > Yes, no problem, changes only need one reviewer, and I see Sherman has reviewed it too. -Alan. From gnu_andrew at member.fsf.org Tue Feb 2 03:00:28 2010 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Tue, 2 Feb 2010 11:00:28 +0000 Subject: -Werror in make/java/sun_nio/Makefile In-Reply-To: <4B67E057.7050000@sun.com> References: <17c6771e1001281446i6bf5e070w332d5ea1942f72@mail.gmail.com> <4B621A80.9060402@sun.com> <17c6771e1001291819v4abb2fabkb4bc731664c6df03@mail.gmail.com> <4B66CDEF.9010708@sun.com> <17c6771e1002010651h7aa4555csce107a3aed76a5bc@mail.gmail.com> <4B67E057.7050000@sun.com> Message-ID: <17c6771e1002020300n2281c8d3wb81cd6be0d99946a@mail.gmail.com> On 2 February 2010 08:20, Alan Bateman wrote: > Andrew John Hughes wrote: >> >> : >> Great! ?Is it ok to push this now or does it need further review? >> >> > > Yes, no problem, changes only need one reviewer, and I see Sherman has > reviewed it too. > > -Alan. > > Ah, thought so, but just wanted to be sure. Pushed: http://hg.openjdk.java.net/jdk7/tl/jdk/rev/7dadd2951a8b Thanks, -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From forax at univ-mlv.fr Mon Feb 8 06:18:35 2010 From: forax at univ-mlv.fr (=?ISO-8859-1?Q?R=E9mi_Forax?=) Date: Mon, 08 Feb 2010 15:18:35 +0100 Subject: IOException and FileVisitor Message-ID: <4B701D3B.5080509@univ-mlv.fr> Hi Alan, hi all, I don't understand why method visit* and postVisit of a FileVsitor doesn't propagate IOException ? I've written a program one week ago that use a SimpleFileVisitor and I get only now an IOError (visitFileFailed throws that error) The current design is not very robust. I prefer a crystal clear contract that explicitly say, well be prepared to catch some IO exception while walking a file tree. R?mi From Alan.Bateman at Sun.COM Mon Feb 8 07:28:17 2010 From: Alan.Bateman at Sun.COM (Alan Bateman) Date: Mon, 08 Feb 2010 15:28:17 +0000 Subject: IOException and FileVisitor In-Reply-To: <4B701D3B.5080509@univ-mlv.fr> References: <4B701D3B.5080509@univ-mlv.fr> Message-ID: <4B702D91.7010606@sun.com> R?mi Forax wrote: > Hi Alan, hi all, > I don't understand why method visit* and postVisit of a FileVsitor > doesn't propagate IOException ? > I've written a program one week ago that use a SimpleFileVisitor and I > get only now an IOError > (visitFileFailed throws that error) > The current design is not very robust. > > I prefer a crystal clear contract that explicitly say, well be > prepared to catch some IO exception > while walking a file tree. > > R?mi > Thanks for bringing this up. There are many ways to deal with I/O exceptions when doing recursive operations. Command-line tools and utilities will often just print a warning to standard error and continue. In other cases you might implement a FileVisitor that accumulates all I/O exceptions encountered during the walk. Another approach is to terminate the walk when an I/O exception is encountered something this can done gracefully (by returning TERMINATE) or by throwing an exception that is propagated to the caller of Files.walkFileTree. Looking at it now I think you are right and FileVisitor's method should declare IOException. That would avoid SimpleFileVisitor wrapping the exception as an IOError as it does now. -Alan. From forax at univ-mlv.fr Wed Feb 10 08:10:54 2010 From: forax at univ-mlv.fr (=?ISO-8859-1?Q?R=E9mi_Forax?=) Date: Wed, 10 Feb 2010 17:10:54 +0100 Subject: bu in Path.Relativize Message-ID: <4B72DA8E.20509@univ-mlv.fr> It seems that relativize doesn't understand well the concept of current directory ("."). Path path1 = Paths.get("foo.txt"); Path path2 = Paths.get("."); Path relativize = path2.relativize(path1); System.out.println(relativize); // print ../foo.txt I use jdk7 b81 under linux, R?mi From Alan.Bateman at Sun.COM Wed Feb 10 08:39:37 2010 From: Alan.Bateman at Sun.COM (Alan Bateman) Date: Wed, 10 Feb 2010 16:39:37 +0000 Subject: bu in Path.Relativize In-Reply-To: <4B72DA8E.20509@univ-mlv.fr> References: <4B72DA8E.20509@univ-mlv.fr> Message-ID: <4B72E149.1020104@sun.com> R?mi Forax wrote: > It seems that relativize doesn't understand well the concept of > current directory ("."). > > Path path1 = Paths.get("foo.txt"); > Path path2 = Paths.get("."); > > Path relativize = path2.relativize(path1); > System.out.println(relativize); // print ../foo.txt > > I use jdk7 b81 under linux, > R?mi You're right - I'll create a bug for this now. Thanks R?mi! From forax at univ-mlv.fr Wed Feb 10 08:44:03 2010 From: forax at univ-mlv.fr (=?ISO-8859-1?Q?R=E9mi_Forax?=) Date: Wed, 10 Feb 2010 17:44:03 +0100 Subject: bu in Path.Relativize In-Reply-To: <4B72E149.1020104@sun.com> References: <4B72DA8E.20509@univ-mlv.fr> <4B72E149.1020104@sun.com> Message-ID: <4B72E253.6010701@univ-mlv.fr> Le 10/02/2010 17:39, Alan Bateman a ?crit : > R?mi Forax wrote: >> It seems that relativize doesn't understand well the concept of >> current directory ("."). >> >> Path path1 = Paths.get("foo.txt"); >> Path path2 = Paths.get("."); >> >> Path relativize = path2.relativize(path1); >> System.out.println(relativize); // print ../foo.txt >> >> I use jdk7 b81 under linux, >> R?mi > You're right - I'll create a bug for this now. Thanks R?mi! Thank you, Alan, a workaround is to used realPath() on both paths before calling relativize. R?mi From Alan.Bateman at Sun.COM Fri Feb 12 07:45:35 2010 From: Alan.Bateman at Sun.COM (Alan Bateman) Date: Fri, 12 Feb 2010 15:45:35 +0000 Subject: Need reviewer for 6925977: (file) test/java/nio/file/Path/CheckPermissions.java fails if test.src on read-only file system Message-ID: <4B75779F.70302@sun.com> Lana has taken over the gatekeeping duties for jdk7/tl and on her first integration hit a few test failures, one of which was test/java/nio/file/Path/CheckPermissions.java. The test is using test.src (the source directory) instead of the current directory (the scratch directory in the case of jtreg). Our tests shouldn't of course write to the test source directory. The attached path fixes that. Thanks, Alan. diff -r 784e52734b8d test/java/nio/file/Path/CheckPermissions.java --- a/test/java/nio/file/Path/CheckPermissions.java Wed Feb 10 17:51:07 2010 -0800 +++ b/test/java/nio/file/Path/CheckPermissions.java Fri Feb 12 15:24:28 2010 +0000 @@ -197,7 +197,7 @@ public class CheckPermissions { } public static void main(String[] args) throws IOException { - Path dir = Paths.get(System.getProperty("test.src", ".")); + Path dir = Paths.get(System.getProperty("test.dir", ".")); Path file = dir.resolve("file1234").createFile(); try { LoggingSecurityManager.install(); From Alan.Bateman at Sun.COM Fri Feb 12 08:09:23 2010 From: Alan.Bateman at Sun.COM (Alan Bateman) Date: Fri, 12 Feb 2010 16:09:23 +0000 Subject: Need reviewer for 6925932: (file) Path.endsWith can throw ArrayIndexOutOfBoundsException (unx) Message-ID: <4B757D33.2010506@sun.com> This is small bug in the Unix implementation of Path.endsWith. Where the given path has fewer name elements than the base path but they are longer than the corresponding name elements in the base path then the comparison can fail with ArrayIndexOutOfBoundException. The reason is that the original implementation is missing a length check and is trivially fixed. The webrev is here and the test cases expanded to better exercise this method: http://cr.openjdk.java.net/~alanb/6925932/webrev.00/ Thanks, Alan. From Christopher.Hegarty at Sun.COM Fri Feb 12 08:20:35 2010 From: Christopher.Hegarty at Sun.COM (Christopher Hegarty - Sun Microsystems Ireland) Date: Fri, 12 Feb 2010 16:20:35 +0000 Subject: Need reviewer for 6925977: (file) test/java/nio/file/Path/CheckPermissions.java fails if test.src on read-only file system In-Reply-To: <4B75779F.70302@sun.com> References: <4B75779F.70302@sun.com> Message-ID: <4B757FD3.4010505@Sun.COM> Looks fine. -Chris. On 12/02/2010 15:45, Alan Bateman wrote: > Lana has taken over the gatekeeping duties for jdk7/tl and on her first > integration hit a few test failures, one of which was > test/java/nio/file/Path/CheckPermissions.java. The test is using > test.src (the source directory) instead of the current directory (the > scratch directory in the case of jtreg). Our tests shouldn't of course > write to the test source directory. The attached path fixes that. > > Thanks, > Alan. > > > diff -r 784e52734b8d test/java/nio/file/Path/CheckPermissions.java > --- a/test/java/nio/file/Path/CheckPermissions.java Wed Feb 10 17:51:07 > 2010 -0800 > +++ b/test/java/nio/file/Path/CheckPermissions.java Fri Feb 12 15:24:28 > 2010 +0000 > @@ -197,7 +197,7 @@ public class CheckPermissions { > } > > public static void main(String[] args) throws IOException { > - Path dir = Paths.get(System.getProperty("test.src", ".")); > + Path dir = Paths.get(System.getProperty("test.dir", ".")); > Path file = dir.resolve("file1234").createFile(); > try { > LoggingSecurityManager.install(); > From sebastian.sickelmann at gmx.de Sun Feb 14 11:33:59 2010 From: sebastian.sickelmann at gmx.de (Sebastian Sickelmann) Date: Sun, 14 Feb 2010 20:33:59 +0100 Subject: WatchService questions In-Reply-To: <4B615640.5060606@sun.com> References: <20100119190200.117690@gmx.net> <4B576B3D.1020508@sun.com> <20100127203602.147290@gmx.net> <4B615640.5060606@sun.com> Message-ID: <20100214193359.234240@gmx.net> Alan Bateman wrote: > Sebastian Sickelmann wrote: > > : > > Yes, i have signed it and send it in. But did no response on that yet. > Should i get a response? > > > I checked, and it has been received , but just hasn't been "processed" > yet. i am approved yesterday. :-) > > > I am trying to create an implementation that lets you choose between > Version 2A and 2B or just the "old" one. But this will take some time, i think > am be back on this at the middle of February. I am sorry that i actually had no time to manage my plan to create an implementation that let choose the user which version to use. But i hope you think Version 2B is worth of integrating in OpenJDK. What would the next steps to be? > > > > But for now what would be the next step to make progess for the actual > send in patches? Public Review? > > > Sending patches to this mail list is fine. I can sponsor it once we've > agreed the patch. > > -Alan. -- NEU: Mit GMX DSL ?ber 1000,- ? sparen! http://portal.gmx.net/de/go/dsl02 From Christopher.Hegarty at Sun.COM Fri Feb 19 05:30:02 2010 From: Christopher.Hegarty at Sun.COM (Christopher Hegarty - Sun Microsystems Ireland) Date: Fri, 19 Feb 2010 13:30:02 +0000 Subject: Need reviewer for 6925932: (file) Path.endsWith can throw ArrayIndexOutOfBoundsException (unx) In-Reply-To: <4B757D33.2010506@sun.com> References: <4B757D33.2010506@sun.com> Message-ID: <4B7E925A.70704@Sun.COM> Looks fine. Trivially, I would retrieve and store path.length and that.path.length in locals after checkPath(other), to prevent retrieving their values potentially more than once. -Chris. On 12/02/2010 16:09, Alan Bateman wrote: > This is small bug in the Unix implementation of Path.endsWith. Where the > given path has fewer name elements than the base path but they are > longer than the corresponding name elements in the base path then the > comparison can fail with ArrayIndexOutOfBoundException. The reason is > that the original implementation is missing a length check and is > trivially fixed. The webrev is here and the test cases expanded to > better exercise this method: > http://cr.openjdk.java.net/~alanb/6925932/webrev.00/ > > Thanks, > Alan. From Alan.Bateman at Sun.COM Sat Feb 20 08:33:47 2010 From: Alan.Bateman at Sun.COM (Alan Bateman) Date: Sat, 20 Feb 2010 16:33:47 +0000 Subject: WatchService questions In-Reply-To: <20100214193359.234240@gmx.net> References: <20100119190200.117690@gmx.net> <4B576B3D.1020508@sun.com> <20100127203602.147290@gmx.net> <4B615640.5060606@sun.com> <20100214193359.234240@gmx.net> Message-ID: <4B800EEB.1080004@sun.com> Sebastian Sickelmann wrote: > : > I am sorry that i actually had no time to manage my plan to create an implementation that let choose the user which version to use. > But i hope you think Version 2B is worth of integrating in OpenJDK. > What would the next steps to be? > Sorry for the late reply - I've been focused elsewhere recently. I agree the 2B approach is a bit better so let's go with that. I'll create a bug for this and work with you early next week to bring this one to the finish line. -Alan. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/nio-dev/attachments/20100220/93928a2d/attachment.html From Alan.Bateman at Sun.COM Sat Feb 20 08:34:36 2010 From: Alan.Bateman at Sun.COM (Alan Bateman) Date: Sat, 20 Feb 2010 16:34:36 +0000 Subject: Need reviewer for 6925932: (file) Path.endsWith can throw ArrayIndexOutOfBoundsException (unx) In-Reply-To: <4B7E925A.70704@Sun.COM> References: <4B757D33.2010506@sun.com> <4B7E925A.70704@Sun.COM> Message-ID: <4B800F1C.8010409@sun.com> Christopher Hegarty - Sun Microsystems Ireland wrote: > Looks fine. > > Trivially, I would retrieve and store path.length and that.path.length > in locals after checkPath(other), to prevent retrieving their values > potentially more than once. Thanks Chris. You're right, it could be nicer to assign thisLen and thatLen at start of the method. I'll do that, re-test and push the fix. -Alan From Alan.Bateman at Sun.COM Sat Feb 20 08:38:54 2010 From: Alan.Bateman at Sun.COM (Alan Bateman) Date: Sat, 20 Feb 2010 16:38:54 +0000 Subject: bu in Path.Relativize In-Reply-To: <4B72E253.6010701@univ-mlv.fr> References: <4B72DA8E.20509@univ-mlv.fr> <4B72E149.1020104@sun.com> <4B72E253.6010701@univ-mlv.fr> Message-ID: <4B80101E.1090600@sun.com> R?mi Forax wrote: > : > Thank you, Alan, > a workaround is to used realPath() on both paths before calling > relativize. I've created 6925169 for this and I have an initial fix that I'll send a webrev soon. While looking at this I see that we've got a subtle spec bug in p.relativize(p.resolve(q)).equals(q) can only be guaranteed to be true if p and q are normalized paths. I'll fix that too. -Alan. From Alan.Bateman at Sun.COM Sat Feb 20 10:15:05 2010 From: Alan.Bateman at Sun.COM (Alan Bateman) Date: Sat, 20 Feb 2010 18:15:05 +0000 Subject: Need reviewer for 6926800: TEST_BUG: java/nio/file/Files/walk_file_tree.sh fails with newer versions of find(1) Message-ID: <4B8026A9.90700@sun.com> The test test/java/nio/file/Files/walk_file_tree.sh is failing on some Linux distributions. The test walks a file tree and checks that it visits directories and files in the same order as the find(1) utility. To make things interesting the test creates a file tree with cycles (sym links to ancestor directories) and checks behavior for the case where sym links are followed and not followed. When comparing the output with the output of find(1), the test assumes that when a cycle is encountered that find will print the sym link and continue (the warning to stderr is ignored). This assumption turns out to be no longer true on some distributions where find now just prints a warning. The fix proposed changes the test so that it works with either behavior - it first walks the file tree without reporting cycles. If that doesn't match the output of find then it walks the file tree again with an option to print cycles. I've put the webrev with the proposed change here: http://cr.openjdk.java.net/~alanb/6926800/webrev.00/ Thanks, Alan. From forax at univ-mlv.fr Sat Feb 20 10:54:38 2010 From: forax at univ-mlv.fr (=?ISO-8859-1?Q?R=E9mi_Forax?=) Date: Sat, 20 Feb 2010 19:54:38 +0100 Subject: bu in Path.Relativize In-Reply-To: <4B80101E.1090600@sun.com> References: <4B72DA8E.20509@univ-mlv.fr> <4B72E149.1020104@sun.com> <4B72E253.6010701@univ-mlv.fr> <4B80101E.1090600@sun.com> Message-ID: <4B802FEE.2070104@univ-mlv.fr> Le 20/02/2010 17:38, Alan Bateman a ?crit : > R?mi Forax wrote: >> : >> Thank you, Alan, >> a workaround is to used realPath() on both paths before calling >> relativize. > I've created 6925169 for this and I have an initial fix that I'll send > a webrev soon. While looking at this I see that we've got a subtle > spec bug in p.relativize(p.resolve(q)).equals(q) can only be > guaranteed to be true if p and q are normalized paths. I'll fix that too. > > -Alan. Thanks, I will review the patch. R?mi From forax at univ-mlv.fr Sat Feb 20 11:27:57 2010 From: forax at univ-mlv.fr (=?ISO-8859-1?Q?R=E9mi_Forax?=) Date: Sat, 20 Feb 2010 20:27:57 +0100 Subject: Need reviewer for 6926800: TEST_BUG: java/nio/file/Files/walk_file_tree.sh fails with newer versions of find(1) In-Reply-To: <4B8026A9.90700@sun.com> References: <4B8026A9.90700@sun.com> Message-ID: <4B8037BD.3060308@univ-mlv.fr> Le 20/02/2010 19:15, Alan Bateman a ?crit : > > The test test/java/nio/file/Files/walk_file_tree.sh is failing on some > Linux distributions. The test walks a file tree and checks that it > visits directories and files in the same order as the find(1) utility. > To make things interesting the test creates a file tree with cycles > (sym links to ancestor directories) and checks behavior for the case > where sym links are followed and not followed. When comparing the > output with the output of find(1), the test assumes that when a cycle > is encountered that find will print the sym link and continue (the > warning to stderr is ignored). This assumption turns out to be no > longer true on some distributions where find now just prints a > warning. The fix proposed changes the test so that it works with > either behavior - it first walks the file tree without reporting > cycles. If that doesn't match the output of find then it walks the > file tree again with an option to print cycles. I've put the webrev > with the proposed change here: > http://cr.openjdk.java.net/~alanb/6926800/webrev.00/ > > Thanks, > Alan. This is my first review with a switch on string :) The patch is ok. I think that the doc of visitFile should be modified to add a sentence about the fact that visiFile can be called with a link to a directory. The fact that attrs.isDirectory() can be true is surprising. R?mi From Alan.Bateman at Sun.COM Sat Feb 20 11:52:11 2010 From: Alan.Bateman at Sun.COM (Alan Bateman) Date: Sat, 20 Feb 2010 19:52:11 +0000 Subject: Need reviewer for 6926800: TEST_BUG: java/nio/file/Files/walk_file_tree.sh fails with newer versions of find(1) In-Reply-To: <4B8037BD.3060308@univ-mlv.fr> References: <4B8026A9.90700@sun.com> <4B8037BD.3060308@univ-mlv.fr> Message-ID: <4B803D6B.9090801@sun.com> R?mi Forax wrote: > : > This is my first review with a switch on string :) > > The patch is ok. > > I think that the doc of visitFile should be modified to add > a sentence about the fact that visiFile can be called with > a link to a directory. > The fact that attrs.isDirectory() can be true is surprising. Thanks for reviewing. Files.walkFileTree has a paragraph on this and that's where it specifies how cycles are reported. Adding a reference from visitFile is probably a good idea when next updating that part of the javadoc. -Alan. From Alan.Bateman at Sun.COM Thu Feb 25 01:33:03 2010 From: Alan.Bateman at Sun.COM (Alan Bateman) Date: Thu, 25 Feb 2010 09:33:03 +0000 Subject: WatchService questions In-Reply-To: <20100214193359.234240@gmx.net> References: <20100119190200.117690@gmx.net> <4B576B3D.1020508@sun.com> <20100127203602.147290@gmx.net> <4B615640.5060606@sun.com> <20100214193359.234240@gmx.net> Message-ID: <4B8643CF.20400@sun.com> Sebastian Sickelmann wrote: > : > I am sorry that i actually had no time to manage my plan to create an implementation that let choose the user which version to use. > But i hope you think Version 2B is worth of integrating in OpenJDK. > What would the next steps to be? > I've created this bug to track this one: 6929532: (file) WatchService should avoid queuing new modify events when lots of files are changing and I've put a webrev with the changes here: http://cr.openjdk.java.net/~alanb/6929532/webrev.00/ The change to AbstractWatchKey is your changes (slightly modified but not much). It's hard to write reliable tests for the WatchService as the behavior across the 4 implementations varies slightly. So for the test I decided it would be easier to just expand the scope of an existing test - hope that's okay. If you are happy with this then I'll get this into jdk7, listing you as contributor. -Alan. From Alan.Bateman at Sun.COM Sat Feb 27 01:10:17 2010 From: Alan.Bateman at Sun.COM (Alan Bateman) Date: Sat, 27 Feb 2010 09:10:17 +0000 Subject: WatchService questions In-Reply-To: <20100226205119.219300@gmx.net> References: <20100119190200.117690@gmx.net> <4B576B3D.1020508@sun.com> <20100127203602.147290@gmx.net> <4B615640.5060606@sun.com> <20100214193359.234240@gmx.net> <4B8643CF.20400@sun.com> <20100226205119.219300@gmx.net> Message-ID: <4B88E179.3020001@sun.com> Sebastian Sickelmann wrote: > Alan Bateman wrote: > >> Sebastian Sickelmann wrote: >> >>> : >>> I am sorry that i actually had no time to manage my plan to create an >>> >> implementation that let choose the user which version to use. >> >>> But i hope you think Version 2B is worth of integrating in OpenJDK. >>> What would the next steps to be? >>> >>> >> I've created this bug to track this one: >> 6929532: (file) WatchService should avoid queuing new modify events >> when lots of files are changing >> >> and I've put a webrev with the changes here: >> http://cr.openjdk.java.net/~alanb/6929532/webrev.00/ >> >> The change to AbstractWatchKey is your changes (slightly modified but >> not much). It's hard to write reliable tests for the WatchService as the >> behavior across the 4 implementations varies slightly. So for the test I >> decided it would be easier to just expand the scope of an existing test >> - hope that's okay. >> > Everthing is fine. I think your test is much better than mine. > >> If you are happy with this then I'll get this into jdk7, listing you as >> contributor. >> > That would be nice. Let me know if there is something to do for me after that! > Thanks. I think we're done and I'll get this into the jdk7/tl/jdk repo soon (should be in b88). -Alan. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/nio-dev/attachments/20100227/f1de4944/attachment.html