Re: URGENT code review request for Solaris FDS fix (7175255)
Greetings, I've updated the fix to (hopefully) address Kelly's and David H's concerns. Here is the URL for code review round 1: http://cr.openjdk.java.net/~dcubed/fds_revamp/7175255-webrev/1/ Brief summary of changes relative to code review round 0: - removed definition of GENERATED from both add_gnu_debuglink.make and fix_empty_sec_hdr_flags.make; this will decouple these work around Makefiles from the regular HotSpot Makefiles that define the GENERATED macro. No, I'm not cleaning up that mess. :-) - add new XLIBJVM_DIR = 64 variable and change all uses of a literal 64 in dtrace.make to the new variable - drop uses of $(QUIETLY) in sub-shell constructs; I don't think $(QUIETLY) works in sub-shells anyway, but my memory is fuzzy there Test JPRT jobs for HSX-24 and HSX-23.2 are in flight right now. Thanks, in advance, for any reviews! Dan On 6/19/12 7:21 PM, Daniel D. Daugherty wrote: Greetings, This is an URGENT code review request for a Solaris specific Full Debug Symbols (FDS) fix. Due to a Makefile logic error, the full debug symbol files and related '_g' symlinks are created in the wrong sub-directory for a couple of the dtrace libraries. The incorrect paths have a double 64/ sub-directory, e.g.: solaris-arch/jre/lib/arch/client/64/64/libjvm_db.debuginfo These are the correct symlink paths: solaris-arch/fastdebug/jre/lib/arch/client/64/libjvm_g_db.debuginfo solaris-arch/fastdebug/jre/lib/arch/client/64/libjvm_g_dtrace.debuginfo solaris-arch/fastdebug/jre/lib/arch/server/64/libjvm_g_db.debuginfo solaris-arch/fastdebug/jre/lib/arch/server/64/libjvm_g_dtrace.debuginfo and these are the correct debug info file paths: solaris-arch/jre/lib/arch/client/64/libjvm_db.debuginfo solaris-arch/jre/lib/arch/client/64/libjvm_dtrace.debuginfo solaris-arch/jre/lib/arch/server/64/libjvm_db.debuginfo solaris-arch/jre/lib/arch/server/64/libjvm_dtrace.debuginfo solaris-arch/fastdebug/jre/lib/arch/client/64/libjvm_db.debuginfo solaris-arch/fastdebug/jre/lib/arch/client/64/libjvm_dtrace.debuginfo solaris-arch/fastdebug/jre/lib/arch/server/64/libjvm_db.debuginfo solaris-arch/fastdebug/jre/lib/arch/server/64/libjvm_dtrace.debuginfo where arch is i586 or sparc. The 64-bit Solaris platforms (amd64 and sparcv9) don't have this issue because they don't have the 64/ sub-directories. This fix is targeted at HSX-24/JDK8 and HSX-23.2/JDK7u6 and will resolve an issue that is preventing Oracle's Release Engineering scripts from running properly. Here is the webrev URL for the HSX-24/JDK8 version: http://cr.openjdk.java.net/~dcubed/fds_revamp/7175255-webrev/0/ The HSX23.3/JDK7u6 version is the same except for the changes to make/solaris/makefiles/defs.make which are not needed in HSX23.2. Thanks, in advance, for any reviews! Dan
Re: URGENT code review request for Solaris FDS fix (7175255)
You still have repeated patterns like: 131 ( set -e ; \ 132 cd $(XLIBJVM_DIR) ; \ 133 $(ADD_GNU_DEBUGLINK) $(LIBJVM_DB_DEBUGINFO) $(LIBJVM_DB) ; \ 134 ) When 131 ( cd $(XLIBJVM_DIR) $(ADD_GNU_DEBUGLINK) $(LIBJVM_DB_DEBUGINFO) $(LIBJVM_DB) ) does the same thing and is more obvious, no need for the set -e -kto On Jun 20, 2012, at 9:23 AM, Daniel D. Daugherty wrote: Greetings, I've updated the fix to (hopefully) address Kelly's and David H's concerns. Here is the URL for code review round 1: http://cr.openjdk.java.net/~dcubed/fds_revamp/7175255-webrev/1/ Brief summary of changes relative to code review round 0: - removed definition of GENERATED from both add_gnu_debuglink.make and fix_empty_sec_hdr_flags.make; this will decouple these work around Makefiles from the regular HotSpot Makefiles that define the GENERATED macro. No, I'm not cleaning up that mess. :-) - add new XLIBJVM_DIR = 64 variable and change all uses of a literal 64 in dtrace.make to the new variable - drop uses of $(QUIETLY) in sub-shell constructs; I don't think $(QUIETLY) works in sub-shells anyway, but my memory is fuzzy there Test JPRT jobs for HSX-24 and HSX-23.2 are in flight right now. Thanks, in advance, for any reviews! Dan On 6/19/12 7:21 PM, Daniel D. Daugherty wrote: Greetings, This is an URGENT code review request for a Solaris specific Full Debug Symbols (FDS) fix. Due to a Makefile logic error, the full debug symbol files and related '_g' symlinks are created in the wrong sub-directory for a couple of the dtrace libraries. The incorrect paths have a double 64/ sub-directory, e.g.: solaris-arch/jre/lib/arch/client/64/64/libjvm_db.debuginfo These are the correct symlink paths: solaris-arch/fastdebug/jre/lib/arch/client/64/libjvm_g_db.debuginfo solaris-arch/fastdebug/jre/lib/arch/client/64/libjvm_g_dtrace.debuginfo solaris-arch/fastdebug/jre/lib/arch/server/64/libjvm_g_db.debuginfo solaris-arch/fastdebug/jre/lib/arch/server/64/libjvm_g_dtrace.debuginfo and these are the correct debug info file paths: solaris-arch/jre/lib/arch/client/64/libjvm_db.debuginfo solaris-arch/jre/lib/arch/client/64/libjvm_dtrace.debuginfo solaris-arch/jre/lib/arch/server/64/libjvm_db.debuginfo solaris-arch/jre/lib/arch/server/64/libjvm_dtrace.debuginfo solaris-arch/fastdebug/jre/lib/arch/client/64/libjvm_db.debuginfo solaris-arch/fastdebug/jre/lib/arch/client/64/libjvm_dtrace.debuginfo solaris-arch/fastdebug/jre/lib/arch/server/64/libjvm_db.debuginfo solaris-arch/fastdebug/jre/lib/arch/server/64/libjvm_dtrace.debuginfo where arch is i586 or sparc. The 64-bit Solaris platforms (amd64 and sparcv9) don't have this issue because they don't have the 64/ sub-directories. This fix is targeted at HSX-24/JDK8 and HSX-23.2/JDK7u6 and will resolve an issue that is preventing Oracle's Release Engineering scripts from running properly. Here is the webrev URL for the HSX-24/JDK8 version: http://cr.openjdk.java.net/~dcubed/fds_revamp/7175255-webrev/0/ The HSX23.3/JDK7u6 version is the same except for the changes to make/solaris/makefiles/defs.make which are not needed in HSX23.2. Thanks, in advance, for any reviews! Dan
Re: URGENT code review request for Solaris FDS fix (7175255)
On 6/20/12 10:41 AM, Kelly O'Hair wrote: You still have repeated patterns like: 131 ( set -e ; \ 132 cd $(XLIBJVM_DIR) ; \ 133 $(ADD_GNU_DEBUGLINK) $(LIBJVM_DB_DEBUGINFO) $(LIBJVM_DB) ; \ 134 ) When 131 ( cd $(XLIBJVM_DIR) $(ADD_GNU_DEBUGLINK) $(LIBJVM_DB_DEBUGINFO) $(LIBJVM_DB) ) does the same thing and is more obvious, no need for the set -e Yes, that's because I didn't hear back from you after my reply from late last night. The set -e is there because you asked me to add it in a previous FDS fix. I'll switch it. Dan -kto On Jun 20, 2012, at 9:23 AM, Daniel D. Daugherty wrote: Greetings, I've updated the fix to (hopefully) address Kelly's and David H's concerns. Here is the URL for code review round 1: http://cr.openjdk.java.net/~dcubed/fds_revamp/7175255-webrev/1/ Brief summary of changes relative to code review round 0: - removed definition of GENERATED from both add_gnu_debuglink.make and fix_empty_sec_hdr_flags.make; this will decouple these work around Makefiles from the regular HotSpot Makefiles that define the GENERATED macro. No, I'm not cleaning up that mess. :-) - add new XLIBJVM_DIR = 64 variable and change all uses of a literal 64 in dtrace.make to the new variable - drop uses of $(QUIETLY) in sub-shell constructs; I don't think $(QUIETLY) works in sub-shells anyway, but my memory is fuzzy there Test JPRT jobs for HSX-24 and HSX-23.2 are in flight right now. Thanks, in advance, for any reviews! Dan On 6/19/12 7:21 PM, Daniel D. Daugherty wrote: Greetings, This is an URGENT code review request for a Solaris specific Full Debug Symbols (FDS) fix. Due to a Makefile logic error, the full debug symbol files and related '_g' symlinks are created in the wrong sub-directory for a couple of the dtrace libraries. The incorrect paths have a double 64/ sub-directory, e.g.: solaris-arch/jre/lib/arch/client/64/64/libjvm_db.debuginfo These are the correct symlink paths: solaris-arch/fastdebug/jre/lib/arch/client/64/libjvm_g_db.debuginfo solaris-arch/fastdebug/jre/lib/arch/client/64/libjvm_g_dtrace.debuginfo solaris-arch/fastdebug/jre/lib/arch/server/64/libjvm_g_db.debuginfo solaris-arch/fastdebug/jre/lib/arch/server/64/libjvm_g_dtrace.debuginfo and these are the correct debug info file paths: solaris-arch/jre/lib/arch/client/64/libjvm_db.debuginfo solaris-arch/jre/lib/arch/client/64/libjvm_dtrace.debuginfo solaris-arch/jre/lib/arch/server/64/libjvm_db.debuginfo solaris-arch/jre/lib/arch/server/64/libjvm_dtrace.debuginfo solaris-arch/fastdebug/jre/lib/arch/client/64/libjvm_db.debuginfo solaris-arch/fastdebug/jre/lib/arch/client/64/libjvm_dtrace.debuginfo solaris-arch/fastdebug/jre/lib/arch/server/64/libjvm_db.debuginfo solaris-arch/fastdebug/jre/lib/arch/server/64/libjvm_dtrace.debuginfo where arch is i586 or sparc. The 64-bit Solaris platforms (amd64 and sparcv9) don't have this issue because they don't have the 64/ sub-directories. This fix is targeted at HSX-24/JDK8 and HSX-23.2/JDK7u6 and will resolve an issue that is preventing Oracle's Release Engineering scripts from running properly. Here is the webrev URL for the HSX-24/JDK8 version: http://cr.openjdk.java.net/~dcubed/fds_revamp/7175255-webrev/0/ The HSX23.3/JDK7u6 version is the same except for the changes to make/solaris/makefiles/defs.make which are not needed in HSX23.2. Thanks, in advance, for any reviews! Dan
Re: URGENT code review request for Solaris FDS fix (7175255)
On 6/20/12 10:44 AM, Daniel D. Daugherty wrote: On 6/20/12 10:41 AM, Kelly O'Hair wrote: You still have repeated patterns like: 131 ( set -e ; \ 132 cd $(XLIBJVM_DIR) ; \ 133 $(ADD_GNU_DEBUGLINK) $(LIBJVM_DB_DEBUGINFO) $(LIBJVM_DB) ; \ 134 ) When 131 ( cd $(XLIBJVM_DIR) $(ADD_GNU_DEBUGLINK) $(LIBJVM_DB_DEBUGINFO) $(LIBJVM_DB) ) does the same thing and is more obvious, no need for the set -e Yes, that's because I didn't hear back from you after my reply from late last night. The set -e is there because you asked me to add it in a previous FDS fix. I'll switch it. Fixed. See the following: http://cr.openjdk.java.net/~dcubed/fds_revamp/7175255-webrev/2/ Only make/solaris/makefiles/dtrace.make has changed in this round... Dan Dan -kto On Jun 20, 2012, at 9:23 AM, Daniel D. Daugherty wrote: Greetings, I've updated the fix to (hopefully) address Kelly's and David H's concerns. Here is the URL for code review round 1: http://cr.openjdk.java.net/~dcubed/fds_revamp/7175255-webrev/1/ Brief summary of changes relative to code review round 0: - removed definition of GENERATED from both add_gnu_debuglink.make and fix_empty_sec_hdr_flags.make; this will decouple these work around Makefiles from the regular HotSpot Makefiles that define the GENERATED macro. No, I'm not cleaning up that mess. :-) - add new XLIBJVM_DIR = 64 variable and change all uses of a literal 64 in dtrace.make to the new variable - drop uses of $(QUIETLY) in sub-shell constructs; I don't think $(QUIETLY) works in sub-shells anyway, but my memory is fuzzy there Test JPRT jobs for HSX-24 and HSX-23.2 are in flight right now. Thanks, in advance, for any reviews! Dan On 6/19/12 7:21 PM, Daniel D. Daugherty wrote: Greetings, This is an URGENT code review request for a Solaris specific Full Debug Symbols (FDS) fix. Due to a Makefile logic error, the full debug symbol files and related '_g' symlinks are created in the wrong sub-directory for a couple of the dtrace libraries. The incorrect paths have a double 64/ sub-directory, e.g.: solaris-arch/jre/lib/arch/client/64/64/libjvm_db.debuginfo These are the correct symlink paths: solaris-arch/fastdebug/jre/lib/arch/client/64/libjvm_g_db.debuginfo solaris-arch/fastdebug/jre/lib/arch/client/64/libjvm_g_dtrace.debuginfo solaris-arch/fastdebug/jre/lib/arch/server/64/libjvm_g_db.debuginfo solaris-arch/fastdebug/jre/lib/arch/server/64/libjvm_g_dtrace.debuginfo and these are the correct debug info file paths: solaris-arch/jre/lib/arch/client/64/libjvm_db.debuginfo solaris-arch/jre/lib/arch/client/64/libjvm_dtrace.debuginfo solaris-arch/jre/lib/arch/server/64/libjvm_db.debuginfo solaris-arch/jre/lib/arch/server/64/libjvm_dtrace.debuginfo solaris-arch/fastdebug/jre/lib/arch/client/64/libjvm_db.debuginfo solaris-arch/fastdebug/jre/lib/arch/client/64/libjvm_dtrace.debuginfo solaris-arch/fastdebug/jre/lib/arch/server/64/libjvm_db.debuginfo solaris-arch/fastdebug/jre/lib/arch/server/64/libjvm_dtrace.debuginfo where arch is i586 or sparc. The 64-bit Solaris platforms (amd64 and sparcv9) don't have this issue because they don't have the 64/ sub-directories. This fix is targeted at HSX-24/JDK8 and HSX-23.2/JDK7u6 and will resolve an issue that is preventing Oracle's Release Engineering scripts from running properly. Here is the webrev URL for the HSX-24/JDK8 version: http://cr.openjdk.java.net/~dcubed/fds_revamp/7175255-webrev/0/ The HSX23.3/JDK7u6 version is the same except for the changes to make/solaris/makefiles/defs.make which are not needed in HSX23.2. Thanks, in advance, for any reviews! Dan
Re: URGENT code review request for Solaris FDS fix (7175255)
Kelly, The JPRT job testing the latest HSX-24 version has finished and I have identical test results to the original version of this fix. The JPRT job testing the latest HSX-23.2 version is still running, but so far there are no issues. Could you let me know if this latest version resolves your code review comments? Dan On 6/20/12 11:02 AM, Daniel D. Daugherty wrote: On 6/20/12 10:44 AM, Daniel D. Daugherty wrote: On 6/20/12 10:41 AM, Kelly O'Hair wrote: You still have repeated patterns like: 131 ( set -e ; \ 132 cd $(XLIBJVM_DIR) ; \ 133 $(ADD_GNU_DEBUGLINK) $(LIBJVM_DB_DEBUGINFO) $(LIBJVM_DB) ; \ 134 ) When 131 ( cd $(XLIBJVM_DIR) $(ADD_GNU_DEBUGLINK) $(LIBJVM_DB_DEBUGINFO) $(LIBJVM_DB) ) does the same thing and is more obvious, no need for the set -e Yes, that's because I didn't hear back from you after my reply from late last night. The set -e is there because you asked me to add it in a previous FDS fix. I'll switch it. Fixed. See the following: http://cr.openjdk.java.net/~dcubed/fds_revamp/7175255-webrev/2/ Only make/solaris/makefiles/dtrace.make has changed in this round... Dan Dan -kto On Jun 20, 2012, at 9:23 AM, Daniel D. Daugherty wrote: Greetings, I've updated the fix to (hopefully) address Kelly's and David H's concerns. Here is the URL for code review round 1: http://cr.openjdk.java.net/~dcubed/fds_revamp/7175255-webrev/1/ Brief summary of changes relative to code review round 0: - removed definition of GENERATED from both add_gnu_debuglink.make and fix_empty_sec_hdr_flags.make; this will decouple these work around Makefiles from the regular HotSpot Makefiles that define the GENERATED macro. No, I'm not cleaning up that mess. :-) - add new XLIBJVM_DIR = 64 variable and change all uses of a literal 64 in dtrace.make to the new variable - drop uses of $(QUIETLY) in sub-shell constructs; I don't think $(QUIETLY) works in sub-shells anyway, but my memory is fuzzy there Test JPRT jobs for HSX-24 and HSX-23.2 are in flight right now. Thanks, in advance, for any reviews! Dan On 6/19/12 7:21 PM, Daniel D. Daugherty wrote: Greetings, This is an URGENT code review request for a Solaris specific Full Debug Symbols (FDS) fix. Due to a Makefile logic error, the full debug symbol files and related '_g' symlinks are created in the wrong sub-directory for a couple of the dtrace libraries. The incorrect paths have a double 64/ sub-directory, e.g.: solaris-arch/jre/lib/arch/client/64/64/libjvm_db.debuginfo These are the correct symlink paths: solaris-arch/fastdebug/jre/lib/arch/client/64/libjvm_g_db.debuginfo solaris-arch/fastdebug/jre/lib/arch/client/64/libjvm_g_dtrace.debuginfo solaris-arch/fastdebug/jre/lib/arch/server/64/libjvm_g_db.debuginfo solaris-arch/fastdebug/jre/lib/arch/server/64/libjvm_g_dtrace.debuginfo and these are the correct debug info file paths: solaris-arch/jre/lib/arch/client/64/libjvm_db.debuginfo solaris-arch/jre/lib/arch/client/64/libjvm_dtrace.debuginfo solaris-arch/jre/lib/arch/server/64/libjvm_db.debuginfo solaris-arch/jre/lib/arch/server/64/libjvm_dtrace.debuginfo solaris-arch/fastdebug/jre/lib/arch/client/64/libjvm_db.debuginfo solaris-arch/fastdebug/jre/lib/arch/client/64/libjvm_dtrace.debuginfo solaris-arch/fastdebug/jre/lib/arch/server/64/libjvm_db.debuginfo solaris-arch/fastdebug/jre/lib/arch/server/64/libjvm_dtrace.debuginfo where arch is i586 or sparc. The 64-bit Solaris platforms (amd64 and sparcv9) don't have this issue because they don't have the 64/ sub-directories. This fix is targeted at HSX-24/JDK8 and HSX-23.2/JDK7u6 and will resolve an issue that is preventing Oracle's Release Engineering scripts from running properly. Here is the webrev URL for the HSX-24/JDK8 version: http://cr.openjdk.java.net/~dcubed/fds_revamp/7175255-webrev/0/ The HSX23.3/JDK7u6 version is the same except for the changes to make/solaris/makefiles/defs.make which are not needed in HSX23.2. Thanks, in advance, for any reviews! Dan
Re: URGENT code review request for Solaris FDS fix (7175255)
Looks fine. -kto On Jun 20, 2012, at 12:04 PM, Daniel D. Daugherty wrote: Kelly, The JPRT job testing the latest HSX-24 version has finished and I have identical test results to the original version of this fix. The JPRT job testing the latest HSX-23.2 version is still running, but so far there are no issues. Could you let me know if this latest version resolves your code review comments? Dan On 6/20/12 11:02 AM, Daniel D. Daugherty wrote: On 6/20/12 10:44 AM, Daniel D. Daugherty wrote: On 6/20/12 10:41 AM, Kelly O'Hair wrote: You still have repeated patterns like: 131 ( set -e ; \ 132 cd $(XLIBJVM_DIR) ; \ 133 $(ADD_GNU_DEBUGLINK) $(LIBJVM_DB_DEBUGINFO) $(LIBJVM_DB) ; \ 134 ) When 131 ( cd $(XLIBJVM_DIR) $(ADD_GNU_DEBUGLINK) $(LIBJVM_DB_DEBUGINFO) $(LIBJVM_DB) ) does the same thing and is more obvious, no need for the set -e Yes, that's because I didn't hear back from you after my reply from late last night. The set -e is there because you asked me to add it in a previous FDS fix. I'll switch it. Fixed. See the following: http://cr.openjdk.java.net/~dcubed/fds_revamp/7175255-webrev/2/ Only make/solaris/makefiles/dtrace.make has changed in this round... Dan Dan -kto On Jun 20, 2012, at 9:23 AM, Daniel D. Daugherty wrote: Greetings, I've updated the fix to (hopefully) address Kelly's and David H's concerns. Here is the URL for code review round 1: http://cr.openjdk.java.net/~dcubed/fds_revamp/7175255-webrev/1/ Brief summary of changes relative to code review round 0: - removed definition of GENERATED from both add_gnu_debuglink.make and fix_empty_sec_hdr_flags.make; this will decouple these work around Makefiles from the regular HotSpot Makefiles that define the GENERATED macro. No, I'm not cleaning up that mess. :-) - add new XLIBJVM_DIR = 64 variable and change all uses of a literal 64 in dtrace.make to the new variable - drop uses of $(QUIETLY) in sub-shell constructs; I don't think $(QUIETLY) works in sub-shells anyway, but my memory is fuzzy there Test JPRT jobs for HSX-24 and HSX-23.2 are in flight right now. Thanks, in advance, for any reviews! Dan On 6/19/12 7:21 PM, Daniel D. Daugherty wrote: Greetings, This is an URGENT code review request for a Solaris specific Full Debug Symbols (FDS) fix. Due to a Makefile logic error, the full debug symbol files and related '_g' symlinks are created in the wrong sub-directory for a couple of the dtrace libraries. The incorrect paths have a double 64/ sub-directory, e.g.: solaris-arch/jre/lib/arch/client/64/64/libjvm_db.debuginfo These are the correct symlink paths: solaris-arch/fastdebug/jre/lib/arch/client/64/libjvm_g_db.debuginfo solaris-arch/fastdebug/jre/lib/arch/client/64/libjvm_g_dtrace.debuginfo solaris-arch/fastdebug/jre/lib/arch/server/64/libjvm_g_db.debuginfo solaris-arch/fastdebug/jre/lib/arch/server/64/libjvm_g_dtrace.debuginfo and these are the correct debug info file paths: solaris-arch/jre/lib/arch/client/64/libjvm_db.debuginfo solaris-arch/jre/lib/arch/client/64/libjvm_dtrace.debuginfo solaris-arch/jre/lib/arch/server/64/libjvm_db.debuginfo solaris-arch/jre/lib/arch/server/64/libjvm_dtrace.debuginfo solaris-arch/fastdebug/jre/lib/arch/client/64/libjvm_db.debuginfo solaris-arch/fastdebug/jre/lib/arch/client/64/libjvm_dtrace.debuginfo solaris-arch/fastdebug/jre/lib/arch/server/64/libjvm_db.debuginfo solaris-arch/fastdebug/jre/lib/arch/server/64/libjvm_dtrace.debuginfo where arch is i586 or sparc. The 64-bit Solaris platforms (amd64 and sparcv9) don't have this issue because they don't have the 64/ sub-directories. This fix is targeted at HSX-24/JDK8 and HSX-23.2/JDK7u6 and will resolve an issue that is preventing Oracle's Release Engineering scripts from running properly. Here is the webrev URL for the HSX-24/JDK8 version: http://cr.openjdk.java.net/~dcubed/fds_revamp/7175255-webrev/0/ The HSX23.3/JDK7u6 version is the same except for the changes to make/solaris/makefiles/defs.make which are not needed in HSX23.2. Thanks, in advance, for any reviews! Dan
Re: URGENT code review request for Solaris FDS fix (7175255)
Thanks! Dan On 6/20/12 3:03 PM, David Holmes wrote: Looks good to me Dan! Thanks, David On 21/06/2012 3:02 AM, Daniel D. Daugherty wrote: On 6/20/12 10:44 AM, Daniel D. Daugherty wrote: On 6/20/12 10:41 AM, Kelly O'Hair wrote: You still have repeated patterns like: 131 ( set -e ; \ 132 cd $(XLIBJVM_DIR) ; \ 133 $(ADD_GNU_DEBUGLINK) $(LIBJVM_DB_DEBUGINFO) $(LIBJVM_DB) ; \ 134 ) When 131 ( cd $(XLIBJVM_DIR) $(ADD_GNU_DEBUGLINK) $(LIBJVM_DB_DEBUGINFO) $(LIBJVM_DB) ) does the same thing and is more obvious, no need for the set -e Yes, that's because I didn't hear back from you after my reply from late last night. The set -e is there because you asked me to add it in a previous FDS fix. I'll switch it. Fixed. See the following: http://cr.openjdk.java.net/~dcubed/fds_revamp/7175255-webrev/2/ Only make/solaris/makefiles/dtrace.make has changed in this round... Dan Dan -kto On Jun 20, 2012, at 9:23 AM, Daniel D. Daugherty wrote: Greetings, I've updated the fix to (hopefully) address Kelly's and David H's concerns. Here is the URL for code review round 1: http://cr.openjdk.java.net/~dcubed/fds_revamp/7175255-webrev/1/ Brief summary of changes relative to code review round 0: - removed definition of GENERATED from both add_gnu_debuglink.make and fix_empty_sec_hdr_flags.make; this will decouple these work around Makefiles from the regular HotSpot Makefiles that define the GENERATED macro. No, I'm not cleaning up that mess. :-) - add new XLIBJVM_DIR = 64 variable and change all uses of a literal 64 in dtrace.make to the new variable - drop uses of $(QUIETLY) in sub-shell constructs; I don't think $(QUIETLY) works in sub-shells anyway, but my memory is fuzzy there Test JPRT jobs for HSX-24 and HSX-23.2 are in flight right now. Thanks, in advance, for any reviews! Dan On 6/19/12 7:21 PM, Daniel D. Daugherty wrote: Greetings, This is an URGENT code review request for a Solaris specific Full Debug Symbols (FDS) fix. Due to a Makefile logic error, the full debug symbol files and related '_g' symlinks are created in the wrong sub-directory for a couple of the dtrace libraries. The incorrect paths have a double 64/ sub-directory, e.g.: solaris-arch/jre/lib/arch/client/64/64/libjvm_db.debuginfo These are the correct symlink paths: solaris-arch/fastdebug/jre/lib/arch/client/64/libjvm_g_db.debuginfo solaris-arch/fastdebug/jre/lib/arch/client/64/libjvm_g_dtrace.debuginfo solaris-arch/fastdebug/jre/lib/arch/server/64/libjvm_g_db.debuginfo solaris-arch/fastdebug/jre/lib/arch/server/64/libjvm_g_dtrace.debuginfo and these are the correct debug info file paths: solaris-arch/jre/lib/arch/client/64/libjvm_db.debuginfo solaris-arch/jre/lib/arch/client/64/libjvm_dtrace.debuginfo solaris-arch/jre/lib/arch/server/64/libjvm_db.debuginfo solaris-arch/jre/lib/arch/server/64/libjvm_dtrace.debuginfo solaris-arch/fastdebug/jre/lib/arch/client/64/libjvm_db.debuginfo solaris-arch/fastdebug/jre/lib/arch/client/64/libjvm_dtrace.debuginfo solaris-arch/fastdebug/jre/lib/arch/server/64/libjvm_db.debuginfo solaris-arch/fastdebug/jre/lib/arch/server/64/libjvm_dtrace.debuginfo where arch is i586 or sparc. The 64-bit Solaris platforms (amd64 and sparcv9) don't have this issue because they don't have the 64/ sub-directories. This fix is targeted at HSX-24/JDK8 and HSX-23.2/JDK7u6 and will resolve an issue that is preventing Oracle's Release Engineering scripts from running properly. Here is the webrev URL for the HSX-24/JDK8 version: http://cr.openjdk.java.net/~dcubed/fds_revamp/7175255-webrev/0/ The HSX23.3/JDK7u6 version is the same except for the changes to make/solaris/makefiles/defs.make which are not needed in HSX23.2. Thanks, in advance, for any reviews! Dan
Re: URGENT code review request for Solaris FDS fix (7175255)
Looks good to me Dan! Thanks, David On 21/06/2012 3:02 AM, Daniel D. Daugherty wrote: On 6/20/12 10:44 AM, Daniel D. Daugherty wrote: On 6/20/12 10:41 AM, Kelly O'Hair wrote: You still have repeated patterns like: 131 ( set -e ; \ 132 cd $(XLIBJVM_DIR) ; \ 133 $(ADD_GNU_DEBUGLINK) $(LIBJVM_DB_DEBUGINFO) $(LIBJVM_DB) ; \ 134 ) When 131 ( cd $(XLIBJVM_DIR) $(ADD_GNU_DEBUGLINK) $(LIBJVM_DB_DEBUGINFO) $(LIBJVM_DB) ) does the same thing and is more obvious, no need for the set -e Yes, that's because I didn't hear back from you after my reply from late last night. The set -e is there because you asked me to add it in a previous FDS fix. I'll switch it. Fixed. See the following: http://cr.openjdk.java.net/~dcubed/fds_revamp/7175255-webrev/2/ Only make/solaris/makefiles/dtrace.make has changed in this round... Dan Dan -kto On Jun 20, 2012, at 9:23 AM, Daniel D. Daugherty wrote: Greetings, I've updated the fix to (hopefully) address Kelly's and David H's concerns. Here is the URL for code review round 1: http://cr.openjdk.java.net/~dcubed/fds_revamp/7175255-webrev/1/ Brief summary of changes relative to code review round 0: - removed definition of GENERATED from both add_gnu_debuglink.make and fix_empty_sec_hdr_flags.make; this will decouple these work around Makefiles from the regular HotSpot Makefiles that define the GENERATED macro. No, I'm not cleaning up that mess. :-) - add new XLIBJVM_DIR = 64 variable and change all uses of a literal 64 in dtrace.make to the new variable - drop uses of $(QUIETLY) in sub-shell constructs; I don't think $(QUIETLY) works in sub-shells anyway, but my memory is fuzzy there Test JPRT jobs for HSX-24 and HSX-23.2 are in flight right now. Thanks, in advance, for any reviews! Dan On 6/19/12 7:21 PM, Daniel D. Daugherty wrote: Greetings, This is an URGENT code review request for a Solaris specific Full Debug Symbols (FDS) fix. Due to a Makefile logic error, the full debug symbol files and related '_g' symlinks are created in the wrong sub-directory for a couple of the dtrace libraries. The incorrect paths have a double 64/ sub-directory, e.g.: solaris-arch/jre/lib/arch/client/64/64/libjvm_db.debuginfo These are the correct symlink paths: solaris-arch/fastdebug/jre/lib/arch/client/64/libjvm_g_db.debuginfo solaris-arch/fastdebug/jre/lib/arch/client/64/libjvm_g_dtrace.debuginfo solaris-arch/fastdebug/jre/lib/arch/server/64/libjvm_g_db.debuginfo solaris-arch/fastdebug/jre/lib/arch/server/64/libjvm_g_dtrace.debuginfo and these are the correct debug info file paths: solaris-arch/jre/lib/arch/client/64/libjvm_db.debuginfo solaris-arch/jre/lib/arch/client/64/libjvm_dtrace.debuginfo solaris-arch/jre/lib/arch/server/64/libjvm_db.debuginfo solaris-arch/jre/lib/arch/server/64/libjvm_dtrace.debuginfo solaris-arch/fastdebug/jre/lib/arch/client/64/libjvm_db.debuginfo solaris-arch/fastdebug/jre/lib/arch/client/64/libjvm_dtrace.debuginfo solaris-arch/fastdebug/jre/lib/arch/server/64/libjvm_db.debuginfo solaris-arch/fastdebug/jre/lib/arch/server/64/libjvm_dtrace.debuginfo where arch is i586 or sparc. The 64-bit Solaris platforms (amd64 and sparcv9) don't have this issue because they don't have the 64/ sub-directories. This fix is targeted at HSX-24/JDK8 and HSX-23.2/JDK7u6 and will resolve an issue that is preventing Oracle's Release Engineering scripts from running properly. Here is the webrev URL for the HSX-24/JDK8 version: http://cr.openjdk.java.net/~dcubed/fds_revamp/7175255-webrev/0/ The HSX23.3/JDK7u6 version is the same except for the changes to make/solaris/makefiles/defs.make which are not needed in HSX23.2. Thanks, in advance, for any reviews! Dan
hg: jdk8/build: 2 new changesets
Changeset: 02c6c67c1bb7 Author:katleman Date: 2012-06-14 13:13 -0700 URL: http://hg.openjdk.java.net/jdk8/build/rev/02c6c67c1bb7 Added tag jdk8-b43 for changeset 661c9aae602b ! .hgtags Changeset: e4f81a817447 Author:katleman Date: 2012-06-20 15:22 -0700 URL: http://hg.openjdk.java.net/jdk8/build/rev/e4f81a817447 Merge
hg: jdk8/build/corba: Added tag jdk8-b43 for changeset cd879aff5d3c
Changeset: 439d9bf8e4ff Author:katleman Date: 2012-06-14 13:14 -0700 URL: http://hg.openjdk.java.net/jdk8/build/corba/rev/439d9bf8e4ff Added tag jdk8-b43 for changeset cd879aff5d3c ! .hgtags
hg: jdk8/build/hotspot: 35 new changesets
Changeset: b38fb5f31e31 Author:katleman Date: 2012-06-14 13:14 -0700 URL: http://hg.openjdk.java.net/jdk8/build/hotspot/rev/b38fb5f31e31 Added tag jdk8-b43 for changeset e77b8e0ed1f8 ! .hgtags Changeset: 6e2633440960 Author:amurillo Date: 2012-06-01 15:30 -0700 URL: http://hg.openjdk.java.net/jdk8/build/hotspot/rev/6e2633440960 7173438: new hotspot build - hs24-b14 Reviewed-by: jcoomes ! make/hotspot_version Changeset: fab99b17c1de Author:mikael Date: 2012-06-01 20:17 +0200 URL: http://hg.openjdk.java.net/jdk8/build/hotspot/rev/fab99b17c1de 7155453: [macosx] re-enable jbb tests in JPRT Summary: Run SPECjbb in headless mode and enable SPECjbb runs on OSX Reviewed-by: dcubed, dholmes ! make/jprt.properties Changeset: 4434fdad6b37 Author:dholmes Date: 2012-06-02 07:32 -0400 URL: http://hg.openjdk.java.net/jdk8/build/hotspot/rev/4434fdad6b37 Merge ! make/jprt.properties Changeset: e17b61ba7bb3 Author:kamg Date: 2012-06-04 10:22 -0400 URL: http://hg.openjdk.java.net/jdk8/build/hotspot/rev/e17b61ba7bb3 7166498: JVM crash in ClassVerifier Summary: Fixed raw pointer being used after potential safepoint/GC Reviewed-by: acorn, fparain, dholmes ! src/share/vm/classfile/verifier.cpp Changeset: a297b0e14605 Author:mgerdin Date: 2012-06-04 09:21 +0200 URL: http://hg.openjdk.java.net/jdk8/build/hotspot/rev/a297b0e14605 7172226: HotSpot fails to build with GCC 4.7 because of stricter c++ argument dependent lookup Summary: Add using keyword to import base class functions from FreeListT to fix template name lookup in gcc 4.7 Reviewed-by: brutisso, iveresov ! src/share/vm/memory/binaryTreeDictionary.cpp ! src/share/vm/memory/binaryTreeDictionary.hpp Changeset: 37552638d24a Author:brutisso Date: 2012-06-05 22:30 +0200 URL: http://hg.openjdk.java.net/jdk8/build/hotspot/rev/37552638d24a 7172388: G1: _total_full_collections should not be incremented for concurrent cycles Reviewed-by: azeemj, jmasa ! src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp ! src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp ! src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp ! src/share/vm/gc_implementation/g1/vm_operations_g1.cpp ! src/share/vm/gc_implementation/g1/vm_operations_g1.hpp Changeset: b9442ac22f59 Author:brutisso Date: 2012-06-04 13:29 +0200 URL: http://hg.openjdk.java.net/jdk8/build/hotspot/rev/b9442ac22f59 7173460: G1: java/lang/management/MemoryMXBean/CollectionUsageThreshold.java failes with G1 Summary: The scope of TraceMemoryManagerStats in G1CollectedHeap need to cover the call to G1MonitoringSupport::update_sizes() Reviewed-by: johnc, jmasa ! src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Changeset: 063451aefde8 Author:jcoomes Date: 2012-06-08 09:49 -0700 URL: http://hg.openjdk.java.net/jdk8/build/hotspot/rev/063451aefde8 Merge Changeset: 2fe087c3e814 Author:jiangli Date: 2012-06-06 14:33 -0400 URL: http://hg.openjdk.java.net/jdk8/build/hotspot/rev/2fe087c3e814 7172967: Eliminate constMethod's _method backpointer to methodOop. Summary: Eliminate constMethod's _method backpointer to methodOop, and move the _constant field from methodOop to constMethod. Reviewed-by: roland, bdelsart, kamg ! agent/src/share/classes/sun/jvm/hotspot/oops/ConstMethod.java ! agent/src/share/classes/sun/jvm/hotspot/oops/Method.java ! src/cpu/sparc/vm/cppInterpreter_sparc.cpp ! src/cpu/sparc/vm/interp_masm_sparc.cpp ! src/cpu/sparc/vm/interp_masm_sparc.hpp ! src/cpu/sparc/vm/templateInterpreter_sparc.cpp ! src/cpu/x86/vm/cppInterpreter_x86.cpp ! src/cpu/x86/vm/interp_masm_x86_32.hpp ! src/cpu/x86/vm/interp_masm_x86_64.hpp ! src/cpu/x86/vm/templateInterpreter_x86_32.cpp ! src/cpu/x86/vm/templateInterpreter_x86_64.cpp ! src/os/solaris/dtrace/generateJvmOffsets.cpp ! src/os/solaris/dtrace/jhelper.d ! src/os/solaris/dtrace/libjvm_db.c ! src/share/vm/oops/constMethodKlass.cpp ! src/share/vm/oops/constMethodOop.cpp ! src/share/vm/oops/constMethodOop.hpp ! src/share/vm/oops/methodKlass.cpp ! src/share/vm/oops/methodOop.cpp ! src/share/vm/oops/methodOop.hpp ! src/share/vm/runtime/vmStructs.cpp Changeset: ab6ab9f84b2d Author:bdelsart Date: 2012-06-11 04:47 -0400 URL: http://hg.openjdk.java.net/jdk8/build/hotspot/rev/ab6ab9f84b2d Merge Changeset: dcfcdd01af4b Author:fparain Date: 2012-06-05 06:48 -0700 URL: http://hg.openjdk.java.net/jdk8/build/hotspot/rev/dcfcdd01af4b 7171703: JNI DefineClass crashes client VM when first parameter is NULL Reviewed-by: acorn, kamg, sspitsyn, dholmes ! src/share/vm/prims/jni.cpp Changeset: de909f001528 Author:mikael Date: 2012-06-06 05:21 +0200 URL: http://hg.openjdk.java.net/jdk8/build/hotspot/rev/de909f001528 7170275: os::print_os_info needs to know about Windows 8 Summary: Recognize Windows 8 and Windows Server 2012 Reviewed-by: sla, kvn, azeemj !
hg: jdk8/build/jaxws: Added tag jdk8-b43 for changeset f00c12994562
Changeset: f6a417540ef1 Author:katleman Date: 2012-06-14 13:14 -0700 URL: http://hg.openjdk.java.net/jdk8/build/jaxws/rev/f6a417540ef1 Added tag jdk8-b43 for changeset f00c12994562 ! .hgtags
hg: jdk8/build/jdk: Added tag jdk8-b43 for changeset b3246687c369
Changeset: db471a7af031 Author:katleman Date: 2012-06-14 13:14 -0700 URL: http://hg.openjdk.java.net/jdk8/build/jdk/rev/db471a7af031 Added tag jdk8-b43 for changeset b3246687c369 ! .hgtags
hg: jdk8/build/langtools: Added tag jdk8-b43 for changeset f8c64d835b28
Changeset: 59cbead12ff4 Author:katleman Date: 2012-06-14 13:14 -0700 URL: http://hg.openjdk.java.net/jdk8/build/langtools/rev/59cbead12ff4 Added tag jdk8-b43 for changeset f8c64d835b28 ! .hgtags
get_source/hgforest.sh breaks defpath -dgu
I just cloned the complete TL JDK8 forest by cloning the top repo then using get_source.sh to clone the other repos (open and closed). At the top-level hgdefpath shows /export/users/dh198349/jdk8 hg defpath default = http://hg.openjdk.java.net/jdk8/tl/ default-push = None I then went into the jdk repo to run hg defpath -dgu dholmes and got: abort: http://hg.openjdk.java.net/jdk8/tl//jdk: Repository not found No hgrc files updated Note the // prior to jdk. If I edit .hgrc/hgrc to change that to a / the defpath works. Note that clones/pulls etc don't care about the // but the defpath -dg does. All of the clones initiated via hgforest.sh have the // eg: # Repos: corba jaxp jaxws langtools jdk hotspot jdk/src/closed jdk/make/closed jdk/test/closed hotspot/src/closed hotspot/test/closed deploy install sponsors pubs Starting on corba Starting on jaxp Starting on jaxws Starting on langtools # hg clone http://hg.openjdk.java.net/jdk8/tl//corba corba David
