From Joe.Darcy at Sun.COM Tue Feb 2 13:26:43 2010 From: Joe.Darcy at Sun.COM (Joseph D. Darcy) Date: Tue, 02 Feb 2010 13:26:43 -0800 Subject: Testing status of current OpenJDK 6 sources, ready for b18? Message-ID: <4B689893.6090800@sun.com> Hello. Build 18 has been open for a while and I'd like to checkpoint the sources in the near future to let some larger changes go back. Andrew, IIRC there is at least one more patch you'd like to see in b18, the only being blocked by jcheck name rejection. Is there anything else? I ran a set of regression tests on the current sources and the results generally look fine; differences listed below. -Joe HotSpot 0: b17-summary.txt pass: 24 1: pre-b18-summary.txt pass: 24 No differences Langtools 0: b17-summary.txt pass: 1,354 1: pre-b18-summary.txt pass: 1,355 0 1 Test --- pass tools/javac/T6855236.java 1 differences JDK regression tests These tests were run outside of Sun's WAN so some of the networking failures may be spurious. I ran jtreg using " -e JTREG_TESTENV=/path/to/network.properties" with: >more network.properties # Properties for off SWAN network test host=icedtea.classpath.org refusing_host=ns1.gnu.org far_host=developer.classpath.org 0: b17-summary.txt pass: 3,118; fail: 26 1: pre-b18-summary.txt pass: 3,149; fail: 17; error: 3 0 1 Test --- pass com/sun/java/swing/plaf/nimbus/Test6741426.java --- pass com/sun/java/swing/plaf/nimbus/Test6849805.java --- pass com/sun/jdi/BreakpointWithFullGC.sh pass error com/sun/jdi/DoubleAgentTest.java --- pass com/sun/jdi/ResumeOneThreadTest.java --- pass com/sun/jdi/SimulResumerTest.java --- pass demo/jvmti/compiledMethodLoad/CompiledMethodLoadTest.java fail pass java/awt/Frame/DynamicLayout/DynamicLayout.java fail pass java/awt/Frame/MaximizedToIconified/MaximizedToIconified.java fail pass java/awt/Frame/ShownOffScreenOnWin98/ShownOffScreenOnWin98Test.java fail pass java/awt/Frame/UnfocusableMaximizedFrameResizablity/UnfocusableMaximizedFrameResizablity.java --- pass java/awt/GraphicsDevice/CloneConfigsTest.java fail pass java/awt/GridLayout/LayoutExtraGaps/LayoutExtraGaps.java fail pass java/awt/Insets/CombinedTestApp1.java fail pass java/awt/KeyboardFocusmanager/TypeAhead/ButtonActionKeyTest/ButtonActionKeyTest.html fail pass java/awt/KeyboardFocusmanager/TypeAhead/MenuItemActivatedTest/MenuItemActivatedTest.html fail pass java/awt/KeyboardFocusmanager/TypeAhead/SubMenuShowTest/SubMenuShowTest.html fail pass java/awt/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.html pass fail java/awt/Multiscreen/LocationRelativeToTest/LocationRelativeToTest.java fail pass java/awt/TextArea/UsingWithMouse/SelectionAutoscrollTest.html fail pass java/awt/Toolkit/ScreenInsetsTest/ScreenInsetsTest.java pass --- java/awt/Window/AlwaysOnTop/AlwaysOnTopEvenOfWindow.java pass fail java/awt/Window/GrabSequence/GrabSequence.java fail pass java/awt/event/KeyEvent/CorrectTime/CorrectTime.java fail pass java/awt/grab/EmbeddedFrameTest1/EmbeddedFrameTest1.java pass fail java/awt/print/PrinterJob/ExceptionTest.java --- pass java/lang/ClassLoader/UninitializedParent.java pass fail java/net/ipv6tests/TcpTest.java pass fail java/nio/channels/SocketChannel/AdaptSocket.java pass fail java/nio/channels/SocketChannel/LocalAddress.java pass fail java/nio/channels/SocketChannel/Shutdown.java --- pass java/util/TimeZone/OldIDMappingTest.sh --- pass java/util/TimeZone/TimeZoneDatePermissionCheck.sh --- pass javax/swing/JButton/6604281/bug6604281.java fail pass javax/swing/JTextArea/Test6593649.java --- pass javax/swing/Security/6657138/ComponentTest.java --- pass javax/swing/Security/6657138/bug6657138.java --- pass javax/swing/ToolTipManager/Test6657026.java --- pass javax/swing/UIManager/Test6657026.java --- pass javax/swing/plaf/basic/BasicSplitPaneUI/Test6657026.java --- pass javax/swing/plaf/metal/MetalBorders/Test6657026.java --- pass javax/swing/plaf/metal/MetalBumps/Test6657026.java --- pass javax/swing/plaf/metal/MetalInternalFrameUI/Test6657026.java --- pass javax/swing/plaf/metal/MetalSliderUI/Test6657026.java pass error sun/java2d/OpenGL/GradientPaints.java pass fail sun/rmi/transport/proxy/EagerHttpFallback.java --- pass sun/security/provider/certpath/DisabledAlgorithms/CPBuilder.java --- pass sun/security/provider/certpath/DisabledAlgorithms/CPValidatorEndEntity.java --- pass sun/security/provider/certpath/DisabledAlgorithms/CPValidatorIntermediate.java --- pass sun/security/provider/certpath/DisabledAlgorithms/CPValidatorTrustAnchor.java pass error sun/security/ssl/javax/net/ssl/NewAPIs/SessionTimeOutTests.java --- pass sun/security/tools/jarsigner/emptymanifest.sh --- pass sun/security/util/DerValue/BadValue.java fail pass sun/tools/jhat/HatHeapDump1Test.java fail pass sun/tools/native2ascii/NativeErrors.java 55 differences From Kelly.Ohair at Sun.COM Tue Feb 2 14:42:09 2010 From: Kelly.Ohair at Sun.COM (Kelly O'Hair) Date: Tue, 02 Feb 2010 14:42:09 -0800 Subject: Potential update of JAXP sources in OpenJDK (b18) Message-ID: <4B68AA41.8030400@sun.com> The JAXP sources in openjdk6 will be updated to JAXP 1.4.3 ReleaseNotes: https://jaxp.dev.java.net/1.4/1.4.3/ReleaseNotes.html Changelog: https://jaxp.dev.java.net/1.4/1.4.3/changelog.html The source bundle will be: https://jaxp.dev.java.net/files/documents/913/147491/jdk6-jaxp-2010_01_15.zip And will match the jdk7 M6 milestone. Question: Should we make this in OpenJDK6 B18, or wait until B19? -kto From Joe.Darcy at Sun.COM Tue Feb 2 16:06:59 2010 From: Joe.Darcy at Sun.COM (Joe Darcy) Date: Tue, 02 Feb 2010 16:06:59 -0800 Subject: Potential update of JAXP sources in OpenJDK (b18) In-Reply-To: <4B68AA41.8030400@sun.com> References: <4B68AA41.8030400@sun.com> Message-ID: <4B68BE23.6080908@sun.com> On 02/02/10 02:42 PM, Kelly O'Hair wrote: > > The JAXP sources in openjdk6 will be updated to JAXP 1.4.3 > > ReleaseNotes: https://jaxp.dev.java.net/1.4/1.4.3/ReleaseNotes.html > Changelog: https://jaxp.dev.java.net/1.4/1.4.3/changelog.html > > The source bundle will be: > > https://jaxp.dev.java.net/files/documents/913/147491/jdk6-jaxp-2010_01_15.zip > > > And will match the jdk7 M6 milestone. > > Question: Should we make this in OpenJDK6 B18, or wait until B19? > Given the size of the set of bugs being fixed, which if I understand correctly also include some API upgrades, I think this jaxp upgrade is more appropriate for b19. -Joe From joe.wang at sun.com Tue Feb 2 16:20:34 2010 From: joe.wang at sun.com (Joe Wang) Date: Tue, 02 Feb 2010 16:20:34 -0800 Subject: Potential update of JAXP sources in OpenJDK (b18) In-Reply-To: <4B68BE23.6080908@sun.com> References: <4B68AA41.8030400@sun.com> <4B68BE23.6080908@sun.com> Message-ID: <4B68C152.1030608@sun.com> Joe Darcy wrote: > On 02/02/10 02:42 PM, Kelly O'Hair wrote: >> >> The JAXP sources in openjdk6 will be updated to JAXP 1.4.3 >> >> ReleaseNotes: https://jaxp.dev.java.net/1.4/1.4.3/ReleaseNotes.html >> Changelog: https://jaxp.dev.java.net/1.4/1.4.3/changelog.html >> >> The source bundle will be: >> >> https://jaxp.dev.java.net/files/documents/913/147491/jdk6-jaxp-2010_01_15.zip >> >> >> And will match the jdk7 M6 milestone. >> >> Question: Should we make this in OpenJDK6 B18, or wait until B19? >> > > Given the size of the set of bugs being fixed, which if I understand > correctly also include some API upgrades, I think this jaxp upgrade is > more appropriate for b19. There are only 10 bug fixes relative to the previous integration (M5). What's in the changelog reflects changes to the previous JAXP standalone release 1.4.2. The API upgrade was also already in JDK7 M5 and OpenJDK6. The driver for the current integration request was the GlassFish v3 issue (CR 6909759). Besides that, there are also three performance improvement the JDK performance team (Charlie) has done recently. --Joe W > > -Joe From martinrb at google.com Tue Feb 2 16:31:46 2010 From: martinrb at google.com (Martin Buchholz) Date: Tue, 2 Feb 2010 16:31:46 -0800 Subject: Potential update of JAXP sources in OpenJDK (b18) In-Reply-To: <4B68AA41.8030400@sun.com> References: <4B68AA41.8030400@sun.com> Message-ID: <1ccfd1c11002021631t47e471fbh590dc058081d8c44@mail.gmail.com> Vaguely related reminder: some of the jax* "drops" are hosted on kenai.com, and that hosting service is expected to go away. Martin From Joe.Darcy at Sun.COM Tue Feb 2 17:41:52 2010 From: Joe.Darcy at Sun.COM (Joseph D. Darcy) Date: Tue, 02 Feb 2010 17:41:52 -0800 Subject: Potential update of JAXP sources in OpenJDK (b18) In-Reply-To: <1ccfd1c11002021631t47e471fbh590dc058081d8c44@mail.gmail.com> References: <4B68AA41.8030400@sun.com> <1ccfd1c11002021631t47e471fbh590dc058081d8c44@mail.gmail.com> Message-ID: <4B68D460.2040300@sun.com> Martin Buchholz wrote: > Vaguely related reminder: > some of the jax* "drops" are hosted on kenai.com, > and that hosting service is expected to go away. > > Yep, already addressed: http://hg.openjdk.java.net/jdk6/jdk6-gate/jaxp/rev/f23bb60a908d # HG changeset patch # User ohair # Date 1264727287 28800 # Node ID f23bb60a908d08903dbadaee4b1a785482a7bde0 # Parent e69b78c54335f3e7cb5e25e0be67e62b02166867 6894833: Upgrade jaxp drop source bundle Reviewed-by: darcy --- a/jaxp.properties Sun Nov 08 23:46:36 2009 +0000 +++ b/jaxp.properties Thu Jan 28 17:08:07 2010 -0800 @@ -24,10 +24,10 @@ # drops.master.copy.base=${drops.dir} -drops.master.url.base=http://kenai.com/projects/jdk6-drops/downloads/download +drops.master.url.base=https://jaxp.dev.java.net/files/documents/913/147329 -jaxp_src.bundle.name=jdk6-jaxp-2009_10_27.zip -jaxp_src.bundle.md5.checksum=0bb03bbd7b1b6d87cc65772c6adb2d6a +jaxp_src.bundle.name=jdk6-jaxp-2009_10_13.zip +jaxp_src.bundle.md5.checksum=a2f7b972124cd776ff71e7754eb9a429 jaxp_src.master.bundle.dir=${drops.master.copy.base} jaxp_src.master.bundle.url.base=${drops.master.url.base} -Joe From Kelly.Ohair at Sun.COM Tue Feb 2 18:04:59 2010 From: Kelly.Ohair at Sun.COM (Kelly O'Hair) Date: Tue, 02 Feb 2010 18:04:59 -0800 Subject: Potential update of JAXP sources in OpenJDK (b18) In-Reply-To: <4B68D460.2040300@sun.com> References: <4B68AA41.8030400@sun.com> <1ccfd1c11002021631t47e471fbh590dc058081d8c44@mail.gmail.com> <4B68D460.2040300@sun.com> Message-ID: <4B68D9CB.5030602@sun.com> FYI... The jaxws files were split into two source drops, jdk7-jaxws-2009_09_28.zip and jdk7-jaf-2009_08_28.zip. The repositories themselves contain (in their history) the original source, which is the same source as in the kenai drop bundles I created. It would be nice if the JAXP and JAXWS teams kept a copy of those bundles on their java.net site, just for the record. I think the jaxws bundle will be updated soon to a java.net site, but we need to make sure that the jdk7-jaf-2009_08_28.zip bundle isn't forgotten about. Not sure where to put that one, I suppose we just create a small java.net project to hold it? I had planned on killing off that jdk7-drops kenai project at some point anyway, but didn't expect it to die on me... :^( -kto On 2/2/10 5:41 PM, Joseph D. Darcy wrote: > Martin Buchholz wrote: >> Vaguely related reminder: >> some of the jax* "drops" are hosted on kenai.com, >> and that hosting service is expected to go away. >> > > Yep, already addressed: > > http://hg.openjdk.java.net/jdk6/jdk6-gate/jaxp/rev/f23bb60a908d > > # HG changeset patch > # User ohair > # Date 1264727287 28800 > # Node ID f23bb60a908d08903dbadaee4b1a785482a7bde0 > # Parent e69b78c54335f3e7cb5e25e0be67e62b02166867 > 6894833: Upgrade jaxp drop source bundle > Reviewed-by: darcy > > --- a/jaxp.properties Sun Nov 08 23:46:36 2009 +0000 > +++ b/jaxp.properties Thu Jan 28 17:08:07 2010 -0800 > @@ -24,10 +24,10 @@ > # > > drops.master.copy.base=${drops.dir} > -drops.master.url.base=http://kenai.com/projects/jdk6-drops/downloads/download > > +drops.master.url.base=https://jaxp.dev.java.net/files/documents/913/147329 > > -jaxp_src.bundle.name=jdk6-jaxp-2009_10_27.zip > -jaxp_src.bundle.md5.checksum=0bb03bbd7b1b6d87cc65772c6adb2d6a > +jaxp_src.bundle.name=jdk6-jaxp-2009_10_13.zip > +jaxp_src.bundle.md5.checksum=a2f7b972124cd776ff71e7754eb9a429 > jaxp_src.master.bundle.dir=${drops.master.copy.base} > jaxp_src.master.bundle.url.base=${drops.master.url.base} > > > -Joe > > > From Kelly.Ohair at Sun.COM Tue Feb 2 18:12:02 2010 From: Kelly.Ohair at Sun.COM (Kelly O'Hair) Date: Tue, 02 Feb 2010 18:12:02 -0800 Subject: Potential update of JAXP sources in OpenJDK (b18) In-Reply-To: <4B68AA41.8030400@sun.com> References: <4B68AA41.8030400@sun.com> Message-ID: <4B68DB72.6040400@sun.com> Just for the record, the plan is to hold off on JAXP 1.4.3 until openjdk6 B19. (JAXP 1.4.3 should show up in openjdk7 M6). -kto From Joe.Darcy at Sun.COM Wed Feb 3 10:50:21 2010 From: Joe.Darcy at Sun.COM (Joseph D. Darcy) Date: Wed, 03 Feb 2010 10:50:21 -0800 Subject: Potential update of JAXP sources in OpenJDK (b18) In-Reply-To: <4B68DB72.6040400@sun.com> References: <4B68AA41.8030400@sun.com> <4B68DB72.6040400@sun.com> Message-ID: <4B69C56D.4090103@sun.com> Kelly O'Hair wrote: > Just for the record, the plan is to hold off on JAXP 1.4.3 until > openjdk6 B19. > (JAXP 1.4.3 should show up in openjdk7 M6). > Yes, b18 has been open for a while and I'd like to put the finishing touches on b18 in the near future before accepting any large or non-critical fixes. -Joe From gnu_andrew at member.fsf.org Wed Feb 3 11:38:50 2010 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Wed, 3 Feb 2010 19:38:50 +0000 Subject: Potential update of JAXP sources in OpenJDK (b18) In-Reply-To: <4B68D460.2040300@sun.com> References: <4B68AA41.8030400@sun.com> <1ccfd1c11002021631t47e471fbh590dc058081d8c44@mail.gmail.com> <4B68D460.2040300@sun.com> Message-ID: <17c6771e1002031138r125760a6l23484de25b7cc516@mail.gmail.com> On 3 February 2010 01:41, Joseph D. Darcy wrote: > Martin Buchholz wrote: >> >> Vaguely related reminder: >> some of the jax* "drops" are hosted on kenai.com, >> and that hosting service is expected to go away. >> >> > > Yep, already addressed: > > http://hg.openjdk.java.net/jdk6/jdk6-gate/jaxp/rev/f23bb60a908d > > # HG changeset patch > # User ohair > # Date 1264727287 28800 > # Node ID f23bb60a908d08903dbadaee4b1a785482a7bde0 > # Parent e69b78c54335f3e7cb5e25e0be67e62b02166867 > 6894833: Upgrade jaxp drop source bundle > Reviewed-by: darcy > > --- a/jaxp.properties ? Sun Nov 08 23:46:36 2009 +0000 > +++ b/jaxp.properties ? Thu Jan 28 17:08:07 2010 -0800 > @@ -24,10 +24,10 @@ > # > > drops.master.copy.base=${drops.dir} > -drops.master.url.base=http://kenai.com/projects/jdk6-drops/downloads/download > +drops.master.url.base=https://jaxp.dev.java.net/files/documents/913/147329 > > -jaxp_src.bundle.name=jdk6-jaxp-2009_10_27.zip > -jaxp_src.bundle.md5.checksum=0bb03bbd7b1b6d87cc65772c6adb2d6a > +jaxp_src.bundle.name=jdk6-jaxp-2009_10_13.zip > +jaxp_src.bundle.md5.checksum=a2f7b972124cd776ff71e7754eb9a429 > jaxp_src.master.bundle.dir=${drops.master.copy.base} > jaxp_src.master.bundle.url.base=${drops.master.url.base} > > > -Joe > > > > Yes, but JAXWS on both 6 & 7 are still prone. -- 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 Erik.Trimble at Sun.COM Thu Feb 11 20:06:15 2010 From: Erik.Trimble at Sun.COM (Erik Trimble) Date: Thu, 11 Feb 2010 20:06:15 -0800 Subject: [Fwd: Tags for Hotspot build numbers...] Message-ID: <4B74D3B7.1030505@sun.com> This announcement also applies to the HSX16 repos. -Erik -------- Original Message -------- Subject: Tags for Hotspot build numbers... Date: Thu, 11 Feb 2010 20:03:29 -0800 From: Erik Trimble Organization: Sun Microsystems To: jdk7-dev at openjdk.java.net In accordance with a longstanding request, I've now tagged all the proper changesets in Hotspot 17 with the correct build numbers. That is, from now on, I will be tagging the tip of each build with a Hotspot-specific tag, to allow for easy identification as to where a given build was taken from. All tags are in the form of: hsX[.Y]-bZ Where: X is the major Hotspot version number Y is the optional minor version number Z is the build number, with a leading '0' if under 10. e.g. hs17-b09 is the latest These numbers correspond to the following values found in the make/hotspot_version file: X = HS_MAJOR_VER Y = HS_MINOR_VER (if /not/ 0 - if it is 0, then I'll be omitting it from the tag) Z = HS_BUILD_NUMBER I will be going back and tagging build numbers in the main repos (and all subsidiary repos) starting at least at Hotspot 15. -- Erik Trimble Java System Support Mailstop: usca22-123 Phone: x17195 Santa Clara, CA -- Erik Trimble Java System Support Mailstop: usca22-123 Phone: x17195 Santa Clara, CA From gnu_andrew at member.fsf.org Thu Feb 11 23:00:44 2010 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Fri, 12 Feb 2010 07:00:44 +0000 Subject: [Fwd: Tags for Hotspot build numbers...] In-Reply-To: <4B74D3B7.1030505@sun.com> References: <4B74D3B7.1030505@sun.com> Message-ID: <17c6771e1002112300r3d86984cla54cd523996d2dfd@mail.gmail.com> On 12 February 2010 04:06, Erik Trimble wrote: > This announcement also applies to the HSX16 repos. > > -Erik > > > -------- Original Message -------- > Subject: ? ? ? ?Tags for Hotspot build numbers... > Date: ? Thu, 11 Feb 2010 20:03:29 -0800 > From: ? Erik Trimble > Organization: ? Sun Microsystems > To: ? ? jdk7-dev at openjdk.java.net > > > > In accordance with a longstanding request, I've now tagged all the proper > changesets in Hotspot 17 with the correct build numbers. > > That is, from now on, I will be tagging the tip of each build with a > Hotspot-specific tag, to allow for easy identification as to where a given > build was taken from. > > All tags are in the form of: ? ?hsX[.Y]-bZ > > Where: > ?X is the major Hotspot version number > ?Y is the optional minor version number > ?Z is the build number, with a leading '0' if under 10. > > e.g. > ? ? ?hs17-b09 is the latest > > These numbers correspond to the following values found in the > make/hotspot_version file: > ?X = HS_MAJOR_VER > ?Y = HS_MINOR_VER ?(if /not/ 0 - if it is 0, then I'll be omitting it from > the tag) > ?Z = HS_BUILD_NUMBER > > > > I will be going back and tagging build numbers in the main repos (and all > subsidiary repos) starting at least at Hotspot 15. > > > -- > Erik Trimble > Java System Support > Mailstop: ?usca22-123 > Phone: ?x17195 > Santa Clara, CA > > > > -- > Erik Trimble > Java System Support > Mailstop: ?usca22-123 > Phone: ?x17195 > Santa Clara, CA > > Thanks! Much appreciated. -- 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 gnu_andrew at member.fsf.org Thu Feb 11 23:16:05 2010 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Fri, 12 Feb 2010 07:16:05 +0000 Subject: [PATCH FOR REVIEW} Old Nimbus package in installed LAFs Message-ID: <17c6771e1002112316w6856a7dhcedf27dc533d067a@mail.gmail.com> The other day, I spotted that the UIManager in OpenJDK6 is still listing Nimbus under the javax.swing.plaf.nimbus namespace. This webrev: http://cr.openjdk.java.net/~andrew/nimbus/webrev.06/jdk.patch corrects it. Ok to push? -- 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 Joe.Darcy at Sun.COM Thu Feb 11 23:58:20 2010 From: Joe.Darcy at Sun.COM (Joseph D. Darcy) Date: Thu, 11 Feb 2010 23:58:20 -0800 Subject: [PATCH FOR REVIEW} Old Nimbus package in installed LAFs In-Reply-To: <17c6771e1002112316w6856a7dhcedf27dc533d067a@mail.gmail.com> References: <17c6771e1002112316w6856a7dhcedf27dc533d067a@mail.gmail.com> Message-ID: <4B750A1C.5060906@sun.com> Andrew John Hughes wrote: > The other day, I spotted that the UIManager in OpenJDK6 is still > listing Nimbus under the javax.swing.plaf.nimbus namespace. > > This webrev: > > http://cr.openjdk.java.net/~andrew/nimbus/webrev.06/jdk.patch > > corrects it. Ok to push? > Approved to be pushed. Thanks, -Joe From Joe.Darcy at Sun.COM Fri Feb 12 00:03:47 2010 From: Joe.Darcy at Sun.COM (Joseph D. Darcy) Date: Fri, 12 Feb 2010 00:03:47 -0800 Subject: [PATCH FOR REVIEW} Old Nimbus package in installed LAFs In-Reply-To: <4B750A1C.5060906@sun.com> References: <17c6771e1002112316w6856a7dhcedf27dc533d067a@mail.gmail.com> <4B750A1C.5060906@sun.com> Message-ID: <4B750B63.9050002@sun.com> Joseph D. Darcy wrote: > Andrew John Hughes wrote: >> The other day, I spotted that the UIManager in OpenJDK6 is still >> listing Nimbus under the javax.swing.plaf.nimbus namespace. >> >> This webrev: >> >> http://cr.openjdk.java.net/~andrew/nimbus/webrev.06/jdk.patch >> >> corrects it. Ok to push? >> > > Approved to be pushed. > > Thanks, > PS Please use bug 6925892 "OpenJDK 6 UIManager uses wrong Nimbus package" for this change. -Joe From ahughes at redhat.com Fri Feb 12 00:48:37 2010 From: ahughes at redhat.com (ahughes at redhat.com) Date: Fri, 12 Feb 2010 08:48:37 +0000 Subject: hg: jdk6/jdk6/jdk: 2 new changesets Message-ID: <20100212084902.CEED741C9B@hg.openjdk.java.net> Changeset: 370777e1720e Author: andrew Date: 2010-02-12 08:44 +0000 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/370777e1720e 6925892: OpenJDK 6 UIManager uses wrong Nimbus package Summary: Nimbus look and feel was renamed in OpenJDK7->6 and should be reflected in UIManager Reviewed-by: darcy ! src/share/classes/javax/swing/UIManager.java Changeset: 97d82380281e Author: andrew Date: 2010-02-12 08:48 +0000 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/97d82380281e 6897844: Fix broken build on newer versions of X11 (libXext >= 1.1.0) Summary: Recent changes to X11's header structure break the build Reviewed-by: prr, flar Contributed-by: Diego ! src/solaris/native/sun/awt/awt_GraphicsEnv.h From gnu_andrew at member.fsf.org Fri Feb 12 00:50:16 2010 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Fri, 12 Feb 2010 08:50:16 +0000 Subject: [PATCH FOR REVIEW} Old Nimbus package in installed LAFs In-Reply-To: <4B750B63.9050002@sun.com> References: <17c6771e1002112316w6856a7dhcedf27dc533d067a@mail.gmail.com> <4B750A1C.5060906@sun.com> <4B750B63.9050002@sun.com> Message-ID: <17c6771e1002120050n7da1dc84p3c59e296780eaa23@mail.gmail.com> On 12 February 2010 08:03, Joseph D. Darcy wrote: > Joseph D. Darcy wrote: >> >> Andrew John Hughes wrote: >>> >>> The other day, I spotted that the UIManager in OpenJDK6 is still >>> listing Nimbus under the javax.swing.plaf.nimbus namespace. >>> >>> This webrev: >>> >>> http://cr.openjdk.java.net/~andrew/nimbus/webrev.06/jdk.patch >>> >>> corrects it. ?Ok to push? >>> >> >> Approved to be pushed. >> >> Thanks, >> > > PS Please use bug 6925892 "OpenJDK 6 UIManager uses wrong Nimbus package" > for this change. > > -Joe > Done; http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/370777e1720e -- 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 gnu_andrew at member.fsf.org Fri Feb 12 00:50:57 2010 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Fri, 12 Feb 2010 08:50:57 +0000 Subject: Fwd: hg: jdk7/swing/jdk: 6921289: (tz) Support tzdata2010b In-Reply-To: <20100212054632.EE31041C63@hg.openjdk.java.net> References: <20100212054632.EE31041C63@hg.openjdk.java.net> Message-ID: <17c6771e1002120050i4e440953q49a56d38dd5ef59b@mail.gmail.com> Ok to backport this to jdk6 so we're still up-to-date with regard to timezone data? ---------- Forwarded message ---------- From: Date: 12 February 2010 05:46 Subject: hg: jdk7/swing/jdk: 6921289: (tz) Support tzdata2010b To: jdk7-changes at openjdk.java.net, swing-dev at openjdk.java.net Changeset: e2b58a45a426 Author: ? ?peytoia Date: ? ? ?2010-02-12 14:38 +0900 URL: ? ? ? http://hg.openjdk.java.net/jdk7/swing/jdk/rev/e2b58a45a426 6921289: (tz) Support tzdata2010b Reviewed-by: okutsu ! make/sun/javazic/tzdata/VERSION ! make/sun/javazic/tzdata/antarctica ! make/sun/javazic/tzdata/asia ! make/sun/javazic/tzdata/australasia ! make/sun/javazic/tzdata/europe ! make/sun/javazic/tzdata/northamerica ! make/sun/javazic/tzdata/zone.tab ! src/share/classes/sun/util/resources/TimeZoneNames.java ! src/share/classes/sun/util/resources/TimeZoneNames_de.java ! src/share/classes/sun/util/resources/TimeZoneNames_es.java ! src/share/classes/sun/util/resources/TimeZoneNames_fr.java ! src/share/classes/sun/util/resources/TimeZoneNames_it.java ! src/share/classes/sun/util/resources/TimeZoneNames_ja.java ! src/share/classes/sun/util/resources/TimeZoneNames_ko.java ! src/share/classes/sun/util/resources/TimeZoneNames_sv.java ! src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java ! src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java -- 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 Joe.Darcy at Sun.COM Fri Feb 12 00:57:30 2010 From: Joe.Darcy at Sun.COM (Joseph D. Darcy) Date: Fri, 12 Feb 2010 00:57:30 -0800 Subject: Fwd: hg: jdk7/swing/jdk: 6921289: (tz) Support tzdata2010b In-Reply-To: <17c6771e1002120050i4e440953q49a56d38dd5ef59b@mail.gmail.com> References: <20100212054632.EE31041C63@hg.openjdk.java.net> <17c6771e1002120050i4e440953q49a56d38dd5ef59b@mail.gmail.com> Message-ID: <4B7517FA.7080706@sun.com> Andrew John Hughes wrote: > Ok to backport this to jdk6 so we're still up-to-date with regard to > timezone data? > Certainly! -Joe From ahughes at redhat.com Fri Feb 12 02:04:33 2010 From: ahughes at redhat.com (ahughes at redhat.com) Date: Fri, 12 Feb 2010 10:04:33 +0000 Subject: hg: jdk6/jdk6/jdk: 6921289: (tz) Support tzdata2010b Message-ID: <20100212100446.1FD4841CB2@hg.openjdk.java.net> Changeset: a3cd817dcc2e Author: peytoia Date: 2010-02-12 14:38 +0900 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/a3cd817dcc2e 6921289: (tz) Support tzdata2010b Reviewed-by: okutsu ! make/sun/javazic/tzdata/VERSION ! make/sun/javazic/tzdata/antarctica ! make/sun/javazic/tzdata/asia ! make/sun/javazic/tzdata/australasia ! make/sun/javazic/tzdata/europe ! make/sun/javazic/tzdata/northamerica ! make/sun/javazic/tzdata/zone.tab ! src/share/classes/sun/util/resources/TimeZoneNames.java ! src/share/classes/sun/util/resources/TimeZoneNames_de.java ! src/share/classes/sun/util/resources/TimeZoneNames_es.java ! src/share/classes/sun/util/resources/TimeZoneNames_fr.java ! src/share/classes/sun/util/resources/TimeZoneNames_it.java ! src/share/classes/sun/util/resources/TimeZoneNames_ja.java ! src/share/classes/sun/util/resources/TimeZoneNames_ko.java ! src/share/classes/sun/util/resources/TimeZoneNames_sv.java ! src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java ! src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java From gnu_andrew at member.fsf.org Fri Feb 12 02:12:40 2010 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Fri, 12 Feb 2010 10:12:40 +0000 Subject: Fwd: hg: jdk7/swing/jdk: 6921289: (tz) Support tzdata2010b In-Reply-To: <4B7517FA.7080706@sun.com> References: <20100212054632.EE31041C63@hg.openjdk.java.net> <17c6771e1002120050i4e440953q49a56d38dd5ef59b@mail.gmail.com> <4B7517FA.7080706@sun.com> Message-ID: <17c6771e1002120212w6dcc0cfep25556d98974c23f0@mail.gmail.com> On 12 February 2010 08:57, Joseph D. Darcy wrote: > Andrew John Hughes wrote: >> >> Ok to backport this to jdk6 so we're still up-to-date with regard to >> timezone data? >> > > Certainly! > > -Joe > Thanks! Done: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/a3cd817dcc2e -- 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 sridharavulapati at gmail.com Fri Feb 12 04:46:41 2010 From: sridharavulapati at gmail.com (Sridhar Avulapati) Date: Fri, 12 Feb 2010 18:16:41 +0530 Subject: Unsubscribe from this mailing-list Message-ID: On Fri, Feb 12, 2010 at 3:42 PM, Andrew John Hughes < gnu_andrew at member.fsf.org> wrote: > On 12 February 2010 08:57, Joseph D. Darcy wrote: > > Andrew John Hughes wrote: > >> > >> Ok to backport this to jdk6 so we're still up-to-date with regard to > >> timezone data? > >> > > > > Certainly! > > > > -Joe > > > > Thanks! Done: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/a3cd817dcc2e > -- > 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 > -- Best Regards, Sridhar Avulapati (: +91 9985504463 -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/jdk6-dev/attachments/20100212/0f7bfa62/attachment.html From ahughes at redhat.com Tue Feb 16 13:34:53 2010 From: ahughes at redhat.com (ahughes at redhat.com) Date: Tue, 16 Feb 2010 21:34:53 +0000 Subject: hg: jdk6/jdk6/jdk: 6737700: api/javax_swing/table/DefaultTableCellRenderer/index.html#getset:DefaultTableCellRenderer Message-ID: <20100216213524.5552F423B7@hg.openjdk.java.net> Changeset: 9f596519c6cc Author: malenkov Date: 2009-06-24 17:45 +0400 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/9f596519c6cc 6737700: api/javax_swing/table/DefaultTableCellRenderer/index.html#getset:DefaultTableCellRenderer Reviewed-by: alexp ! src/share/classes/javax/swing/table/DefaultTableCellRenderer.java From gnu_andrew at member.fsf.org Tue Feb 16 13:48:17 2010 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Tue, 16 Feb 2010 21:48:17 +0000 Subject: Testing status of current OpenJDK 6 sources, ready for b18? In-Reply-To: <4B7AE746.1000206@sun.com> References: <4B689893.6090800@sun.com> <17c6771e1002021656u14cd32cax5c4d3898cabc8499@mail.gmail.com> <4B68CE1B.10208@sun.com> <17c6771e1002030756j52ef4451k1a1e3170dfa0fad2@mail.gmail.com> <4B723093.2060107@sun.com> <17c6771e1002101206o44beca9ahdd8e411c1c676bb2@mail.gmail.com> <4B743962.8010608@sun.com> <17c6771e1002120110n6aac11b7u77f9d2bc2ef06d4b@mail.gmail.com> <4B7594BE.8060109@sun.com> <4B7AE746.1000206@sun.com> Message-ID: <17c6771e1002161348i7b13287ardf2ca3af3fe7ab57@mail.gmail.com> > > Hello. > > My repos have been synced and the tests look pretty good; all the HotSpot > and langtools tests pass and the testing situation for jdk is an improvement > over the previous build: > > 0: b17-jdk/summary.txt ?pass: 3,118; fail: 26 > 1: b18-jdk/summary.txt ?pass: 3,149; fail: 18; error: 2 > > 0 ? ? ?1 ? ? ?Test > --- ? ?pass ? com/sun/java/swing/plaf/nimbus/Test6741426.java > --- ? ?pass ? com/sun/java/swing/plaf/nimbus/Test6849805.java > --- ? ?pass ? com/sun/jdi/BreakpointWithFullGC.sh > --- ? ?pass ? com/sun/jdi/ResumeOneThreadTest.java > --- ? ?pass ? com/sun/jdi/SimulResumerTest.java > --- ? ?pass ? demo/jvmti/compiledMethodLoad/CompiledMethodLoadTest.java > fail ? pass ? java/awt/Frame/DynamicLayout/DynamicLayout.java > fail ? pass ? java/awt/Frame/MaximizedToIconified/MaximizedToIconified.java > fail ? pass > java/awt/Frame/ShownOffScreenOnWin98/ShownOffScreenOnWin98Test.java > fail ? pass > java/awt/Frame/UnfocusableMaximizedFrameResizablity/UnfocusableMaximizedFrameResizablity.java > --- ? ?pass ? java/awt/GraphicsDevice/CloneConfigsTest.java > fail ? pass ? java/awt/GridLayout/LayoutExtraGaps/LayoutExtraGaps.java > fail ? pass ? java/awt/Insets/CombinedTestApp1.java > fail ? pass > java/awt/KeyboardFocusmanager/TypeAhead/ButtonActionKeyTest/ButtonActionKeyTest.html > fail ? pass > java/awt/KeyboardFocusmanager/TypeAhead/MenuItemActivatedTest/MenuItemActivatedTest.html > fail ? pass > java/awt/KeyboardFocusmanager/TypeAhead/SubMenuShowTest/SubMenuShowTest.html > fail ? pass > java/awt/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.html > pass ? fail > java/awt/Multiscreen/LocationRelativeToTest/LocationRelativeToTest.java > fail ? pass ? java/awt/TextArea/UsingWithMouse/SelectionAutoscrollTest.html > fail ? pass ? java/awt/Toolkit/ScreenInsetsTest/ScreenInsetsTest.java > pass ? --- ? ?java/awt/Window/AlwaysOnTop/AlwaysOnTopEvenOfWindow.java > pass ? fail ? java/awt/Window/GrabSequence/GrabSequence.java > fail ? pass ? java/awt/event/KeyEvent/CorrectTime/CorrectTime.java > fail ? pass ? java/awt/grab/EmbeddedFrameTest1/EmbeddedFrameTest1.java > pass ? fail ? java/awt/print/PrinterJob/ExceptionTest.java > --- ? ?pass ? java/lang/ClassLoader/UninitializedParent.java > pass ? fail ? java/net/Socket/AccurateTimeout.java > pass ? fail ? java/net/ipv6tests/TcpTest.java > pass ? fail ? java/nio/channels/SocketChannel/AdaptSocket.java > pass ? fail ? java/nio/channels/SocketChannel/LocalAddress.java > pass ? fail ? java/nio/channels/SocketChannel/Shutdown.java > --- ? ?pass ? java/util/TimeZone/OldIDMappingTest.sh > --- ? ?pass ? java/util/TimeZone/TimeZoneDatePermissionCheck.sh > --- ? ?pass ? javax/swing/JButton/6604281/bug6604281.java > fail ? pass ? javax/swing/JTextArea/Test6593649.java > --- ? ?pass ? javax/swing/Security/6657138/ComponentTest.java > --- ? ?pass ? javax/swing/Security/6657138/bug6657138.java > --- ? ?pass ? javax/swing/ToolTipManager/Test6657026.java > --- ? ?pass ? javax/swing/UIManager/Test6657026.java > --- ? ?pass ? javax/swing/plaf/basic/BasicSplitPaneUI/Test6657026.java > --- ? ?pass ? javax/swing/plaf/metal/MetalBorders/Test6657026.java > --- ? ?pass ? javax/swing/plaf/metal/MetalBumps/Test6657026.java > --- ? ?pass ? javax/swing/plaf/metal/MetalInternalFrameUI/Test6657026.java > --- ? ?pass ? javax/swing/plaf/metal/MetalSliderUI/Test6657026.java > pass ? error ?sun/java2d/OpenGL/GradientPaints.java > pass ? fail ? sun/rmi/transport/proxy/EagerHttpFallback.java > --- ? ?pass > sun/security/provider/certpath/DisabledAlgorithms/CPBuilder.java > --- ? ?pass > sun/security/provider/certpath/DisabledAlgorithms/CPValidatorEndEntity.java > --- ? ?pass > sun/security/provider/certpath/DisabledAlgorithms/CPValidatorIntermediate.java > --- ? ?pass > sun/security/provider/certpath/DisabledAlgorithms/CPValidatorTrustAnchor.java > pass ? error > ?sun/security/ssl/javax/net/ssl/NewAPIs/SessionTimeOutTests.java > --- ? ?pass ? sun/security/tools/jarsigner/emptymanifest.sh > --- ? ?pass ? sun/security/util/DerValue/BadValue.java > fail ? pass ? sun/tools/jhat/HatHeapDump1Test.java > fail ? pass ? sun/tools/native2ascii/NativeErrors.java > > 55 differences > > (These tests are run off of Sun's WAN so a few of the networking tests still > fail even when provided a config file to point elsewhere.) > > I'd prefer to get b18 tagged later this week. > > Cheers, > > -Joe > > > I think we're good to go, at long last :-) Cheers, -- 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 Joe.Darcy at Sun.COM Tue Feb 16 13:58:08 2010 From: Joe.Darcy at Sun.COM (Joseph D. Darcy) Date: Tue, 16 Feb 2010 13:58:08 -0800 Subject: Testing status of current OpenJDK 6 sources, ready for b18? In-Reply-To: <17c6771e1002161348i7b13287ardf2ca3af3fe7ab57@mail.gmail.com> References: <4B689893.6090800@sun.com> <17c6771e1002021656u14cd32cax5c4d3898cabc8499@mail.gmail.com> <4B68CE1B.10208@sun.com> <17c6771e1002030756j52ef4451k1a1e3170dfa0fad2@mail.gmail.com> <4B723093.2060107@sun.com> <17c6771e1002101206o44beca9ahdd8e411c1c676bb2@mail.gmail.com> <4B743962.8010608@sun.com> <17c6771e1002120110n6aac11b7u77f9d2bc2ef06d4b@mail.gmail.com> <4B7594BE.8060109@sun.com> <4B7AE746.1000206@sun.com> <17c6771e1002161348i7b13287ardf2ca3af3fe7ab57@mail.gmail.com> Message-ID: <4B7B14F0.50103@sun.com> Andrew John Hughes wrote: >> Hello. >> >> My repos have been synced and the tests look pretty good; all the HotSpot >> and langtools tests pass and the testing situation for jdk is an improvement >> over the previous build: >> >> 0: b17-jdk/summary.txt pass: 3,118; fail: 26 >> 1: b18-jdk/summary.txt pass: 3,149; fail: 18; error: 2 >> >> 0 1 Test >> --- pass com/sun/java/swing/plaf/nimbus/Test6741426.java >> --- pass com/sun/java/swing/plaf/nimbus/Test6849805.java >> --- pass com/sun/jdi/BreakpointWithFullGC.sh >> --- pass com/sun/jdi/ResumeOneThreadTest.java >> --- pass com/sun/jdi/SimulResumerTest.java >> --- pass demo/jvmti/compiledMethodLoad/CompiledMethodLoadTest.java >> fail pass java/awt/Frame/DynamicLayout/DynamicLayout.java >> fail pass java/awt/Frame/MaximizedToIconified/MaximizedToIconified.java >> fail pass >> java/awt/Frame/ShownOffScreenOnWin98/ShownOffScreenOnWin98Test.java >> fail pass >> java/awt/Frame/UnfocusableMaximizedFrameResizablity/UnfocusableMaximizedFrameResizablity.java >> --- pass java/awt/GraphicsDevice/CloneConfigsTest.java >> fail pass java/awt/GridLayout/LayoutExtraGaps/LayoutExtraGaps.java >> fail pass java/awt/Insets/CombinedTestApp1.java >> fail pass >> java/awt/KeyboardFocusmanager/TypeAhead/ButtonActionKeyTest/ButtonActionKeyTest.html >> fail pass >> java/awt/KeyboardFocusmanager/TypeAhead/MenuItemActivatedTest/MenuItemActivatedTest.html >> fail pass >> java/awt/KeyboardFocusmanager/TypeAhead/SubMenuShowTest/SubMenuShowTest.html >> fail pass >> java/awt/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.html >> pass fail >> java/awt/Multiscreen/LocationRelativeToTest/LocationRelativeToTest.java >> fail pass java/awt/TextArea/UsingWithMouse/SelectionAutoscrollTest.html >> fail pass java/awt/Toolkit/ScreenInsetsTest/ScreenInsetsTest.java >> pass --- java/awt/Window/AlwaysOnTop/AlwaysOnTopEvenOfWindow.java >> pass fail java/awt/Window/GrabSequence/GrabSequence.java >> fail pass java/awt/event/KeyEvent/CorrectTime/CorrectTime.java >> fail pass java/awt/grab/EmbeddedFrameTest1/EmbeddedFrameTest1.java >> pass fail java/awt/print/PrinterJob/ExceptionTest.java >> --- pass java/lang/ClassLoader/UninitializedParent.java >> pass fail java/net/Socket/AccurateTimeout.java >> pass fail java/net/ipv6tests/TcpTest.java >> pass fail java/nio/channels/SocketChannel/AdaptSocket.java >> pass fail java/nio/channels/SocketChannel/LocalAddress.java >> pass fail java/nio/channels/SocketChannel/Shutdown.java >> --- pass java/util/TimeZone/OldIDMappingTest.sh >> --- pass java/util/TimeZone/TimeZoneDatePermissionCheck.sh >> --- pass javax/swing/JButton/6604281/bug6604281.java >> fail pass javax/swing/JTextArea/Test6593649.java >> --- pass javax/swing/Security/6657138/ComponentTest.java >> --- pass javax/swing/Security/6657138/bug6657138.java >> --- pass javax/swing/ToolTipManager/Test6657026.java >> --- pass javax/swing/UIManager/Test6657026.java >> --- pass javax/swing/plaf/basic/BasicSplitPaneUI/Test6657026.java >> --- pass javax/swing/plaf/metal/MetalBorders/Test6657026.java >> --- pass javax/swing/plaf/metal/MetalBumps/Test6657026.java >> --- pass javax/swing/plaf/metal/MetalInternalFrameUI/Test6657026.java >> --- pass javax/swing/plaf/metal/MetalSliderUI/Test6657026.java >> pass error sun/java2d/OpenGL/GradientPaints.java >> pass fail sun/rmi/transport/proxy/EagerHttpFallback.java >> --- pass >> sun/security/provider/certpath/DisabledAlgorithms/CPBuilder.java >> --- pass >> sun/security/provider/certpath/DisabledAlgorithms/CPValidatorEndEntity.java >> --- pass >> sun/security/provider/certpath/DisabledAlgorithms/CPValidatorIntermediate.java >> --- pass >> sun/security/provider/certpath/DisabledAlgorithms/CPValidatorTrustAnchor.java >> pass error >> sun/security/ssl/javax/net/ssl/NewAPIs/SessionTimeOutTests.java >> --- pass sun/security/tools/jarsigner/emptymanifest.sh >> --- pass sun/security/util/DerValue/BadValue.java >> fail pass sun/tools/jhat/HatHeapDump1Test.java >> fail pass sun/tools/native2ascii/NativeErrors.java >> >> 55 differences >> >> (These tests are run off of Sun's WAN so a few of the networking tests still >> fail even when provided a config file to point elsewhere.) >> >> I'd prefer to get b18 tagged later this week. >> >> Cheers, >> >> -Joe >> >> >> >> > > I think we're good to go, at long last :-) > > After one last sanity-check round of building and testing on my end, assuming all goes well I'll tag the repos for b18 :-) -Joe From joe.darcy at sun.com Tue Feb 16 18:38:58 2010 From: joe.darcy at sun.com (joe.darcy at sun.com) Date: Wed, 17 Feb 2010 02:38:58 +0000 Subject: hg: jdk6/jdk6/corba: Added tag jdk6-b18 for changeset 05436b84e93a Message-ID: <20100217023901.22BBF4240C@hg.openjdk.java.net> Changeset: c5787364fdd9 Author: darcy Date: 2010-02-16 18:34 -0800 URL: http://hg.openjdk.java.net/jdk6/jdk6/corba/rev/c5787364fdd9 Added tag jdk6-b18 for changeset 05436b84e93a ! .hgtags From joe.darcy at sun.com Tue Feb 16 18:39:55 2010 From: joe.darcy at sun.com (joe.darcy at sun.com) Date: Wed, 17 Feb 2010 02:39:55 +0000 Subject: hg: jdk6/jdk6/jaxp: Added tag jdk6-b18 for changeset 5df1daaa67c8 Message-ID: <20100217023955.CDFA34240E@hg.openjdk.java.net> Changeset: c06186dcb907 Author: darcy Date: 2010-02-16 18:35 -0800 URL: http://hg.openjdk.java.net/jdk6/jdk6/jaxp/rev/c06186dcb907 Added tag jdk6-b18 for changeset 5df1daaa67c8 ! .hgtags From joe.darcy at sun.com Tue Feb 16 18:40:09 2010 From: joe.darcy at sun.com (joe.darcy at sun.com) Date: Wed, 17 Feb 2010 02:40:09 +0000 Subject: hg: jdk6/jdk6/jaxws: Added tag jdk6-b18 for changeset b1a4cd568b60 Message-ID: <20100217024009.417F842410@hg.openjdk.java.net> Changeset: 961cf80a02a8 Author: darcy Date: 2010-02-16 18:35 -0800 URL: http://hg.openjdk.java.net/jdk6/jdk6/jaxws/rev/961cf80a02a8 Added tag jdk6-b18 for changeset b1a4cd568b60 ! .hgtags From joe.darcy at sun.com Tue Feb 16 18:40:38 2010 From: joe.darcy at sun.com (joe.darcy at sun.com) Date: Wed, 17 Feb 2010 02:40:38 +0000 Subject: hg: jdk6/jdk6/hotspot: Added tag jdk6-b18 for changeset 7dbe24cb959c Message-ID: <20100217024047.D45DB42413@hg.openjdk.java.net> Changeset: bf309b7593a3 Author: darcy Date: 2010-02-16 18:35 -0800 URL: http://hg.openjdk.java.net/jdk6/jdk6/hotspot/rev/bf309b7593a3 Added tag jdk6-b18 for changeset 7dbe24cb959c ! .hgtags From joe.darcy at sun.com Tue Feb 16 18:41:31 2010 From: joe.darcy at sun.com (joe.darcy at sun.com) Date: Wed, 17 Feb 2010 02:41:31 +0000 Subject: hg: jdk6/jdk6/langtools: Added tag jdk6-b18 for changeset 536fbf4fba1f Message-ID: <20100217024133.6AC2142415@hg.openjdk.java.net> Changeset: 9fff4785c52d Author: darcy Date: 2010-02-16 18:35 -0800 URL: http://hg.openjdk.java.net/jdk6/jdk6/langtools/rev/9fff4785c52d Added tag jdk6-b18 for changeset 536fbf4fba1f ! .hgtags From joe.darcy at sun.com Tue Feb 16 18:42:09 2010 From: joe.darcy at sun.com (joe.darcy at sun.com) Date: Wed, 17 Feb 2010 02:42:09 +0000 Subject: hg: jdk6/jdk6/jdk: Added tag jdk6-b18 for changeset 9f596519c6cc Message-ID: <20100217024221.9149742417@hg.openjdk.java.net> Changeset: fa2068c8ea20 Author: darcy Date: 2010-02-16 18:35 -0800 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/fa2068c8ea20 Added tag jdk6-b18 for changeset 9f596519c6cc ! .hgtags From joe.darcy at sun.com Tue Feb 16 18:43:58 2010 From: joe.darcy at sun.com (joe.darcy at sun.com) Date: Wed, 17 Feb 2010 02:43:58 +0000 Subject: hg: jdk6/jdk6: Added tag jdk6-b18 for changeset 87ed6cf2fb89 Message-ID: <20100217024358.9CBE442419@hg.openjdk.java.net> Changeset: e5ffce975060 Author: darcy Date: 2010-02-16 18:35 -0800 URL: http://hg.openjdk.java.net/jdk6/jdk6/rev/e5ffce975060 Added tag jdk6-b18 for changeset 87ed6cf2fb89 ! .hgtags From Joe.Darcy at Sun.COM Tue Feb 16 18:44:38 2010 From: Joe.Darcy at Sun.COM (Joseph D. Darcy) Date: Tue, 16 Feb 2010 18:44:38 -0800 Subject: Testing status of current OpenJDK 6 sources, ready for b18? In-Reply-To: <4B7B14F0.50103@sun.com> References: <4B689893.6090800@sun.com> <17c6771e1002021656u14cd32cax5c4d3898cabc8499@mail.gmail.com> <4B68CE1B.10208@sun.com> <17c6771e1002030756j52ef4451k1a1e3170dfa0fad2@mail.gmail.com> <4B723093.2060107@sun.com> <17c6771e1002101206o44beca9ahdd8e411c1c676bb2@mail.gmail.com> <4B743962.8010608@sun.com> <17c6771e1002120110n6aac11b7u77f9d2bc2ef06d4b@mail.gmail.com> <4B7594BE.8060109@sun.com> <4B7AE746.1000206@sun.com> <17c6771e1002161348i7b13287ardf2ca3af3fe7ab57@mail.gmail.com> <4B7B14F0.50103@sun.com> Message-ID: <4B7B5816.4090900@sun.com> Joseph D. Darcy wrote: > Andrew John Hughes wrote: >>> Hello. >>> >>> My repos have been synced and the tests look pretty good; all the >>> HotSpot >>> and langtools tests pass and the testing situation for jdk is an >>> improvement >>> over the previous build: >>> >>> 0: b17-jdk/summary.txt pass: 3,118; fail: 26 >>> 1: b18-jdk/summary.txt pass: 3,149; fail: 18; error: 2 >>> >>> 0 1 Test >>> --- pass com/sun/java/swing/plaf/nimbus/Test6741426.java >>> --- pass com/sun/java/swing/plaf/nimbus/Test6849805.java >>> --- pass com/sun/jdi/BreakpointWithFullGC.sh >>> --- pass com/sun/jdi/ResumeOneThreadTest.java >>> --- pass com/sun/jdi/SimulResumerTest.java >>> --- pass demo/jvmti/compiledMethodLoad/CompiledMethodLoadTest.java >>> fail pass java/awt/Frame/DynamicLayout/DynamicLayout.java >>> fail pass >>> java/awt/Frame/MaximizedToIconified/MaximizedToIconified.java >>> fail pass >>> java/awt/Frame/ShownOffScreenOnWin98/ShownOffScreenOnWin98Test.java >>> fail pass >>> java/awt/Frame/UnfocusableMaximizedFrameResizablity/UnfocusableMaximizedFrameResizablity.java >>> >>> --- pass java/awt/GraphicsDevice/CloneConfigsTest.java >>> fail pass java/awt/GridLayout/LayoutExtraGaps/LayoutExtraGaps.java >>> fail pass java/awt/Insets/CombinedTestApp1.java >>> fail pass >>> java/awt/KeyboardFocusmanager/TypeAhead/ButtonActionKeyTest/ButtonActionKeyTest.html >>> >>> fail pass >>> java/awt/KeyboardFocusmanager/TypeAhead/MenuItemActivatedTest/MenuItemActivatedTest.html >>> >>> fail pass >>> java/awt/KeyboardFocusmanager/TypeAhead/SubMenuShowTest/SubMenuShowTest.html >>> >>> fail pass >>> java/awt/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.html >>> pass fail >>> java/awt/Multiscreen/LocationRelativeToTest/LocationRelativeToTest.java >>> fail pass >>> java/awt/TextArea/UsingWithMouse/SelectionAutoscrollTest.html >>> fail pass java/awt/Toolkit/ScreenInsetsTest/ScreenInsetsTest.java >>> pass --- java/awt/Window/AlwaysOnTop/AlwaysOnTopEvenOfWindow.java >>> pass fail java/awt/Window/GrabSequence/GrabSequence.java >>> fail pass java/awt/event/KeyEvent/CorrectTime/CorrectTime.java >>> fail pass java/awt/grab/EmbeddedFrameTest1/EmbeddedFrameTest1.java >>> pass fail java/awt/print/PrinterJob/ExceptionTest.java >>> --- pass java/lang/ClassLoader/UninitializedParent.java >>> pass fail java/net/Socket/AccurateTimeout.java >>> pass fail java/net/ipv6tests/TcpTest.java >>> pass fail java/nio/channels/SocketChannel/AdaptSocket.java >>> pass fail java/nio/channels/SocketChannel/LocalAddress.java >>> pass fail java/nio/channels/SocketChannel/Shutdown.java >>> --- pass java/util/TimeZone/OldIDMappingTest.sh >>> --- pass java/util/TimeZone/TimeZoneDatePermissionCheck.sh >>> --- pass javax/swing/JButton/6604281/bug6604281.java >>> fail pass javax/swing/JTextArea/Test6593649.java >>> --- pass javax/swing/Security/6657138/ComponentTest.java >>> --- pass javax/swing/Security/6657138/bug6657138.java >>> --- pass javax/swing/ToolTipManager/Test6657026.java >>> --- pass javax/swing/UIManager/Test6657026.java >>> --- pass javax/swing/plaf/basic/BasicSplitPaneUI/Test6657026.java >>> --- pass javax/swing/plaf/metal/MetalBorders/Test6657026.java >>> --- pass javax/swing/plaf/metal/MetalBumps/Test6657026.java >>> --- pass >>> javax/swing/plaf/metal/MetalInternalFrameUI/Test6657026.java >>> --- pass javax/swing/plaf/metal/MetalSliderUI/Test6657026.java >>> pass error sun/java2d/OpenGL/GradientPaints.java >>> pass fail sun/rmi/transport/proxy/EagerHttpFallback.java >>> --- pass >>> sun/security/provider/certpath/DisabledAlgorithms/CPBuilder.java >>> --- pass >>> sun/security/provider/certpath/DisabledAlgorithms/CPValidatorEndEntity.java >>> >>> --- pass >>> sun/security/provider/certpath/DisabledAlgorithms/CPValidatorIntermediate.java >>> >>> --- pass >>> sun/security/provider/certpath/DisabledAlgorithms/CPValidatorTrustAnchor.java >>> >>> pass error >>> sun/security/ssl/javax/net/ssl/NewAPIs/SessionTimeOutTests.java >>> --- pass sun/security/tools/jarsigner/emptymanifest.sh >>> --- pass sun/security/util/DerValue/BadValue.java >>> fail pass sun/tools/jhat/HatHeapDump1Test.java >>> fail pass sun/tools/native2ascii/NativeErrors.java >>> >>> 55 differences >>> >>> (These tests are run off of Sun's WAN so a few of the networking >>> tests still >>> fail even when provided a config file to point elsewhere.) >>> >>> I'd prefer to get b18 tagged later this week. >>> >>> Cheers, >>> >>> -Joe >>> >>> >>> >>> >> >> I think we're good to go, at long last :-) >> >> > > After one last sanity-check round of building and testing on my end, > assuming all goes well I'll tag the repos for b18 :-) Essentially unchanged test results; repositories tagged with "jdk6-b18" -- source bundles to follow :-) -Joe From gnu_andrew at member.fsf.org Wed Feb 17 05:03:32 2010 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Wed, 17 Feb 2010 13:03:32 +0000 Subject: hg: jdk6/jdk6/hotspot: 3 new changesets In-Reply-To: <20091215014713.D57FE41FC1@hg.openjdk.java.net> References: <20091215014713.D57FE41FC1@hg.openjdk.java.net> Message-ID: <17c6771e1002170503x731b8599v415de32e07392d1a@mail.gmail.com> On 15 December 2009 01:47, wrote: > > Changeset: 98cd9901c161 > Author: ? ?dcubed > Date: ? ? ?2009-12-14 10:05 -0700 > URL: ? ? ? http://hg.openjdk.java.net/jdk6/jdk6/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 > When trying to update OpenJDK6 to HotSpot 16 this is causing a build failure: g++ -DLINUX -D_GNU_SOURCE -DAMD64 -DPRODUCT -I. -I../generated/adfiles -I../generated/jvmtifiles -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/asm -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/ci -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/classfile -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/code -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/compiler -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/gc_implementation -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/gc_implementation/shared -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/gc_implementation/g1 -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/gc_implementation/parNew -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/gc_interface -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/interpreter -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/libadt -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/memory -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/oops -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/opto -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/prims -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/runtime -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/services -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/utilities -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/cpu/x86/vm -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/os/linux/vm -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/os_cpu/linux_x86/vm -I../generated -DHOTSPOT_RELEASE_VERSION="\"16.0-b13\"" -DHOTSPOT_BUILD_TARGET="\"product\"" -DHOTSPOT_BUILD_USER="\"andrew\"" -DHOTSPOT_LIB_ARCH=\"amd64\" -DJRE_RELEASE_VERSION="\"1.6.0-internal-andrew_17_feb_2010_12_54-b00\"" -DHOTSPOT_VM_DISTRO="\"OpenJDK\"" -DCOMPILER2 -fPIC -fno-rtti -fno-exceptions -D_REENTRANT -fcheck-new -m64 -pipe -O3 -fno-strict-aliasing -DVM_LITTLE_ENDIAN -D_LP64=1 -fno-omit-frame-pointer -Werror -Wpointer-arith -Wsign-compare -c -o jvmtiEnvThreadState.o /home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/prims/jvmtiEnvThreadState.cpp /home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/prims/jvmtiEnvBase.cpp:126: error: prototype for 'JvmtiEnvBase::JvmtiEnvBase()' does not match any in class 'JvmtiEnvBase' /home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/prims/jvmtiEnvBase.hpp:44: error: candidates are: JvmtiEnvBase::JvmtiEnvBase(const JvmtiEnvBase&) /home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/prims/jvmtiEnvBase.hpp:95: error: JvmtiEnvBase::JvmtiEnvBase(jint) Is the fix still necessary? If so,is there an appropriate default version we could use to provide a no-arg constructor again? -- 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 gnu_andrew at member.fsf.org Wed Feb 17 05:05:20 2010 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Wed, 17 Feb 2010 13:05:20 +0000 Subject: Testing status of current OpenJDK 6 sources, ready for b18? In-Reply-To: <4B7B5816.4090900@sun.com> References: <4B689893.6090800@sun.com> <4B723093.2060107@sun.com> <17c6771e1002101206o44beca9ahdd8e411c1c676bb2@mail.gmail.com> <4B743962.8010608@sun.com> <17c6771e1002120110n6aac11b7u77f9d2bc2ef06d4b@mail.gmail.com> <4B7594BE.8060109@sun.com> <4B7AE746.1000206@sun.com> <17c6771e1002161348i7b13287ardf2ca3af3fe7ab57@mail.gmail.com> <4B7B14F0.50103@sun.com> <4B7B5816.4090900@sun.com> Message-ID: <17c6771e1002170505k124e7294s94d9a74ff59a6838@mail.gmail.com> On 17 February 2010 02:44, Joseph D. Darcy wrote: > Joseph D. Darcy wrote: >> >> Andrew John Hughes wrote: >>>> >>>> Hello. >>>> >>>> My repos have been synced and the tests look pretty good; all the >>>> HotSpot >>>> and langtools tests pass and the testing situation for jdk is an >>>> improvement >>>> over the previous build: >>>> >>>> 0: b17-jdk/summary.txt ?pass: 3,118; fail: 26 >>>> 1: b18-jdk/summary.txt ?pass: 3,149; fail: 18; error: 2 >>>> >>>> 0 ? ? ?1 ? ? ?Test >>>> --- ? ?pass ? com/sun/java/swing/plaf/nimbus/Test6741426.java >>>> --- ? ?pass ? com/sun/java/swing/plaf/nimbus/Test6849805.java >>>> --- ? ?pass ? com/sun/jdi/BreakpointWithFullGC.sh >>>> --- ? ?pass ? com/sun/jdi/ResumeOneThreadTest.java >>>> --- ? ?pass ? com/sun/jdi/SimulResumerTest.java >>>> --- ? ?pass ? demo/jvmti/compiledMethodLoad/CompiledMethodLoadTest.java >>>> fail ? pass ? java/awt/Frame/DynamicLayout/DynamicLayout.java >>>> fail ? pass >>>> java/awt/Frame/MaximizedToIconified/MaximizedToIconified.java >>>> fail ? pass >>>> java/awt/Frame/ShownOffScreenOnWin98/ShownOffScreenOnWin98Test.java >>>> fail ? pass >>>> >>>> java/awt/Frame/UnfocusableMaximizedFrameResizablity/UnfocusableMaximizedFrameResizablity.java >>>> --- ? ?pass ? java/awt/GraphicsDevice/CloneConfigsTest.java >>>> fail ? pass ? java/awt/GridLayout/LayoutExtraGaps/LayoutExtraGaps.java >>>> fail ? pass ? java/awt/Insets/CombinedTestApp1.java >>>> fail ? pass >>>> >>>> java/awt/KeyboardFocusmanager/TypeAhead/ButtonActionKeyTest/ButtonActionKeyTest.html >>>> fail ? pass >>>> >>>> java/awt/KeyboardFocusmanager/TypeAhead/MenuItemActivatedTest/MenuItemActivatedTest.html >>>> fail ? pass >>>> >>>> java/awt/KeyboardFocusmanager/TypeAhead/SubMenuShowTest/SubMenuShowTest.html >>>> fail ? pass >>>> java/awt/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.html >>>> pass ? fail >>>> java/awt/Multiscreen/LocationRelativeToTest/LocationRelativeToTest.java >>>> fail ? pass >>>> java/awt/TextArea/UsingWithMouse/SelectionAutoscrollTest.html >>>> fail ? pass ? java/awt/Toolkit/ScreenInsetsTest/ScreenInsetsTest.java >>>> pass ? --- ? ?java/awt/Window/AlwaysOnTop/AlwaysOnTopEvenOfWindow.java >>>> pass ? fail ? java/awt/Window/GrabSequence/GrabSequence.java >>>> fail ? pass ? java/awt/event/KeyEvent/CorrectTime/CorrectTime.java >>>> fail ? pass ? java/awt/grab/EmbeddedFrameTest1/EmbeddedFrameTest1.java >>>> pass ? fail ? java/awt/print/PrinterJob/ExceptionTest.java >>>> --- ? ?pass ? java/lang/ClassLoader/UninitializedParent.java >>>> pass ? fail ? java/net/Socket/AccurateTimeout.java >>>> pass ? fail ? java/net/ipv6tests/TcpTest.java >>>> pass ? fail ? java/nio/channels/SocketChannel/AdaptSocket.java >>>> pass ? fail ? java/nio/channels/SocketChannel/LocalAddress.java >>>> pass ? fail ? java/nio/channels/SocketChannel/Shutdown.java >>>> --- ? ?pass ? java/util/TimeZone/OldIDMappingTest.sh >>>> --- ? ?pass ? java/util/TimeZone/TimeZoneDatePermissionCheck.sh >>>> --- ? ?pass ? javax/swing/JButton/6604281/bug6604281.java >>>> fail ? pass ? javax/swing/JTextArea/Test6593649.java >>>> --- ? ?pass ? javax/swing/Security/6657138/ComponentTest.java >>>> --- ? ?pass ? javax/swing/Security/6657138/bug6657138.java >>>> --- ? ?pass ? javax/swing/ToolTipManager/Test6657026.java >>>> --- ? ?pass ? javax/swing/UIManager/Test6657026.java >>>> --- ? ?pass ? javax/swing/plaf/basic/BasicSplitPaneUI/Test6657026.java >>>> --- ? ?pass ? javax/swing/plaf/metal/MetalBorders/Test6657026.java >>>> --- ? ?pass ? javax/swing/plaf/metal/MetalBumps/Test6657026.java >>>> --- ? ?pass >>>> javax/swing/plaf/metal/MetalInternalFrameUI/Test6657026.java >>>> --- ? ?pass ? javax/swing/plaf/metal/MetalSliderUI/Test6657026.java >>>> pass ? error ?sun/java2d/OpenGL/GradientPaints.java >>>> pass ? fail ? sun/rmi/transport/proxy/EagerHttpFallback.java >>>> --- ? ?pass >>>> sun/security/provider/certpath/DisabledAlgorithms/CPBuilder.java >>>> --- ? ?pass >>>> >>>> sun/security/provider/certpath/DisabledAlgorithms/CPValidatorEndEntity.java >>>> --- ? ?pass >>>> >>>> sun/security/provider/certpath/DisabledAlgorithms/CPValidatorIntermediate.java >>>> --- ? ?pass >>>> >>>> sun/security/provider/certpath/DisabledAlgorithms/CPValidatorTrustAnchor.java >>>> pass ? error >>>> ?sun/security/ssl/javax/net/ssl/NewAPIs/SessionTimeOutTests.java >>>> --- ? ?pass ? sun/security/tools/jarsigner/emptymanifest.sh >>>> --- ? ?pass ? sun/security/util/DerValue/BadValue.java >>>> fail ? pass ? sun/tools/jhat/HatHeapDump1Test.java >>>> fail ? pass ? sun/tools/native2ascii/NativeErrors.java >>>> >>>> 55 differences >>>> >>>> (These tests are run off of Sun's WAN so a few of the networking tests >>>> still >>>> fail even when provided a config file to point elsewhere.) >>>> >>>> I'd prefer to get b18 tagged later this week. >>>> >>>> Cheers, >>>> >>>> -Joe >>>> >>>> >>>> >>>> >>> >>> I think we're good to go, at long last :-) >>> >>> >> >> After one last sanity-check round of building and testing on my end, >> assuming all goes well I'll tag the repos for b18 :-) > > Essentially unchanged test results; repositories tagged with "jdk6-b18" -- > source bundles to follow :-) > > -Joe > Great! I'm already working on updating the post-b18 HotSpot to hs16. The merge is done and I'm just trying to build the result, which is hitting some local changes; see http://mail.openjdk.java.net/pipermail/jdk6-dev/2010-February/001222.html -- 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 gnu_andrew at member.fsf.org Wed Feb 17 05:29:32 2010 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Wed, 17 Feb 2010 13:29:32 +0000 Subject: hg: jdk6/jdk6/jdk: 6737700: api/javax_swing/table/DefaultTableCellRenderer/index.html#getset:DefaultTableCellRenderer In-Reply-To: <20100216213524.5552F423B7@hg.openjdk.java.net> References: <20100216213524.5552F423B7@hg.openjdk.java.net> Message-ID: <17c6771e1002170529q7ec7f11aqfc202dbb6131aca4@mail.gmail.com> On 16 February 2010 21:34, wrote: > Changeset: 9f596519c6cc > Author: ? ?malenkov > Date: ? ? ?2009-06-24 17:45 +0400 > URL: ? ? ? http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/9f596519c6cc > > 6737700: api/javax_swing/table/DefaultTableCellRenderer/index.html#getset:DefaultTableCellRenderer > Reviewed-by: alexp > > ! src/share/classes/javax/swing/table/DefaultTableCellRenderer.java > > Approved for backport off-list. This was a blocker for b18. -- 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 Joe.Darcy at Sun.COM Wed Feb 17 09:55:51 2010 From: Joe.Darcy at Sun.COM (Joseph D. Darcy) Date: Wed, 17 Feb 2010 09:55:51 -0800 Subject: OpenJDK 6 b19 features? Message-ID: <4B7C2DA7.8040905@sun.com> Now that OpenJDK 6 b18 is wrapped up, on to b19! A detailed list of the bugs fixed is available from http://blogs.sun.com/darcy/resource/OpenJDK_6/openjdk6-b18-changes-summary.html What features should go into b19? Andrew has already started work on updating HotSpot. Previously Jon mentioned porting some javac fixes from JDK 7. I think the patch to fix 6761856: OpenJDK: vertical text metrics may be significanly different from those returned by Sun JDK, already included in IcedTea 6, should be evaluated for application to the OpenJDK 6 master. Other than routine ongoing maintenance, any other changes people want to get in? -Joe From Joe.Darcy at Sun.COM Wed Feb 17 10:32:55 2010 From: Joe.Darcy at Sun.COM (Joseph D. Darcy) Date: Wed, 17 Feb 2010 10:32:55 -0800 Subject: Potential update of JAXP sources in OpenJDK (b18) In-Reply-To: <4B69C56D.4090103@sun.com> References: <4B68AA41.8030400@sun.com> <4B68DB72.6040400@sun.com> <4B69C56D.4090103@sun.com> Message-ID: <4B7C3657.3060206@sun.com> Joseph D. Darcy wrote: > Kelly O'Hair wrote: >> Just for the record, the plan is to hold off on JAXP 1.4.3 until >> openjdk6 B19. >> (JAXP 1.4.3 should show up in openjdk7 M6). >> > > Yes, b18 has been open for a while and I'd like to put the finishing > touches on b18 in the near future before accepting any large or > non-critical fixes. > > -Joe Kelly, Since we are now on b19, please proceed with the jaxp update to OpenJDK 6. Thanks, -Joe From Daniel.Daugherty at Sun.COM Wed Feb 17 10:45:55 2010 From: Daniel.Daugherty at Sun.COM (Daniel D. Daugherty) Date: Wed, 17 Feb 2010 11:45:55 -0700 Subject: hg: jdk6/jdk6/hotspot: 3 new changesets In-Reply-To: <17c6771e1002170503x731b8599v415de32e07392d1a@mail.gmail.com> References: <20091215014713.D57FE41FC1@hg.openjdk.java.net> <17c6771e1002170503x731b8599v415de32e07392d1a@mail.gmail.com> Message-ID: <4B7C3963.1010500@sun.com> An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/jdk6-dev/attachments/20100217/4192bfb7/attachment.html From Kelly.Ohair at Sun.COM Wed Feb 17 11:57:45 2010 From: Kelly.Ohair at Sun.COM (Kelly O'Hair) Date: Wed, 17 Feb 2010 11:57:45 -0800 Subject: Potential update of JAXP sources in OpenJDK (b18) In-Reply-To: <4B7C3657.3060206@sun.com> References: <4B68AA41.8030400@sun.com> <4B68DB72.6040400@sun.com> <4B69C56D.4090103@sun.com> <4B7C3657.3060206@sun.com> Message-ID: <4B7C4A39.1060605@sun.com> On 2/17/10 10:32 AM, Joseph D. Darcy wrote: > Joseph D. Darcy wrote: >> Kelly O'Hair wrote: >>> Just for the record, the plan is to hold off on JAXP 1.4.3 until >>> openjdk6 B19. >>> (JAXP 1.4.3 should show up in openjdk7 M6). >>> >> >> Yes, b18 has been open for a while and I'd like to put the finishing >> touches on b18 in the near future before accepting any large or >> non-critical fixes. >> >> -Joe > > Kelly, > > Since we are now on b19, please proceed with the jaxp update to OpenJDK 6. > > Thanks, > > -Joe On it's way now. ETA 2pm Pacific Time. -kto From Kelly.Ohair at Sun.COM Wed Feb 17 12:05:40 2010 From: Kelly.Ohair at Sun.COM (Kelly O'Hair) Date: Wed, 17 Feb 2010 12:05:40 -0800 Subject: hg: jdk6/jdk6/hotspot: 3 new changesets In-Reply-To: <4B7C3963.1010500@sun.com> References: <20091215014713.D57FE41FC1@hg.openjdk.java.net> <17c6771e1002170503x731b8599v415de32e07392d1a@mail.gmail.com> <4B7C3963.1010500@sun.com> Message-ID: <4B7C4C14.70009@sun.com> On 2/17/10 10:45 AM, Daniel D. Daugherty wrote: > Andrew John Hughes wrote: >> On 15 December 2009 01:47, wrote: >> >> >>> Changeset: 98cd9901c161 >>> Author: dcubed >>> Date: 2009-12-14 10:05 -0700 >>> URL:http://hg.openjdk.java.net/jdk6/jdk6/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 >>> >>> >> >> When trying to update OpenJDK6 to HotSpot 16 this is causing a build failure: >> >> g++ -DLINUX -D_GNU_SOURCE -DAMD64 -DPRODUCT -I. -I../generated/adfiles >> -I../generated/jvmtifiles >> -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/asm >> -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/ci >> -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/classfile >> -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/code >> -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/compiler >> -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/gc_implementation >> -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep >> -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/gc_implementation/shared >> -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/gc_implementation/g1 >> -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/gc_implementation/parNew >> -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge >> -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/gc_interface >> -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/interpreter >> -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/libadt >> -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/memory >> -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/oops >> -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/opto >> -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/prims >> -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/runtime >> -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/services >> -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/utilities >> -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/cpu/x86/vm >> -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/os/linux/vm >> -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/os_cpu/linux_x86/vm >> -I../generated -DHOTSPOT_RELEASE_VERSION="\"16.0-b13\"" >> -DHOTSPOT_BUILD_TARGET="\"product\"" -DHOTSPOT_BUILD_USER="\"andrew\"" >> -DHOTSPOT_LIB_ARCH=\"amd64\" >> -DJRE_RELEASE_VERSION="\"1.6.0-internal-andrew_17_feb_2010_12_54-b00\"" >> -DHOTSPOT_VM_DISTRO="\"OpenJDK\"" -DCOMPILER2 -fPIC -fno-rtti >> -fno-exceptions -D_REENTRANT -fcheck-new -m64 -pipe -O3 >> -fno-strict-aliasing -DVM_LITTLE_ENDIAN -D_LP64=1 >> -fno-omit-frame-pointer -Werror -Wpointer-arith -Wsign-compare -c >> -o jvmtiEnvThreadState.o >> /home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/prims/jvmtiEnvThreadState.cpp >> /home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/prims/jvmtiEnvBase.cpp:126: >> error: prototype for 'JvmtiEnvBase::JvmtiEnvBase()' does not match any >> in class 'JvmtiEnvBase' >> /home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/prims/jvmtiEnvBase.hpp:44: >> error: candidates are: JvmtiEnvBase::JvmtiEnvBase(const JvmtiEnvBase&) >> /home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/prims/jvmtiEnvBase.hpp:95: >> error: JvmtiEnvBase::JvmtiEnvBase(jint) >> >> Is the fix still necessary? If so,is there an appropriate default >> version we could use to provide a no-arg constructor again? >> > > Yes, the fix is necessary. I'm a bit confused why you would think > that it was not still necessary. From the context you provided here > I'm not sure why you need a no-args constructor. I pushed this > changeset to HSX-16.2 for that release's b01 snapshot back when I > fixed this bug. I suspect that the same port can be used in HSX16 > for OpenJDK6... > > Dan > Is this an issue with the version of g++ used? On Fedora 9 we use: g++ (GCC) 4.3.0 20080428 (Red Hat 4.3.0-8) What version of g++ is complaining? Just a thought. -kto From gnu_andrew at member.fsf.org Wed Feb 17 14:04:45 2010 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Wed, 17 Feb 2010 22:04:45 +0000 Subject: hg: jdk6/jdk6/hotspot: 3 new changesets In-Reply-To: <4B7C3963.1010500@sun.com> References: <20091215014713.D57FE41FC1@hg.openjdk.java.net> <17c6771e1002170503x731b8599v415de32e07392d1a@mail.gmail.com> <4B7C3963.1010500@sun.com> Message-ID: <17c6771e1002171404ib091c05y1982dc3c51d11489@mail.gmail.com> On 17 February 2010 18:45, Daniel D. Daugherty wrote: > Andrew John Hughes wrote: > > On 15 December 2009 01:47, wrote: > > > > Changeset: 98cd9901c161 > Author: ? ?dcubed > Date: ? ? ?2009-12-14 10:05 -0700 > URL: ? ? ? http://hg.openjdk.java.net/jdk6/jdk6/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 > > > > When trying to update OpenJDK6 to HotSpot 16 this is causing a build > failure: > > g++ -DLINUX -D_GNU_SOURCE -DAMD64 -DPRODUCT -I. -I../generated/adfiles > -I../generated/jvmtifiles > -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/asm > -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/ci > -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/classfile > -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/code > -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/compiler > -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/gc_implementation > -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep > -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/gc_implementation/shared > -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/gc_implementation/g1 > -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/gc_implementation/parNew > -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge > -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/gc_interface > -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/interpreter > -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/libadt > -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/memory > -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/oops > -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/opto > -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/prims > -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/runtime > -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/services > -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/utilities > -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/cpu/x86/vm > -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/os/linux/vm > -I/home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/os_cpu/linux_x86/vm > -I../generated -DHOTSPOT_RELEASE_VERSION="\"16.0-b13\"" > -DHOTSPOT_BUILD_TARGET="\"product\"" -DHOTSPOT_BUILD_USER="\"andrew\"" > -DHOTSPOT_LIB_ARCH=\"amd64\" > -DJRE_RELEASE_VERSION="\"1.6.0-internal-andrew_17_feb_2010_12_54-b00\"" > -DHOTSPOT_VM_DISTRO="\"OpenJDK\"" -DCOMPILER2 -fPIC -fno-rtti > -fno-exceptions -D_REENTRANT -fcheck-new -m64 -pipe -O3 > -fno-strict-aliasing -DVM_LITTLE_ENDIAN -D_LP64=1 > -fno-omit-frame-pointer -Werror -Wpointer-arith -Wsign-compare -c > -o jvmtiEnvThreadState.o > /home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/prims/jvmtiEnvThreadState.cpp > /home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/prims/jvmtiEnvBase.cpp:126: > error: prototype for 'JvmtiEnvBase::JvmtiEnvBase()' does not match any > in class 'JvmtiEnvBase' > /home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/prims/jvmtiEnvBase.hpp:44: > error: candidates are: JvmtiEnvBase::JvmtiEnvBase(const JvmtiEnvBase&) > /home/andrew/projects/openjdk/upstream/jdk6/hotspot/src/share/vm/prims/jvmtiEnvBase.hpp:95: > error: JvmtiEnvBase::JvmtiEnvBase(jint) > > Is the fix still necessary? If so,is there an appropriate default > version we could use to provide a no-arg constructor again? > > > Yes, the fix is necessary. I'm a bit confused why you would think > that it was not still necessary. Because the summary says 'fails on jdk5.0 with hs14' and I'm bumping OpenJDK6 to hs16 which may no longer require the fix. But if you say it's still needed, it's still needed. From the context you provided here > I'm not sure why you need a no-args constructor. Once the changesets from the HotSpot 16 master (http://hg.openjdk.java.net/hsx/hsx16/master) are merged in, the build fails as shown above. It fails because your patch changes the constructor of JvmtiEnvBase from taking no arguments to taking an integer version. I pushed this > changeset to HSX-16.2 for that release's b01 snapshot back when I > fixed this bug. I suspect that the same port can be used in HSX16 > for OpenJDK6... > It's not in the hs16 master. In my diffs between the hs16 master and the merged OpenJDK6 hs16, it still shows up as being local to OpenJDK6's HotSpot. I've attached the diff to this mail. > Dan > > BTW, can you please send mails to the list in plain text rather than HTML. 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 -------------- next part -------------- diff -Bw -x .hg -u -r ../hs16/agent/test/jdi/sagtest.java hotspot/agent/test/jdi/sagtest.java --- ../hs16/agent/test/jdi/sagtest.java 2010-01-13 14:34:28.484184122 +0000 +++ hotspot/agent/test/jdi/sagtest.java 2009-09-23 12:26:43.700820601 +0100 @@ -23,7 +23,8 @@ */ /** - * @test * @bug 0000000 + * @test + * @bug 0000000 * @summary This is just an exercise of various JDI elements for use in * testing the SA/JDI client * Only in hotspot: build Only in hotspot: filelist diff -Bw -x .hg -u -r ../hs16/.hgignore hotspot/.hgignore --- ../hs16/.hgignore 2010-01-13 14:33:56.759119948 +0000 +++ hotspot/.hgignore 2010-02-17 11:04:45.243155130 +0000 @@ -1,5 +1,6 @@ ^build/ ^dist/ +^webrev/ ^nbproject/private/ ^src/share/tools/hsdis/build/ ^src/share/tools/IdealGraphVisualizer/[a-zA-Z0-9]*/build/ diff -Bw -x .hg -u -r ../hs16/.hgtags hotspot/.hgtags --- ../hs16/.hgtags 2010-02-17 10:59:00.252000649 +0000 +++ hotspot/.hgtags 2010-02-17 11:13:04.357102520 +0000 @@ -1,3 +1,20 @@ +c6ff3162647fff9c0f7bb78480540c752b85b852 jdk6-b00 +18c1875ec25d02a0492a3e9c3cfa53901ddd2a42 jdk6-b01 +27bd70733f395900a2f124040cfa5685e1b651e9 jdk6-b02 +09b68131ac308ff4bd0774aef2ed9cf42070a988 jdk6-b03 +56803c1850f1cef078826000140f7f8d4220b094 jdk6-b04 +af6cf5447f2396d30193a917f7db4c5ca2866b1d jdk6-b05 +0efdce94c81266a731b7aa7212998268381ea119 jdk6-b06 +e90f86cbefe7e30b903cd4694510c6f2b19b215f jdk6-b07 +3ab19718c6b72aeb4d648a1f449b103c37902f39 jdk6-b08 +704a1437e4e6c9fa1f829d3129be4b1ae4bc730e jdk6-b09 +3faac600050a0a495433f548d950ba1e3019116c jdk6-b10 +1582a9e498edea164d87f5bc009b535e14d766eb jdk6-b11 +4d2c088a8b496246102281fd8ce4af1901bf802d jdk6-b12 +4083a54479edd01667925402aa3b1c024aa73caa jdk6-b13 +e0966f42f76cca6102bb6d5a1ab19dd04f18fa33 jdk6-b14 +03b2be188619124f38798681c4939f206d263cef jdk6-b15 +ad38cd87d9dfd454a3f1dfd12aa706fe1b666c63 jdk6-b16 a61af66fc99eb5ec9d50c05b0c599757b1289ceb jdk7-b24 7836be3e92d0a4f9ee7566f602c91f5609534e66 jdk7-b25 ad0b851458ff9d1d490ed2d79bb84f75a9fdb753 jdk7-b26 @@ -17,6 +34,8 @@ 81a0cbe3b28460ce836109934ece03db7afaf9cc jdk7-b40 f9d938ede1960d18cb7cf23c645b026519c1a678 jdk7-b41 ad8c8ca4ab0f4c86e74c061958f44a8f4a930f2c jdk7-b42 +f6c52a08145746e3f70491dca493a506ff501da0 jdk6-b17 +7dbe24cb959ce98af4a296fb0306a85486a65193 jdk6-b18 fc6a5ae3fef5ebacfa896dbb3ae37715e388e282 jdk7-b43 809e899c638bd9b21836abf9d09ab2a30ff3900b jdk7-b44 945bf754069766e76873c53102fae48abf04cf5b jdk7-b45 diff -Bw -x .hg -u -r ../hs16/.jcheck/conf hotspot/.jcheck/conf --- ../hs16/.jcheck/conf 2010-01-13 14:33:56.801050923 +0000 +++ hotspot/.jcheck/conf 2009-09-12 12:22:29.774310765 +0100 @@ -1 +1,4 @@ -project=jdk7 +project=jdk6 +whitespace=lax +comments=lax +bugids=dup diff -Bw -x .hg -u -r ../hs16/make/defs.make hotspot/make/defs.make --- ../hs16/make/defs.make 2010-01-13 14:34:28.718245284 +0000 +++ hotspot/make/defs.make 2010-01-29 13:59:05.820499098 +0000 @@ -1,5 +1,5 @@ # -# Copyright 2006-2008 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2006-2010 Sun Microsystems, Inc. All Rights Reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -259,6 +259,7 @@ # Common export list of files EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jvmti.h +EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jvmticmlr.h EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jni.h EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/$(JDK_INCLUDE_SUBDIR)/jni_md.h EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jmm.h diff -Bw -x .hg -u -r ../hs16/make/hotspot_version hotspot/make/hotspot_version --- ../hs16/make/hotspot_version 2010-01-13 14:34:28.776157600 +0000 +++ hotspot/make/hotspot_version 2010-02-17 11:16:53.663463234 +0000 @@ -42,4 +42,4 @@ JDK_MICRO_VER=0 # Previous (bootdir) JDK version -JDK_PREVIOUS_VERSION=1.6.0 +JDK_PREVIOUS_VERSION=1.5.0 diff -Bw -x .hg -u -r ../hs16/make/linux/makefiles/jsig.make hotspot/make/linux/makefiles/jsig.make --- ../hs16/make/linux/makefiles/jsig.make 2010-01-13 14:34:29.260422725 +0000 +++ hotspot/make/linux/makefiles/jsig.make 2010-02-17 11:04:57.382228319 +0000 @@ -46,6 +46,11 @@ JSIG_DEBUG_CFLAGS = -g endif +# DEBUG_BINARIES overrides everything, use full -g debug information +ifeq ($(DEBUG_BINARIES), true) + JSIG_DEBUG_CFLAGS = -g +endif + $(LIBJSIG): $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE) @echo Making signal interposition lib... $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \ diff -Bw -x .hg -u -r ../hs16/make/Makefile hotspot/make/Makefile --- ../hs16/make/Makefile 2010-01-13 14:34:28.701504887 +0000 +++ hotspot/make/Makefile 2010-01-29 13:59:05.794258232 +0000 @@ -1,5 +1,5 @@ # -# Copyright 2005-2008 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2005-2010 Sun Microsystems, Inc. All Rights Reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -281,10 +281,13 @@ $(EXPORT_LIB_DIR)/%.jar: $(GEN_DIR)/%.jar $(install-file) -# Include files (jvmti.h, jni.h, $(JDK_INCLUDE_SUBDIR)/jni_md.h, jmm.h) +# Include files (jvmti.h, jvmticmlr.h, jni.h, $(JDK_INCLUDE_SUBDIR)/jni_md.h, jmm.h) $(EXPORT_INCLUDE_DIR)/%: $(GEN_DIR)/jvmtifiles/% $(install-file) +$(EXPORT_INCLUDE_DIR)/%: $(HS_SRC_DIR)/share/vm/code/% + $(install-file) + $(EXPORT_INCLUDE_DIR)/%: $(HS_SRC_DIR)/share/vm/prims/% $(install-file) diff -Bw -x .hg -u -r ../hs16/src/os_cpu/linux_x86/vm/os_linux_x86.cpp hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp --- ../hs16/src/os_cpu/linux_x86/vm/os_linux_x86.cpp 2010-01-13 14:34:41.338417903 +0000 +++ hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp 2010-02-17 11:05:29.033278640 +0000 @@ -598,7 +598,7 @@ // // Note that %gs is a reserved glibc register since early 2001, so // applications are not allowed to change its value (Ulrich Drepper from - // Redhat confirmed that all known offenders have been modified to use + // Red Hat confirmed that all known offenders have been modified to use // either %fs or TSD). In the worst case scenario, when VM is embedded in // a native application that plays with %gs, we might see non-zero %gs // even LinuxThreads is running in fixed stack mode. As the result, we'll diff -Bw -x .hg -u -r ../hs16/src/os_cpu/windows_x86/vm/os_windows_x86.cpp hotspot/src/os_cpu/windows_x86/vm/os_windows_x86.cpp --- ../hs16/src/os_cpu/windows_x86/vm/os_windows_x86.cpp 2010-01-13 14:34:42.707453371 +0000 +++ hotspot/src/os_cpu/windows_x86/vm/os_windows_x86.cpp 2010-02-17 11:05:31.826426566 +0000 @@ -47,7 +47,7 @@ #ifndef AMD64 // We store the current thread in this wrapperthread location // and determine how far away this address is from the structured - // execption pointer that FS:[0] points to. This get_thread + // exception pointer that FS:[0] points to. This get_thread // code can then get the thread pointer via FS. // // Warning: This routine must NEVER be inlined since we'd end up with Only in hotspot/src/share/vm/code: jvmticmlr.h diff -Bw -x .hg -u -r ../hs16/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp --- ../hs16/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp 2010-01-13 14:35:04.124897075 +0000 +++ hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp 2010-02-17 11:05:51.944321707 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff -Bw -x .hg -u -r ../hs16/src/share/vm/includeDB_core hotspot/src/share/vm/includeDB_core --- ../hs16/src/share/vm/includeDB_core 2010-01-13 14:35:09.469119145 +0000 +++ hotspot/src/share/vm/includeDB_core 2010-02-17 11:16:24.393729381 +0000 @@ -1,5 +1,5 @@ // -// Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved. +// Copyright 1997-2010 Sun Microsystems, Inc. All Rights Reserved. // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. // // This code is free software; you can redistribute it and/or modify it @@ -2502,6 +2502,7 @@ jvmtiExport.hpp handles.hpp jvmtiExport.hpp iterator.hpp jvmtiExport.hpp jvmti.h +jvmtiExport.hpp jvmticmlr.h jvmtiExport.hpp oop.hpp jvmtiExport.hpp oopsHierarchy.hpp @@ -3152,6 +3153,7 @@ oopMapCache.cpp allocation.inline.hpp oopMapCache.cpp jvmtiRedefineClassesTrace.hpp oopMapCache.cpp handles.inline.hpp +oopMapCache.cpp jvmtiRedefineClassesTrace.hpp oopMapCache.cpp oop.inline.hpp oopMapCache.cpp oopMapCache.hpp oopMapCache.cpp resourceArea.hpp diff -Bw -x .hg -u -r ../hs16/src/share/vm/includeDB_gc_parallel hotspot/src/share/vm/includeDB_gc_parallel --- ../hs16/src/share/vm/includeDB_gc_parallel 2010-01-13 14:35:09.535360152 +0000 +++ hotspot/src/share/vm/includeDB_gc_parallel 2010-02-17 11:06:13.631129931 +0000 @@ -78,6 +78,7 @@ instanceRefKlass.cpp g1OopClosures.inline.hpp instanceRefKlass.cpp oop.pcgc.inline.hpp instanceRefKlass.cpp psPromotionManager.inline.hpp +instanceRefKlass.cpp oop.pcgc.inline.hpp instanceRefKlass.cpp psScavenge.inline.hpp instanceRefKlass.cpp parOopClosures.inline.hpp diff -Bw -x .hg -u -r ../hs16/src/share/vm/opto/parse2.cpp hotspot/src/share/vm/opto/parse2.cpp --- ../hs16/src/share/vm/opto/parse2.cpp 2010-01-13 14:35:17.218616672 +0000 +++ hotspot/src/share/vm/opto/parse2.cpp 2010-02-17 11:07:01.105714650 +0000 @@ -912,7 +912,6 @@ if (PrintOpto && Verbose) tty->print_cr("Never-taken edge stops compilation at bci %d",bci()); #endif - repush_if_args(); // to gather stats on loop // We need to mark this branch as taken so that if we recompile we will // see that it is possible. In the tiered system the interpreter doesn't // do profiling and by the time we get to the lower tier from the interpreter diff -Bw -x .hg -u -r ../hs16/src/share/vm/prims/jvmtiEnvBase.hpp hotspot/src/share/vm/prims/jvmtiEnvBase.hpp --- ../hs16/src/share/vm/prims/jvmtiEnvBase.hpp 2010-01-13 14:35:20.262624829 +0000 +++ hotspot/src/share/vm/prims/jvmtiEnvBase.hpp 2010-02-17 11:07:11.114317440 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2003-2009 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -76,6 +76,7 @@ jvmtiEnv _jvmti_external; jint _magic; + jint _version; // version value passed to JNI GetEnv() JvmtiEnvBase* _next; bool _is_retransformable; const void *_env_local_storage; // per env agent allocated data. @@ -91,7 +92,7 @@ int _native_method_prefix_count; protected: - JvmtiEnvBase(); + JvmtiEnvBase(jint version); ~JvmtiEnvBase(); void dispose(); void env_dispose(); @@ -122,6 +123,9 @@ bool is_valid(); + bool use_version_1_0_semantics(); // agent asked for version 1.0 + bool use_version_1_1_semantics(); // agent asked for version 1.1 + bool is_retransformable() { return _is_retransformable; } static ByteSize jvmti_external_offset() { diff -Bw -x .hg -u -r ../hs16/src/share/vm/prims/jvmtiEnv.cpp hotspot/src/share/vm/prims/jvmtiEnv.cpp --- ../hs16/src/share/vm/prims/jvmtiEnv.cpp 2010-01-13 14:35:20.162207346 +0000 +++ hotspot/src/share/vm/prims/jvmtiEnv.cpp 2009-12-27 05:34:22.836483015 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2003-2009 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -32,15 +32,15 @@ // FIXLATER: hook into JvmtiTrace #define TraceJVMTICalls false -JvmtiEnv::JvmtiEnv() : JvmtiEnvBase() { +JvmtiEnv::JvmtiEnv(jint version) : JvmtiEnvBase(version) { } JvmtiEnv::~JvmtiEnv() { } JvmtiEnv* -JvmtiEnv::create_a_jvmti() { - return new JvmtiEnv(); +JvmtiEnv::create_a_jvmti(jint version) { + return new JvmtiEnv(version); } // VM operation class to copy jni function table at safepoint. @@ -411,8 +411,15 @@ if (phase == JVMTI_PHASE_ONLOAD) { Arguments::append_sysclasspath(segment); return JVMTI_ERROR_NONE; - } else { - assert(phase == JVMTI_PHASE_LIVE, "sanity check"); + } else if (use_version_1_0_semantics()) { + // This JvmtiEnv requested version 1.0 semantics and this function + // is only allowed in the ONLOAD phase in version 1.0 so we need to + // return an error here. + return JVMTI_ERROR_WRONG_PHASE; + } else if (phase == JVMTI_PHASE_LIVE) { + // The phase is checked by the wrapper that called this function, + // but this thread could be racing with the thread that is + // terminating the VM so we check one more time. // create the zip entry ClassPathZipEntry* zip_entry = ClassLoader::create_class_path_zip_entry(segment); @@ -433,6 +440,8 @@ } ClassLoader::add_to_list(zip_entry); return JVMTI_ERROR_NONE; + } else { + return JVMTI_ERROR_WRONG_PHASE; } } /* end AddToBootstrapClassLoaderSearch */ @@ -451,11 +460,12 @@ } } return JVMTI_ERROR_NONE; - } else { + } else if (phase == JVMTI_PHASE_LIVE) { + // The phase is checked by the wrapper that called this function, + // but this thread could be racing with the thread that is + // terminating the VM so we check one more time. HandleMark hm; - assert(phase == JVMTI_PHASE_LIVE, "sanity check"); - // create the zip entry (which will open the zip file and hence // check that the segment is indeed a zip file). ClassPathZipEntry* zip_entry = ClassLoader::create_class_path_zip_entry(segment); @@ -504,6 +514,8 @@ } return JVMTI_ERROR_NONE; + } else { + return JVMTI_ERROR_WRONG_PHASE; } } /* end AddToSystemClassLoaderSearch */ @@ -2863,6 +2875,14 @@ // is_obsolete_ptr - pre-checked for NULL jvmtiError JvmtiEnv::IsMethodObsolete(methodOop method_oop, jboolean* is_obsolete_ptr) { + if (use_version_1_0_semantics() && + get_capabilities()->can_redefine_classes == 0) { + // This JvmtiEnv requested version 1.0 semantics and this function + // requires the can_redefine_classes capability in version 1.0 so + // we need to return an error here. + return JVMTI_ERROR_MUST_POSSESS_CAPABILITY; + } + if (method_oop == NULL || method_oop->is_obsolete()) { *is_obsolete_ptr = true; } else { diff -Bw -x .hg -u -r ../hs16/src/share/vm/prims/jvmtiExport.cpp hotspot/src/share/vm/prims/jvmtiExport.cpp --- ../hs16/src/share/vm/prims/jvmtiExport.cpp 2010-01-13 14:35:20.434166284 +0000 +++ hotspot/src/share/vm/prims/jvmtiExport.cpp 2010-02-17 12:18:06.437513390 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2003-2009 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2003-2010 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -319,7 +319,27 @@ jint JvmtiExport::get_jvmti_interface(JavaVM *jvm, void **penv, jint version) { - /* To Do: add version checks */ + // The JVMTI_VERSION_INTERFACE_JVMTI part of the version number + // has already been validated in JNI GetEnv(). + int major, minor, micro; + + // micro version doesn't matter here (yet?) + decode_version_values(version, &major, &minor, µ); + switch (major) { + case 1: + switch (minor) { + case 0: // version 1.0. is recognized + case 1: // version 1.1. is recognized + break; + + default: + return JNI_EVERSION; // unsupported minor version number + } + break; + + default: + return JNI_EVERSION; // unsupported major version number + } if (JvmtiEnv::get_phase() == JVMTI_PHASE_LIVE) { JavaThread* current_thread = (JavaThread*) ThreadLocalStorage::thread(); @@ -328,13 +348,13 @@ __ENTRY(jvmtiEnv*, JvmtiExport::get_jvmti_interface, current_thread) debug_only(VMNativeEntryWrapper __vew;) - JvmtiEnv *jvmti_env = JvmtiEnv::create_a_jvmti(); + JvmtiEnv *jvmti_env = JvmtiEnv::create_a_jvmti(version); *penv = jvmti_env->jvmti_external(); // actual type is jvmtiEnv* -- not to be confused with JvmtiEnv* return JNI_OK; } else if (JvmtiEnv::get_phase() == JVMTI_PHASE_ONLOAD) { // not live, no thread to transition - JvmtiEnv *jvmti_env = JvmtiEnv::create_a_jvmti(); + JvmtiEnv *jvmti_env = JvmtiEnv::create_a_jvmti(version); *penv = jvmti_env->jvmti_external(); // actual type is jvmtiEnv* -- not to be confused with JvmtiEnv* return JNI_OK; @@ -345,6 +365,15 @@ } } + +void +JvmtiExport::decode_version_values(jint version, int * major, int * minor, + int * micro) { + *major = (version & JVMTI_VERSION_MASK_MAJOR) >> JVMTI_VERSION_SHIFT_MAJOR; + *minor = (version & JVMTI_VERSION_MASK_MINOR) >> JVMTI_VERSION_SHIFT_MINOR; + *micro = (version & JVMTI_VERSION_MASK_MICRO) >> JVMTI_VERSION_SHIFT_MICRO; +} + void JvmtiExport::enter_primordial_phase() { JvmtiEnvBase::set_phase(JVMTI_PHASE_PRIMORDIAL); } @@ -657,11 +686,11 @@ jvmtiAddrLocationMap *_map; const void *_compile_info; public: - JvmtiCompiledMethodLoadEventMark(JavaThread *thread, nmethod *nm) + JvmtiCompiledMethodLoadEventMark(JavaThread *thread, nmethod *nm, void* compile_info_ptr = NULL) : JvmtiMethodEventMark(thread,methodHandle(thread, nm->method())) { _code_data = nm->code_begin(); _code_size = nm->code_size(); - _compile_info = NULL; /* no info for our VM. */ + _compile_info = compile_info_ptr; // Set void pointer of compiledMethodLoad Event. Default value is NULL. JvmtiCodeBlobEvents::build_jvmti_addr_location_map(nm, &_map, &_map_length); } ~JvmtiCompiledMethodLoadEventMark() { @@ -1723,6 +1752,46 @@ } } +// Returns a record containing inlining information for the given nmethod +jvmtiCompiledMethodLoadInlineRecord* create_inline_record(nmethod* nm) { + jint numstackframes = 0; + jvmtiCompiledMethodLoadInlineRecord* record = (jvmtiCompiledMethodLoadInlineRecord*)NEW_RESOURCE_OBJ(jvmtiCompiledMethodLoadInlineRecord); + record->header.kind = JVMTI_CMLR_INLINE_INFO; + record->header.next = NULL; + record->header.majorinfoversion = JVMTI_CMLR_MAJOR_VERSION_1; + record->header.minorinfoversion = JVMTI_CMLR_MINOR_VERSION_0; + record->numpcs = 0; + for(PcDesc* p = nm->scopes_pcs_begin(); p < nm->scopes_pcs_end(); p++) { + if(p->scope_decode_offset() == DebugInformationRecorder::serialized_null) continue; + record->numpcs++; + } + record->pcinfo = (PCStackInfo*)(NEW_RESOURCE_ARRAY(PCStackInfo, record->numpcs)); + int scope = 0; + for(PcDesc* p = nm->scopes_pcs_begin(); p < nm->scopes_pcs_end(); p++) { + if(p->scope_decode_offset() == DebugInformationRecorder::serialized_null) continue; + void* pc_address = (void*)p->real_pc(nm); + assert(pc_address != NULL, "pc_address must be non-null"); + record->pcinfo[scope].pc = pc_address; + numstackframes=0; + for(ScopeDesc* sd = nm->scope_desc_at(p->real_pc(nm));sd != NULL;sd = sd->sender()) { + numstackframes++; + } + assert(numstackframes != 0, "numstackframes must be nonzero."); + record->pcinfo[scope].methods = (jmethodID *)NEW_RESOURCE_ARRAY(jmethodID, numstackframes); + record->pcinfo[scope].bcis = (jint *)NEW_RESOURCE_ARRAY(jint, numstackframes); + record->pcinfo[scope].numstackframes = numstackframes; + int stackframe = 0; + for(ScopeDesc* sd = nm->scope_desc_at(p->real_pc(nm));sd != NULL;sd = sd->sender()) { + // sd->method() can be NULL for stubs but not for nmethods. To be completely robust, include an assert that we should never see a null sd->method() + assert(!sd->method().is_null(), "sd->method() cannot be null."); + record->pcinfo[scope].methods[stackframe] = sd->method()->jmethod_id(); + record->pcinfo[scope].bcis[stackframe] = sd->bci(); + stackframe++; + } + scope++; + } + return record; +} void JvmtiExport::post_compiled_method_load(nmethod *nm) { // If there are pending CompiledMethodUnload events then these are @@ -1751,7 +1820,11 @@ (nm->method() == NULL) ? "NULL" : nm->method()->name()->as_C_string())); ResourceMark rm(thread); - JvmtiCompiledMethodLoadEventMark jem(thread, nm); + + // Add inlining information + jvmtiCompiledMethodLoadInlineRecord* inlinerecord = create_inline_record(nm); + // Pass inlining information through the void pointer + JvmtiCompiledMethodLoadEventMark jem(thread, nm, inlinerecord); JvmtiJavaThreadEventTransition jet(thread); jvmtiEventCompiledMethodLoad callback = env->callbacks()->CompiledMethodLoad; if (callback != NULL) { diff -Bw -x .hg -u -r ../hs16/src/share/vm/prims/jvmtiExport.hpp hotspot/src/share/vm/prims/jvmtiExport.hpp --- ../hs16/src/share/vm/prims/jvmtiExport.hpp 2010-01-13 14:35:20.469346934 +0000 +++ hotspot/src/share/vm/prims/jvmtiExport.hpp 2009-12-27 05:34:22.996939589 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1998-2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 1998-2009 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -236,6 +236,8 @@ static bool is_jvmti_version(jint version) { return (version & JVMTI_VERSION_MASK) == JVMTI_VERSION_VALUE; } static bool is_jvmdi_version(jint version) { return (version & JVMTI_VERSION_MASK) == JVMDI_VERSION_VALUE; } static jint get_jvmti_interface(JavaVM *jvm, void **penv, jint version); + static void decode_version_values(jint version, int * major, int * minor, + int * micro); // single stepping management methods static void at_single_stepping_point(JavaThread *thread, methodOop method, address location) KERNEL_RETURN; diff -Bw -x .hg -u -r ../hs16/src/share/vm/prims/jvmtiHpp.xsl hotspot/src/share/vm/prims/jvmtiHpp.xsl --- ../hs16/src/share/vm/prims/jvmtiHpp.xsl 2010-01-13 14:35:20.612126465 +0000 +++ hotspot/src/share/vm/prims/jvmtiHpp.xsl 2009-12-27 05:34:23.045272139 +0000 @@ -1,6 +1,6 @@