From james.melvin at oracle.com Mon Feb 20 13:02:13 2012 From: james.melvin at oracle.com (James Melvin) Date: Mon, 20 Feb 2012 16:02:13 -0500 Subject: RFR (XXS): 7130404: [macosx] "os.arch" value should be "x86_64" for compatibility with Apple JDK6 Message-ID: <4F42B4D5.2000004@oracle.com> Hi, To maintain compatibility with Apple JDKs, a proposal will be made to change the 'os.arch' system property from 'amd64' to 'x86_64' on Mac OS X. Minor changes are required to the following repositories, for which I've provided webrevs... WEBREV: http://cr.openjdk.java.net/~jmelvin/7130404/hotspot/webrev.00 http://cr.openjdk.java.net/~jmelvin/7130404/jdk/webrev.00 TESTING: JPRT job (2012-02-20-203901.jmelvin.hotspot) Notepad, SwingSet2, SPECjbb2005 This change will also impact a small number of internal tests and RE scripts. The bundle names will also reflect the change amd64 -> x86_64. HotSpot changes can be integrated first, with the JDK changes in the following promotion. Should the proposal be rejected for 7u4, I obviously withdraw the bugfix. Feedback welcome, Jim From swingler at apple.com Mon Feb 20 14:45:07 2012 From: swingler at apple.com (Mike Swingler) Date: Mon, 20 Feb 2012 14:45:07 -0800 Subject: RFR (XXS): 7130404: [macosx] "os.arch" value should be "x86_64" for compatibility with Apple JDK6 In-Reply-To: <4F42B4D5.2000004@oracle.com> References: <4F42B4D5.2000004@oracle.com> Message-ID: <1BBC97E8-35F5-4734-AD12-182615D4319B@apple.com> On Feb 20, 2012, at 1:02 PM, James Melvin wrote: > Hi, > > To maintain compatibility with Apple JDKs, a proposal will be made to > change the 'os.arch' system property from 'amd64' to 'x86_64' on Mac OS > X. Minor changes are required to the following repositories, for which > I've provided webrevs... > > WEBREV: > http://cr.openjdk.java.net/~jmelvin/7130404/hotspot/webrev.00 > http://cr.openjdk.java.net/~jmelvin/7130404/jdk/webrev.00 > > TESTING: > JPRT job (2012-02-20-203901.jmelvin.hotspot) > Notepad, SwingSet2, SPECjbb2005 > > This change will also impact a small number of internal tests and RE > scripts. The bundle names will also reflect the change amd64 -> x86_64. > HotSpot changes can be integrated first, with the JDK changes in the > following promotion. Should the proposal be rejected for 7u4, I > obviously withdraw the bugfix. In the two following diffs, the check for Mac OS X should be done with a .contains("OS X"), because Mac OS X Server reports it's OS version as "Mac OS X Server" and would not exactly match. While I have previously suggested using .startsWith("Mac OS X"), I'm now recommending .contains("OS X") for...robustness. --- old/src/share/classes/java/awt/GraphicsEnvironment.java 2012-02-20 14:48:21.000000000 -0500 +++ new/src/share/classes/java/awt/GraphicsEnvironment.java 2012-02-20 14:48:21.000000000 -0500 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. 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 @@ -179,6 +179,7 @@ headless = defaultHeadless = Boolean.valueOf(("Linux".equals(osName) || "SunOS".equals(osName) || + "Mac OS X".equals(osName) || "FreeBSD".equals(osName) || "NetBSD".equals(osName) || "OpenBSD".equals(osName)) && --- old/agent/src/share/classes/sun/jvm/hotspot/jdi/ConnectorImpl.java 2012-02-20 15:41:33.000000000 -0500 +++ new/agent/src/share/classes/sun/jvm/hotspot/jdi/ConnectorImpl.java 2012-02-20 15:41:33.000000000 -0500 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2012, Oracle and/or its affiliates. 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 @@ -217,8 +217,8 @@ } protected void checkNativeLink(SecurityManager sm, String os) { - if (os.equals("SunOS") || os.equals("Linux")) { - // link "saproc" - SA native library on SunOS and Linux? + if (os.equals("SunOS") || os.equals("Linux") || os.equals("Mac OS X")) { + // link "saproc" - SA native library on SunOS, Linux, and Mac OS X sm.checkLink("saproc"); } else if (os.startsWith("Windows")) { // link "sawindbg" - SA native library on Windows. Regards, Mike Swingler Apple Inc. From michael.x.mcmahon at oracle.com Tue Feb 21 02:41:46 2012 From: michael.x.mcmahon at oracle.com (Michael McMahon) Date: Tue, 21 Feb 2012 10:41:46 +0000 Subject: RFR (XXS): 7130404: [macosx] "os.arch" value should be "x86_64" for compatibility with Apple JDK6 In-Reply-To: <4F43710A.30001@oracle.com> References: <4F42B4D5.2000004@oracle.com> <4F43710A.30001@oracle.com> Message-ID: <4F4374EA.2090806@oracle.com> Jim, Thanks for doing this. Some minor comments on the JDK changes. 1) the amd64 definitions in make/common/Defs-macosx.gmk are redundant now. Maybe we should just delete them (though I agree with keeping the runtime checks in the .java sources) 2) the (Mac) checks for os.name have generally been using String.startsWith() instead of equals() so they will work with a future "Mac OS X Server" (java/awt/GraphicsEnvironment.java). I think there are similar checks in hotspot too. I see Mike Swingler is suggesting String.contains("OS X"). I'd be ok with that too. 3) one other location where a check needs to be added is: java/nio/Bits.java Also, I don't see any code in Hotspot that checks for the new "x86_64" value. So, is it actually necessary for the hotspot change to be integrated first? - Michael, On 20/02/12 21:02, James Melvin wrote: > Hi, > > To maintain compatibility with Apple JDKs, a proposal will be made to > change the 'os.arch' system property from 'amd64' to 'x86_64' on Mac OS > X. Minor changes are required to the following repositories, for which > I've provided webrevs... > > WEBREV: > http://cr.openjdk.java.net/~jmelvin/7130404/hotspot/webrev.00 > http://cr.openjdk.java.net/~jmelvin/7130404/jdk/webrev.00 > > TESTING: > JPRT job (2012-02-20-203901.jmelvin.hotspot) > Notepad, SwingSet2, SPECjbb2005 > > This change will also impact a small number of internal tests and RE > scripts. The bundle names will also reflect the change amd64 -> x86_64. > HotSpot changes can be integrated first, with the JDK changes in the > following promotion. Should the proposal be rejected for 7u4, I > obviously withdraw the bugfix. > > Feedback welcome, > > Jim From james.melvin at oracle.com Tue Feb 21 11:36:43 2012 From: james.melvin at oracle.com (James Melvin) Date: Tue, 21 Feb 2012 14:36:43 -0500 Subject: RFR (XXS): 7130404: [macosx] "os.arch" value should be "x86_64" for compatibility with Apple JDK6 In-Reply-To: <4F4374EA.2090806@oracle.com> References: <4F42B4D5.2000004@oracle.com> <4F43710A.30001@oracle.com> <4F4374EA.2090806@oracle.com> Message-ID: <4F43F24B.9080305@oracle.com> Comments inline... updated webrev a bit later today... On 2/21/12 5:41 AM, Michael McMahon wrote: > Jim, > > Thanks for doing this. Some minor comments on the JDK changes. > > 1) the amd64 definitions in make/common/Defs-macosx.gmk are redundant now. > Maybe we should just delete them (though I agree with keeping the > runtime checks > in the .java sources) Good point. I've deleted the old amd64 references that have been replaced. > 2) the (Mac) checks for os.name have generally been using > String.startsWith() instead of equals() > so they will work with a future "Mac OS X Server" > (java/awt/GraphicsEnvironment.java). > I think there are similar checks in hotspot too. I see Mike Swingler is > suggesting > String.contains("OS X"). I'd be ok with that too. For these set of changes, I've switched to Mike's suggestion. Perhaps we can switch the other callsites (unrelated to this change) as part of a general cleanup in JDK8. > 3) one other location where a check needs to be added is: > java/nio/Bits.java Done! > Also, I don't see any code in Hotspot that checks for the new "x86_64" > value. > So, is it actually necessary for the hotspot change to be integrated first? Yup, still necessary. There is a reference in ... agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java - Jim > > - Michael, > > On 20/02/12 21:02, James Melvin wrote: >> Hi, >> >> To maintain compatibility with Apple JDKs, a proposal will be made to >> change the 'os.arch' system property from 'amd64' to 'x86_64' on Mac OS >> X. Minor changes are required to the following repositories, for which >> I've provided webrevs... >> >> WEBREV: >> http://cr.openjdk.java.net/~jmelvin/7130404/hotspot/webrev.00 >> http://cr.openjdk.java.net/~jmelvin/7130404/jdk/webrev.00 >> >> TESTING: >> JPRT job (2012-02-20-203901.jmelvin.hotspot) >> Notepad, SwingSet2, SPECjbb2005 >> >> This change will also impact a small number of internal tests and RE >> scripts. The bundle names will also reflect the change amd64 -> x86_64. >> HotSpot changes can be integrated first, with the JDK changes in the >> following promotion. Should the proposal be rejected for 7u4, I >> obviously withdraw the bugfix. >> >> Feedback welcome, >> >> Jim From james.melvin at oracle.com Tue Feb 21 15:08:56 2012 From: james.melvin at oracle.com (James Melvin) Date: Tue, 21 Feb 2012 18:08:56 -0500 Subject: RFR (XXS): 7130404: [macosx] "os.arch" value should be "x86_64" for compatibility with Apple JDK6 In-Reply-To: <4F42B4D5.2000004@oracle.com> References: <4F42B4D5.2000004@oracle.com> Message-ID: <4F442408.3070807@oracle.com> Thanks for the reviews! Updated webrevs with all comments... http://cr.openjdk.java.net/~jmelvin/7130404/hotspot/webrev.01 http://cr.openjdk.java.net/~jmelvin/7130404/jdk/webrev.01 http://cr.openjdk.java.net/~jmelvin/7130404/corba/webrev.01 Main changes were to refine the use of string compares for Mac OS X... < osName.startsWith("Mac OS") > osName.contains("OS X") Any final comments? A decision has not yet been made to include this change or not. I'll provide an update when there's progress. - Jim On 2/20/12 4:02 PM, James Melvin wrote: > Hi, > > To maintain compatibility with Apple JDKs, a proposal will be made to > change the 'os.arch' system property from 'amd64' to 'x86_64' on Mac OS > X. Minor changes are required to the following repositories, for which > I've provided webrevs... > > WEBREV: > http://cr.openjdk.java.net/~jmelvin/7130404/hotspot/webrev.00 > http://cr.openjdk.java.net/~jmelvin/7130404/jdk/webrev.00 > > TESTING: > JPRT job (2012-02-20-203901.jmelvin.hotspot) > Notepad, SwingSet2, SPECjbb2005 > > This change will also impact a small number of internal tests and RE > scripts. The bundle names will also reflect the change amd64 -> x86_64. > HotSpot changes can be integrated first, with the JDK changes in the > following promotion. Should the proposal be rejected for 7u4, I > obviously withdraw the bugfix. > > Feedback welcome, > > Jim From swingler at apple.com Tue Feb 21 15:36:50 2012 From: swingler at apple.com (Mike Swingler) Date: Tue, 21 Feb 2012 15:36:50 -0800 Subject: RFR (XXS): 7130404: [macosx] "os.arch" value should be "x86_64" for compatibility with Apple JDK6 In-Reply-To: <4F442408.3070807@oracle.com> References: <4F42B4D5.2000004@oracle.com> <4F442408.3070807@oracle.com> Message-ID: <904960FF-4162-473B-B8D0-EDD33158506B@apple.com> Looks good to me. Regards, Mike Swingler Apple Inc. On Feb 21, 2012, at 3:08 PM, James Melvin wrote: > Thanks for the reviews! Updated webrevs with all comments... > > http://cr.openjdk.java.net/~jmelvin/7130404/hotspot/webrev.01 > http://cr.openjdk.java.net/~jmelvin/7130404/jdk/webrev.01 > http://cr.openjdk.java.net/~jmelvin/7130404/corba/webrev.01 > > Main changes were to refine the use of string compares for Mac OS X... > > < osName.startsWith("Mac OS") > > osName.contains("OS X") > > Any final comments? A decision has not yet been made to include this > change or not. I'll provide an update when there's progress. > > - Jim > > > > On 2/20/12 4:02 PM, James Melvin wrote: >> Hi, >> >> To maintain compatibility with Apple JDKs, a proposal will be made to >> change the 'os.arch' system property from 'amd64' to 'x86_64' on Mac OS >> X. Minor changes are required to the following repositories, for which >> I've provided webrevs... >> >> WEBREV: >> http://cr.openjdk.java.net/~jmelvin/7130404/hotspot/webrev.00 >> http://cr.openjdk.java.net/~jmelvin/7130404/jdk/webrev.00 >> >> TESTING: >> JPRT job (2012-02-20-203901.jmelvin.hotspot) >> Notepad, SwingSet2, SPECjbb2005 >> >> This change will also impact a small number of internal tests and RE >> scripts. The bundle names will also reflect the change amd64 -> x86_64. >> HotSpot changes can be integrated first, with the JDK changes in the >> following promotion. Should the proposal be rejected for 7u4, I >> obviously withdraw the bugfix. >> >> Feedback welcome, >> >> Jim From kelly.ohair at oracle.com Wed Feb 22 09:51:34 2012 From: kelly.ohair at oracle.com (Kelly O'Hair) Date: Wed, 22 Feb 2012 09:51:34 -0800 Subject: RFR (XXS): 7130404: [macosx] "os.arch" value should be "x86_64" for compatibility with Apple JDK6 In-Reply-To: <4F442408.3070807@oracle.com> References: <4F42B4D5.2000004@oracle.com> <4F442408.3070807@oracle.com> Message-ID: Sorry I'm slow on the review. Just a few comments, not sure any of it would cause me to reject your changes. On Feb 21, 2012, at 3:08 PM, James Melvin wrote: > Thanks for the reviews! Updated webrevs with all comments... > > http://cr.openjdk.java.net/~jmelvin/7130404/hotspot/webrev.01 Just FYI. I use startsWith("Mac"). But I'm not sure I have an opinion what you should use. Seems like this comment was wrong to begin with, and is wrong now: 55 /* Returns "sparc" if on SPARC, "x86" if on x86. */ 56 public static String getCPU() throws UnsupportedPlatformException { It returns a wide variety of values. :^( > http://cr.openjdk.java.net/~jmelvin/7130404/jdk/webrev.01 There are 4 critical ARCH weapons, all of them have inconsistencies and risks when sharpened or changed: 1. LIBARCH or the name in the install trees, e.g. lib/sparc, lib/i386, lib/amd64 2. os.arch, or what the Java property value is, e.g. x86, sparc, i586, i386?, sparcv9, amd64, x86_64,... 3. The arch name used in the bundle names, e.g. sparc, x86, x64, etc. 4. The arch name used in the build directories, e.g. build/solaris-sparc, build/solaris-x64, ... However, like the Monty Python Spanish Inquisition, http://www.youtube.com/watch?v=vt0Y39eMvpI, nobody really remembers what the real weapon list is. :^( But I digress... In the Makefiles, I was trying to limit the ARCH values, and for 64bit x86 I have tried to use x64 or X64 and have been trying to avoid amd64 or x86_64. This is separate from the above weapon list, they all do not and probably can never all be the same, but where we can avoid repeating the same ARCH with a different spelling, we should. I think the bottom line is that the Defs-macos.gmk and Platform.gmk file probably could be trimmed down for Mac, but I don;t see a pressing need right now. > http://cr.openjdk.java.net/~jmelvin/7130404/corba/webrev.01 Not sure this change is necessary, corba no longer compiles any native code. But it seems harmless. -kto > > Main changes were to refine the use of string compares for Mac OS X... > > < osName.startsWith("Mac OS") > > osName.contains("OS X") > > Any final comments? A decision has not yet been made to include this > change or not. I'll provide an update when there's progress. > > - Jim > > > > On 2/20/12 4:02 PM, James Melvin wrote: >> Hi, >> >> To maintain compatibility with Apple JDKs, a proposal will be made to >> change the 'os.arch' system property from 'amd64' to 'x86_64' on Mac OS >> X. Minor changes are required to the following repositories, for which >> I've provided webrevs... >> >> WEBREV: >> http://cr.openjdk.java.net/~jmelvin/7130404/hotspot/webrev.00 >> http://cr.openjdk.java.net/~jmelvin/7130404/jdk/webrev.00 >> >> TESTING: >> JPRT job (2012-02-20-203901.jmelvin.hotspot) >> Notepad, SwingSet2, SPECjbb2005 >> >> This change will also impact a small number of internal tests and RE >> scripts. The bundle names will also reflect the change amd64 -> x86_64. >> HotSpot changes can be integrated first, with the JDK changes in the >> following promotion. Should the proposal be rejected for 7u4, I >> obviously withdraw the bugfix. >> >> Feedback welcome, >> >> Jim From swingler at apple.com Wed Feb 22 10:09:38 2012 From: swingler at apple.com (Mike Swingler) Date: Wed, 22 Feb 2012 10:09:38 -0800 Subject: RFR (XXS): 7130404: [macosx] "os.arch" value should be "x86_64" for compatibility with Apple JDK6 In-Reply-To: References: <4F42B4D5.2000004@oracle.com> <4F442408.3070807@oracle.com> Message-ID: <975DB5D1-ADBE-48B0-995F-AEC8661B3DD5@apple.com> On Feb 22, 2012, at 9:51 AM, Kelly O'Hair wrote: > On Feb 21, 2012, at 3:08 PM, James Melvin wrote: > >> Thanks for the reviews! Updated webrevs with all comments... >> >> http://cr.openjdk.java.net/~jmelvin/7130404/hotspot/webrev.01 > > Just FYI. I use startsWith("Mac"). But I'm not sure I have an opinion what you should use. To this point, everyone should use .contains("OS X") now: Regards, Mike Swingler Apple Inc. From james.melvin at oracle.com Wed Feb 22 15:03:35 2012 From: james.melvin at oracle.com (James Melvin) Date: Wed, 22 Feb 2012 18:03:35 -0500 Subject: RFR (XXS): 7130404: [macosx] "os.arch" value should be "x86_64" for compatibility with Apple JDK6 In-Reply-To: References: <4F42B4D5.2000004@oracle.com> <4F442408.3070807@oracle.com> Message-ID: <4F457447.2000504@oracle.com> Thanks Kelly. See below for some follow ups... On 2/22/12 12:51 PM, Kelly O'Hair wrote: > Sorry I'm slow on the review. > > Just a few comments, not sure any of it would cause me to reject your changes. > > > On Feb 21, 2012, at 3:08 PM, James Melvin wrote: > >> Thanks for the reviews! Updated webrevs with all comments... >> >> http://cr.openjdk.java.net/~jmelvin/7130404/hotspot/webrev.01 > > Just FYI. I use startsWith("Mac"). But I'm not sure I have an opinion what you should use. Based on Mike Swingler's advice, I've changed all the affected callsites for this change to use .contains("OS X"). > > Seems like this comment was wrong to begin with, and is wrong now: > > 55 /* Returns "sparc" if on SPARC, "x86" if on x86. */ > 56 public static String getCPU() throws UnsupportedPlatformException { > It returns a wide variety of values. :^( Good observation. Let me update the comment with something more appropriate. > > >> http://cr.openjdk.java.net/~jmelvin/7130404/jdk/webrev.01 > > There are 4 critical ARCH weapons, all of them have inconsistencies and risks when sharpened or changed: > 1. LIBARCH or the name in the install trees, e.g. lib/sparc, lib/i386, lib/amd64 > 2. os.arch, or what the Java property value is, e.g. x86, sparc, i586, i386?, sparcv9, amd64, x86_64,... > 3. The arch name used in the bundle names, e.g. sparc, x86, x64, etc. > 4. The arch name used in the build directories, e.g. build/solaris-sparc, build/solaris-x64, ... > > However, like the Monty Python Spanish Inquisition, http://www.youtube.com/watch?v=vt0Y39eMvpI, > nobody really remembers what the real weapon list is. :^( > > But I digress... In the Makefiles, I was trying to limit the ARCH values, and for 64bit x86 > I have tried to use x64 or X64 and have been trying to avoid amd64 or x86_64. > This is separate from the above weapon list, they all do not and probably can never all be the > same, but where we can avoid repeating the same ARCH with a different spelling, we should. > > I think the bottom line is that the Defs-macos.gmk and Platform.gmk file probably could be trimmed > down for Mac, but I don;t see a pressing need right now. Agreed. The likely time to consolidate is when we reconcile the Unix platforms. I imagine we'll commit to this at some point. > >> http://cr.openjdk.java.net/~jmelvin/7130404/corba/webrev.01 > > Not sure this change is necessary, corba no longer compiles any native code. > But it seems harmless. Although it's unlikely corba will revert to using native code, so this change is mainly to be consistent with the jdk repo. - Jim > > -kto > > >> >> Main changes were to refine the use of string compares for Mac OS X... >> >> < osName.startsWith("Mac OS") >>> osName.contains("OS X") >> >> Any final comments? A decision has not yet been made to include this >> change or not. I'll provide an update when there's progress. >> >> - Jim >> >> >> >> On 2/20/12 4:02 PM, James Melvin wrote: >>> Hi, >>> >>> To maintain compatibility with Apple JDKs, a proposal will be made to >>> change the 'os.arch' system property from 'amd64' to 'x86_64' on Mac OS >>> X. Minor changes are required to the following repositories, for which >>> I've provided webrevs... >>> >>> WEBREV: >>> http://cr.openjdk.java.net/~jmelvin/7130404/hotspot/webrev.00 >>> http://cr.openjdk.java.net/~jmelvin/7130404/jdk/webrev.00 >>> >>> TESTING: >>> JPRT job (2012-02-20-203901.jmelvin.hotspot) >>> Notepad, SwingSet2, SPECjbb2005 >>> >>> This change will also impact a small number of internal tests and RE >>> scripts. The bundle names will also reflect the change amd64 -> x86_64. >>> HotSpot changes can be integrated first, with the JDK changes in the >>> following promotion. Should the proposal be rejected for 7u4, I >>> obviously withdraw the bugfix. >>> >>> Feedback welcome, >>> >>> Jim > From james.melvin at oracle.com Wed Feb 22 15:10:05 2012 From: james.melvin at oracle.com (James Melvin) Date: Wed, 22 Feb 2012 18:10:05 -0500 Subject: RFR (XXS): 7130404: [macosx] "os.arch" value should be "x86_64" for compatibility with Apple JDK6 In-Reply-To: <4F442408.3070807@oracle.com> References: <4F42B4D5.2000004@oracle.com> <4F442408.3070807@oracle.com> Message-ID: <4F4575CD.7050708@oracle.com> Updated to include latest comments... http://cr.openjdk.java.net/~jmelvin/7130404/hotspot/webrev.02 http://cr.openjdk.java.net/~jmelvin/7130404/jdk/webrev.02 http://cr.openjdk.java.net/~jmelvin/7130404/corba/webrev.01 Changed... hotspot: agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java - refined method comment to be more appropriate jdk: src/share/classes/java/awt/GraphicsEnvironment.java - revert changes based on an offline discussion with AWT - Jim On 2/21/12 6:08 PM, James Melvin wrote: > Thanks for the reviews! Updated webrevs with all comments... > > http://cr.openjdk.java.net/~jmelvin/7130404/hotspot/webrev.01 > http://cr.openjdk.java.net/~jmelvin/7130404/jdk/webrev.01 > http://cr.openjdk.java.net/~jmelvin/7130404/corba/webrev.01 > > Main changes were to refine the use of string compares for Mac OS X... > > < osName.startsWith("Mac OS") > > osName.contains("OS X") > > Any final comments? A decision has not yet been made to include this > change or not. I'll provide an update when there's progress. > > - Jim > > > > On 2/20/12 4:02 PM, James Melvin wrote: >> Hi, >> >> To maintain compatibility with Apple JDKs, a proposal will be made to >> change the 'os.arch' system property from 'amd64' to 'x86_64' on Mac OS >> X. Minor changes are required to the following repositories, for which >> I've provided webrevs... >> >> WEBREV: >> http://cr.openjdk.java.net/~jmelvin/7130404/hotspot/webrev.00 >> http://cr.openjdk.java.net/~jmelvin/7130404/jdk/webrev.00 >> >> TESTING: >> JPRT job (2012-02-20-203901.jmelvin.hotspot) >> Notepad, SwingSet2, SPECjbb2005 >> >> This change will also impact a small number of internal tests and RE >> scripts. The bundle names will also reflect the change amd64 -> x86_64. >> HotSpot changes can be integrated first, with the JDK changes in the >> following promotion. Should the proposal be rejected for 7u4, I >> obviously withdraw the bugfix. >> >> Feedback welcome, >> >> Jim From stephen.bannasch at deanbrook.org Wed Feb 22 16:39:34 2012 From: stephen.bannasch at deanbrook.org (Stephen Bannasch) Date: Wed, 22 Feb 2012 19:39:34 -0500 Subject: RFR (XXS): 7130404: [macosx] "os.arch" value should be "x86_64" for compatibility with Apple JDK6 In-Reply-To: <4F4575CD.7050708@oracle.com> References: <4F42B4D5.2000004@oracle.com> <4F442408.3070807@oracle.com> <4F4575CD.7050708@oracle.com> Message-ID: At 6:10 PM -0500 2/22/12, James Melvin wrote: >Updated to include latest comments... > >http://cr.openjdk.java.net/~jmelvin/7130404/hotspot/webrev.02 line 46 still uses: os.startsWith("Mac OS X") instead of os.contains("OS X") http://cr.openjdk.java.net/~jmelvin/7130404/hotspot/webrev.02/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java.html From james.melvin at oracle.com Sun Feb 26 19:57:06 2012 From: james.melvin at oracle.com (James Melvin) Date: Sun, 26 Feb 2012 22:57:06 -0500 Subject: RFR (XXS): 7130404: [macosx] "os.arch" value should be "x86_64" for compatibility with Apple JDK6 In-Reply-To: References: <4F42B4D5.2000004@oracle.com> <4F442408.3070807@oracle.com> <4F4575CD.7050708@oracle.com> Message-ID: <4F4AFF12.5010105@oracle.com> Hi Stephen, The scope of the work for 7130404 is to... 1) Convert os.arch callsites to use 'x86_64' instead of 'amd64' 2) Add *missing* os.name callsites for Mac OS X I did not originally plan to fixup *existing* os.name callsites. However, your review has inspired me to expand the scope of 7130404 to do just that. I walked the ~300 os.name/os.arch callsites and it turns out that only a couple dozen need fixing up to use .contains() instead of .startsWith(). I've updated the webrevs to reflect this additional work. Might as well get it over now and get on to bigger and better things. :) WEBREV: http://cr.openjdk.java.net/~jmelvin/7130404/hotspot/webrev.03 http://cr.openjdk.java.net/~jmelvin/7130404/jdk/webrev.04 http://cr.openjdk.java.net/~jmelvin/7130404/corba/webrev.02 TESTING: JPRT hotspot and jdk builds and smoke tests on all platforms Notepad, SwingSet2, SPECjbb2005 on Mac OS X Any final comments would be appreciated. - Jim On 2/22/12 7:39 PM, Stephen Bannasch wrote: > At 6:10 PM -0500 2/22/12, James Melvin wrote: >> Updated to include latest comments... >> >> http://cr.openjdk.java.net/~jmelvin/7130404/hotspot/webrev.02 > > line 46 still uses: os.startsWith("Mac OS X") instead of os.contains("OS X") > > http://cr.openjdk.java.net/~jmelvin/7130404/hotspot/webrev.02/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java.html From kelly.ohair at oracle.com Mon Feb 27 12:53:37 2012 From: kelly.ohair at oracle.com (Kelly O'Hair) Date: Mon, 27 Feb 2012 12:53:37 -0800 Subject: RFR (XXS): 7130404: [macosx] "os.arch" value should be "x86_64" for compatibility with Apple JDK6 In-Reply-To: <4F4AFF12.5010105@oracle.com> References: <4F42B4D5.2000004@oracle.com> <4F442408.3070807@oracle.com> <4F4575CD.7050708@oracle.com> <4F4AFF12.5010105@oracle.com> Message-ID: <2A8126A2-AA1B-4579-8A66-1FE5909849B0@oracle.com> On Feb 26, 2012, at 7:57 PM, James Melvin wrote: > Hi Stephen, > > The scope of the work for 7130404 is to... > > 1) Convert os.arch callsites to use 'x86_64' instead of 'amd64' > 2) Add *missing* os.name callsites for Mac OS X > > I did not originally plan to fixup *existing* os.name callsites. > However, your review has inspired me to expand the scope of 7130404 to > do just that. I walked the ~300 os.name/os.arch callsites and it turns > out that only a couple dozen need fixing up to use .contains() instead > of .startsWith(). I've updated the webrevs to reflect this additional > work. Might as well get it over now and get on to bigger and better > things. :) > > WEBREV: > http://cr.openjdk.java.net/~jmelvin/7130404/hotspot/webrev.03 Looks fine. agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java mentions "Darwin", not sure why. Also looks for "FreeBSD" "NetBSD" and "OpenBSD" But the rest of the jdk doesn't. Just seems strange to me to be looking for values of the Java property "os.name" that we don't appear to support. > http://cr.openjdk.java.net/~jmelvin/7130404/jdk/webrev.04 Again, looks fine. Also see a "Darwin" in src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java: osname.equals("Darwin") I don't think it will ever say "Darwin" will it? Not your change, I'm just curious. And if it ever did say "Darwin", I doubt any of the other files that don't look for "Darwin" would work anyway. > http://cr.openjdk.java.net/~jmelvin/7130404/corba/webrev.02 Looks fine. > > TESTING: > JPRT hotspot and jdk builds and smoke tests on all platforms > Notepad, SwingSet2, SPECjbb2005 on Mac OS X > > Any final comments would be appreciated. Just my comments on Darwin, but don't consider that a hold up on the changes. -kto > > - Jim > > > > > On 2/22/12 7:39 PM, Stephen Bannasch wrote: >> At 6:10 PM -0500 2/22/12, James Melvin wrote: >>> Updated to include latest comments... >>> >>> http://cr.openjdk.java.net/~jmelvin/7130404/hotspot/webrev.02 >> >> line 46 still uses: os.startsWith("Mac OS X") instead of os.contains("OS X") >> >> http://cr.openjdk.java.net/~jmelvin/7130404/hotspot/webrev.02/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java.html