--- a/.hgtags Tue Mar 05 09:50:53 2013 -0500
+++ b/.hgtags Tue Mar 05 11:49:33 2013 -0800
@@ -199,3 +199,5 @@
f1478a6d25fddd311a84dcbfac50824cc1858bdd jdk8-b75
f407160c280d1c5b00d314c535441ac26f195fee jdk8-b76
d17eb2e13e362085e866d46235314c50cc4661cc jdk8-b77
+6d3dcd34b5b962ea1ef9eed0dafdee9e812401bc jdk8-b78
+a1313a8d90d17d363a3b2a645dc4030ec204b168 jdk8-b79
--- a/.hgtags-top-repo Tue Mar 05 09:50:53 2013 -0500
+++ b/.hgtags-top-repo Tue Mar 05 11:49:33 2013 -0800
@@ -199,3 +199,5 @@
2a713921952cbd77a1e699626976cb6cdfe3e57e jdk8-b75
278af9fc67e7eba2884936b49ec07345f423aabb jdk8-b76
3933eebc659d58c597aa8cb4b3e58f2250ce3e1a jdk8-b77
+fd1a5574cf68af24bfd52decc37ac6361afb278a jdk8-b78
+91d35211e74464dca5edf9b66ab01d0d0d8cded7 jdk8-b79
--- a/README Tue Mar 05 09:50:53 2013 -0500
+++ b/README Tue Mar 05 11:49:33 2013 -0800
@@ -1,45 +1,40 @@
README:
This file should be located at the top of the OpenJDK Mercurial root
- repository. This root repository will include a "make" directory,
- and a Makefile for building the entire OpenJDK.
- A full OpenJDK repository set (forest) should also include the following
- 6 nested repositories:
+ repository. A full OpenJDK repository set (forest) should also include
+ the following 6 nested repositories:
"jdk", "hotspot", "langtools", "corba", "jaxws" and "jaxp".
- There are also several source downloads for the jax* repositories that
- will be needed.
- This one root repository can be obtained with something like:
-
+ The root repository can be obtained with something like:
hg clone http://hg.openjdk.java.net/jdk8/jdk8 openjdk8
- To make sure you have all the nested repositories, you can run the
- get_source.sh script located in the same respository as this file:
-
+ You can run the get_source.sh script located in the root repository to get
+ the other needed repositories:
cd openjdk8 && sh ./get_source.sh
People unfamiliar with Mercurial should read the first few chapters of
the Mercurial book: http://hgbook.red-bean.com/read/
- See http://openjdk.java.net/ for more information about the OpenJDK.
+ See http://openjdk.java.net/ for more information about OpenJDK.
Simple Build Instructions:
0. Get the necessary system software/packages installed on your system, see
- http://hg.openjdk.java.net/jdk8/build/raw-file/tip/README-builds.html
+ http://hg.openjdk.java.net/jdk8/jdk8/raw-file/tip/README-builds.html
- 1. If you don't have a jdk6 installed, download and install a JDK 6 from
+ 1. If you don't have a jdk7u7 or newer jdk, download and install it from
http://java.sun.com/javase/downloads/index.jsp
- Set the environment variable ALT_BOOTDIR to the location of JDK 6.
+ Add the /bin directory of this installation to your PATH environment
+ variable.
- 2. Check the sanity of doing a build with your current system:
- make sanity
- See README-builds.html if you run into problems.
+ 2. Configure the build:
+ bash ./configure
- 3. Do a complete build of the OpenJDK:
+ 3. Build the OpenJDK:
make all
- The resulting JDK image should be found in build/*/j2sdk-image
+ The resulting JDK image should be found in build/*/images/j2sdk-image
where make is GNU make 3.81 or newer, /usr/bin/make on Linux usually
-is 3.81 or newer.
+is 3.81 or newer. Note that on Solaris, GNU make is called "gmake".
-Complete details are available in README-builds.html.
+Complete details are available in the file:
+ http://hg.openjdk.java.net/jdk8/jdk8/raw-file/tip/README-builds.html
--- a/README-builds.html Tue Mar 05 09:50:53 2013 -0500
+++ b/README-builds.html Tue Mar 05 11:49:33 2013 -0800
@@ -3,14 +3,15 @@
<head>
<title>OpenJDK Build README</title>
</head>
- <body style="background-color:lightcyan">
+ <body style="background-color:aquamarine">
+
<!-- ====================================================== -->
<table width="100%">
<tr>
<td align="center">
<img alt="OpenJDK"
src="http://openjdk.java.net/images/openjdk.png"
- width=256 />
+ width=256>
</td>
</tr>
<tr>
@@ -19,109 +20,116 @@
</td>
</tr>
</table>
- <!-- ------------------------------------------------------ -->
+
+ <!-- ====================================================== -->
<hr>
<h2><a name="introduction">Introduction</a></h2>
<blockquote>
- <p>
- This README file contains build instructions for the
- <a href="http://openjdk.java.net" target="_blank">OpenJDK</a>.
- Building the source code for the
- OpenJDK
- requires
- a certain degree of technical expertise.
+ This README file contains build instructions for the
+ <a href="http://openjdk.java.net" target="_blank">OpenJDK</a>.
+ Building the source code for the
+ OpenJDK
+ requires
+ a certain degree of technical expertise.
+
+ <!-- ====================================================== -->
+ <h3>!!!!!!!!!!!!!!! THIS IS A MAJOR RE-WRITE of this document. !!!!!!!!!!!!!</h3>
+ <blockquote>
+ Some Headlines:
+ <ul>
+ <li>
+ The build is now a "<code>configure && make</code>" style build
+ </li>
+ <li>
+ Any GNU make 3.81 or newer should work
+ </li>
+ <li>
+ The build should scale, i.e. more processors should
+ cause the build to be done in less wall-clock time
+ </li>
+ <li>
+ Nested or recursive make invocations have been significantly
+ reduced, as has the total fork/exec or spawning
+ of sub processes during the build
+ </li>
+ <li>
+ Windows MKS usage is no longer supported
+ </li>
+ <li>
+ Windows Visual Studio <code>vsvars*.bat</code> and
+ <code>vcvars*.bat</code> files are run automatically
+ </li>
+ <li>
+ Ant is no longer used when building the OpenJDK
+ </li>
+ <li>
+ Use of ALT_* environment variables for configuring the
+ build is no longer supported
+ </li>
+ </ul>
+ </blockquote>
</blockquote>
- <!-- ------------------------------------------------------ -->
+
+ <!-- ====================================================== -->
<hr>
<h2><a name="contents">Contents</a></h2>
<blockquote>
<ul>
<li><a href="#introduction">Introduction</a></li>
+
<li><a href="#hg">Use of Mercurial</a>
<ul>
<li><a href="#get_source">Getting the Source</a></li>
+ <li><a href="#repositories">Repositories</a></li>
</ul>
</li>
- <li><a href="#MBE">Minimum Build Environments</a></li>
- <li><a href="#SDBE">Specific Developer Build Environments</a>
+
+ <li><a href="#building">Building</a>
<ul>
- <li><a href="#fedora">Fedora Linux</a> </li>
- <li><a href="#centos">CentOS Linux</a> </li>
- <li><a href="#debian">Debian GNU/Linux</a></li>
- <li><a href="#ubuntu">Ubuntu Linux</a> </li>
- <li><a href="#opensuse">OpenSUSE</a></li>
- <li><a href="#mandriva">Mandriva</a></li>
- <li><a href="#opensolaris">OpenSolaris</a></li>
- </ul>
- </li>
- <li><a href="#directories">Source Directory Structure</a>
- <ul>
- <li><a href="#drops">Managing the Source Drops</a></li>
+ <li><a href="#setup">System Setup</a>
+ <ul>
+ <li><a href="#linux">Linux</a></li>
+ <li><a href="#solaris">Solaris</a></li>
+ <li><a href="#macosx">Mac OS X</a></li>
+ <li><a href="#windows">Windows</a></li>
+ </ul>
+ </li>
+ <li><a href="#configure">Configure</a></li>
+ <li><a href="#make">Make</a></li>
</ul>
</li>
- <li><a href="#building">Build Information</a>
+ <li><a href="#testing">Testing</a></li>
+ </ul>
+ <hr>
+ <ul>
+ <li><a href="#hints">Appendix A: Hints and Tips</a>
<ul>
- <li><a href="#gmake">GNU Make (<tt><i>gmake</i></tt>)</a> </li>
- <li><a href="#linux">Basic Linux System Setup</a> </li>
- <li><a href="#solaris">Basic Solaris System Setup</a> </li>
- <li><a href="#windows">Basic Windows System Setup</a> </li>
- <li><a href="#macosx">Basic Mac OS X System Setup</a></li>
- <li><a href="#dependencies">Build Dependencies</a>
- <ul>
- <li><a href="#bootjdk">Bootstrap JDK</a> </li>
- <li><a href="#importjdk">Optional Import JDK</a> </li>
- <li><a href="#ant">Ant 1.7.1</a> </li>
- <li><a href="#cacerts">Certificate Authority File (cacert)</a> </li>
- <li><a href="#compilers">Compilers</a>
- <ul>
- <li><a href="#msvc32">Microsoft Visual Studio Professional/Express for 32 bit</a> </li>
- <li><a href="#msvc64">Microsoft Visual Studio Professional for 64 bit</a> </li>
- <li><a href="#mssdk64">Microsoft Windows SDK for 64 bit</a> </li>
- <li><a href="#gcc">Linux gcc/binutils</a> </li>
- <li><a href="#studio">Sun Studio</a> </li>
- </ul>
- </li>
- <li><a href="#zip">Zip and Unzip</a> </li>
- <li><a href="#freetype">FreeType2 Fonts</a> </li>
- <li>Linux and Solaris:
- <ul>
- <li><a href="#cups">CUPS Include files</a> </li>
- <li><a href="#xrender">XRender Include files</a></li>
- </ul>
- </li>
- <li>Linux only:
- <ul>
- <li><a href="#alsa">ALSA files</a> </li>
- </ul>
- </li>
- <li>Windows only:
- <ul>
- <li>Unix Command Tools (<a href="#cygwin">CYGWIN</a>) <strong>or</strong></li>
- <li>Minimalist GNU for Windows (<a href="#msys">MinGW/MSYS</a>)</li>
- <li><a href="#dxsdk">DirectX 9.0 SDK</a> </li>
- </ul>
- </li>
- </ul>
- </li>
+ <li><a href="#faq">FAQ</a></li>
+ <li><a href="#performance">Build Performance Tips</a></li>
+ <li><a href="#troubleshooting">Troubleshooting</a></li>
</ul>
</li>
- <li><a href="#creating">Creating the Build</a> </li>
- <li><a href="#testing">Testing the Build</a> </li>
- <li><a href="#variables">Environment/Make Variables</a></li>
- <li><a href="#troubleshooting">Troubleshooting</a></li>
- <li><a href="#newbuild">The New Build</a></li>
+ <li><a href="#gmake">Appendix B: GNU Make Information</a></li>
+ <li><a href="#buildenvironments">Appendix C: Build Environments</a></li>
+
+ <!-- Leave out
+ <li><a href="#mapping">Appendix D: Mapping Old Builds to the New Builds</a></li>
+ -->
+
</ul>
</blockquote>
- <!-- ------------------------------------------------------ -->
+ <!-- ====================================================== -->
<hr>
<h2><a name="hg">Use of Mercurial</a></h2>
<blockquote>
The OpenJDK sources are maintained with the revision control system
<a href="http://mercurial.selenic.com/wiki/Mercurial">Mercurial</a>.
If you are new to Mercurial, please see the
- <a href="http://mercurial.selenic.com/wiki/BeginnersGuides">Beginner Guides</a>
- or refer to the <a href="http://hgbook.red-bean.com/">Mercurial Book</a>.
+ <a href="http://mercurial.selenic.com/wiki/BeginnersGuides">
+ Beginner Guides</a>
+ or refer to the <a href="http://hgbook.red-bean.com/">
+ Mercurial Book</a>.
The first few chapters of the book provide an excellent overview of
Mercurial, what it is and how it works.
<br>
@@ -130,578 +138,1631 @@
Developer Guide: Installing and Configuring Mercurial</a>
section for more information.
- <!-- ------------------------------------------------------ -->
<h3><a name="get_source">Getting the Source</a></h3>
<blockquote>
To get the entire set of OpenJDK Mercurial repositories
- use the script <code>get_source.sh</code> located in the root repository:
+ use the script <code>get_source.sh</code> located in the
+ root repository:
<blockquote>
- <tt>
- hg clone http://hg.openjdk.java.net/jdk8/jdk8 <i>YourOpenJDK</i>
- <br>cd <i>YourOpenJDK</i>
- <br>sh ./get_source.sh
- </tt>
+ <code>
+ hg clone http://hg.openjdk.java.net/jdk8/jdk8
+ <i>YourOpenJDK</i>
+ <br>
+ cd <i>YourOpenJDK</i>
+ <br>
+ bash ./get_source.sh
+ </code>
+ </blockquote>
+ Once you have all the repositories, keep in mind that each
+ repository is it's own independent repository.
+ You can also re-run <code>./get_source.sh</code> anytime to
+ pull over all the latest changesets in all the repositories.
+ This set of nested repositories has been given the term
+ "forest" and there are various ways to apply the same
+ <code>hg</code> command to each of the repositories.
+ For example, the script <code>make/scripts/hgforest.sh</code>
+ can be used to repeat the same <code>hg</code>
+ command on every repository, e.g.
+ <blockquote>
+ <code>
+ cd <i>YourOpenJDK</i>
+ <br>
+ bash ./make/scripts/hgforest.sh status
+ </code>
</blockquote>
- Once you have all the repositories, the
- script <tt>make/scripts/hgforest.sh</tt>
- can be used to repeat the same <tt>hg</tt>
- command on every repository in the forest, e.g.
- <blockquote>
- <tt>
- cd <i>YourOpenJDK</i>
- <br>sh ./make/scripts/hgforest.sh pull -u
- </tt>
- </blockquote>
+ </blockquote>
+
+ <h3><a name="repositories">Repositories</a></h3>
+ <blockquote>
+ <p>The set of repositories and what they contain:</p>
+ <table border="1">
+ <thead>
+ <tr>
+ <th>Repository</th>
+ <th>Contains</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>
+ . (root)
+ </td>
+ <td>
+ common configure and makefile logic
+ </td>
+ </tr>
+ <tr>
+ <td>
+ hotspot
+ </td>
+ <td>
+ source code and make files for building
+ the OpenJDK Hotspot Virtual Machine
+ </td>
+ </tr>
+ <tr>
+ <td>
+ langtools
+ </td>
+ <td>
+ source code for the OpenJDK javac and language tools
+ </td>
+ </tr>
+ <tr>
+ <td>
+ jdk
+ </td>
+ <td>
+ source code and make files for building
+ the OpenJDK runtime libraries and misc files
+ </td>
+ </tr>
+ <tr>
+ <td>
+ jaxp
+ </td>
+ <td>
+ source code for the OpenJDK JAXP functionality
+ </td>
+ </tr>
+ <tr>
+ <td>
+ jaxws
+ </td>
+ <td>
+ source code for the OpenJDK JAX-WS functionality
+ </td>
+ </tr>
+ <tr>
+ <td>
+ corba
+ </td>
+ <td>
+ source code for the OpenJDK Corba functionality
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </blockquote>
+
+ <h3><a name="guidelines">Repository Source Guidelines</a></h3>
+ <blockquote>
+ There are some very basic guidelines:
+ <ul>
+ <li>
+ Use of whitespace in source files
+ (.java, .c, .h, .cpp, and .hpp files)
+ is restricted.
+ No TABs, no trailing whitespace on lines, and files
+ should not terminate in more than one blank line.
+ </li>
+ <li>
+ Files with execute permissions should not be added
+ to the source repositories.
+ </li>
+ <li>
+ All generated files need to be kept isolated from
+ the files
+ maintained or managed by the source control system.
+ The standard area for generated files is the top level
+ <code>build/</code> directory.
+ </li>
+ <li>
+ The default build process should be to build the product
+ and nothing else, in one form, e.g. a product (optimized),
+ debug (non-optimized, -g plus assert logic), or
+ fastdebug (optimized, -g plus assert logic).
+ </li>
+ <li>
+ The <tt>.hgignore</tt> file in each repository
+ must exist and should
+ include <tt>^build/</tt>, <tt>^dist/</tt> and
+ optionally any
+ <tt>nbproject/private</tt> directories.
+ <strong>It should NEVER</strong> include
+ anything in the
+ <tt>src/</tt> or <tt>test/</tt>
+ or any managed directory area of a repository.
+ </li>
+ <li>
+ Directory names and file names should never contain
+ blanks or
+ non-printing characters.
+ </li>
+ <li>
+ Generated source or binary files should NEVER be added to
+ the repository (that includes <tt>javah</tt> output).
+ There are some exceptions to this rule, in particular
+ with some of the generated configure scripts.
+ </li>
+ <li>
+ Files not needed for typical building
+ or testing of the repository
+ should not be added to the repository.
+ </li>
+ </ul>
</blockquote>
</blockquote>
- <!-- ------------------------------------------------------ -->
+ <!-- ====================================================== -->
<hr>
- <h2><a name="MBE">Minimum Build Environments</a></h2>
- <blockquote>
- This file often describes specific requirements for what we call the
- "minimum build environments" (MBE) for this
- specific release of the JDK,
- Building with the MBE will generate the most compatible
- bits that install on, and run correctly on, the most variations
- of the same base OS and hardware architecture.
- These usually represent what is often called the
- least common denominator platforms.
- It is understood that most developers will NOT be using these
- specific platforms, and in fact creating these specific platforms
- may be difficult due to the age of some of this software.
- <p>
- The minimum OS and C/C++ compiler versions needed for building the
- OpenJDK:
- <p>
- <table border="1">
- <thead>
- <tr>
- <th>Base OS and Architecture</th>
- <th>OS</th>
- <th>C/C++ Compiler</th>
- <th>BOOT JDK</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>Linux X86 (32-bit)</td>
- <td>Fedora 9</td>
- <td>gcc 4.3 </td>
- <td>JDK 6u18</td>
- </tr>
- <tr>
- <td>Linux X64 (64-bit)</td>
- <td>Fedora 9</td>
- <td>gcc 4.3 </td>
- <td>JDK 6u18</td>
- </tr>
- <tr>
- <td>Solaris SPARC (32-bit)</td>
- <td>Solaris 10 Update 6</td>
- <td>Sun Studio 12 Update 1 + patches</td>
- <td>JDK 6u18</td>
- </tr>
- <tr>
- <td>Solaris SPARCV9 (64-bit)</td>
- <td>Solaris 10 Update 6</td>
- <td>Sun Studio 12 Update 1 + patches</td>
- <td>JDK 6u18</td>
- </tr>
- <tr>
- <td>Solaris X86 (32-bit)</td>
- <td>Solaris 10 Update 6</td>
- <td>Sun Studio 12 Update 1 + patches</td>
- <td>JDK 6u18</td>
- </tr>
- <tr>
- <td>Solaris X64 (64-bit)</td>
- <td>Solaris 10 Update 6</td>
- <td>Sun Studio 12 Update 1 + patches</td>
- <td>JDK 6u18</td>
- </tr>
- <tr>
- <td>Windows X86 (32-bit)</td>
- <td>Windows XP</td>
- <td>Microsoft Visual Studio C++ 2010 Professional Edition</td>
- <td>JDK 6u18</td>
- </tr>
- <tr>
- <td>Windows X64 (64-bit)</td>
- <td>Windows Server 2003 - Enterprise x64 Edition</td>
- <td>Microsoft Visual Studio C++ 2010 Professional Edition</td>
- <td>JDK 6u18</td>
- </tr>
- <tr>
- <td>Mac OS X X64 (64-bit)</td>
- <td>Mac OS X 10.7.3 "Lion"</td>
- <td>XCode 4.1 or later</td>
- <td>Java for OS X Lion Update 1</td>
- </tr>
- </tbody>
- </table>
- <p>
- These same sources do indeed build on many more systems than the
- above older generation systems, again the above is just a minimum.
- <p>
- Compilation problems with newer or different C/C++ compilers is a
- common problem.
- Similarly, compilation problems related to changes to the
- <tt>/usr/include</tt> or system header files is also a
- common problem with newer or unreleased OS versions.
- Please report these types of problems as bugs so that they
- can be dealt with accordingly.
- </blockquote>
- <!-- ------------------------------------------------------ -->
- <hr>
- <h2><a name="SDBE">Specific Developer Build Environments</a></h2>
- <blockquote>
- We won't be listing all the possible environments, but
- we will try to provide what information we have available to us.
- </blockquote>
- <!-- ------------------------------------------------------ -->
- <h3><a name="fedora">Fedora</a></h3>
+ <h2><a name="building">Building</a></h2>
<blockquote>
- <h4>Fedora 9</h4>
- <p>
- <blockquote>
- After installing <a href="http://fedoraproject.org">Fedora</a> 9
- you need to install several build dependencies. The simplest
- way to do it is to execute the following commands as user
- <tt>root</tt>:
- <p/>
- <code>yum-builddep java-1.6.0-openjdk</code>
- <p/>
- <code>yum install gcc gcc-c++</code>
- <p/>
- In addition, it's necessary to set a few environment variables for the build:
-
- <p/>
- <code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-openjdk</code>
- </blockquote>
- <h4>Fedora 10</h4>
- <p>
+ The very first step in building the OpenJDK is making sure the
+ system itself has everything it needs to do OpenJDK builds.
+ Once a system is setup, it generally doesn't need to be done again.
+ <br>
+ Building the OpenJDK is now done with running a
+ <a href="#configure"><code>configure</code></a>
+ script which will try and find and verify you have everything
+ you need, followed by running
+ <a href="#gmake"><code>make</code></a>, e.g.
<blockquote>
- After installing <a href="http://fedoraproject.org">Fedora</a> 10
- you need to install several build dependencies. The simplest
- way to do it is to execute the following commands as user
- <tt>root</tt>:
- <p/>
- <code>yum-builddep java-1.6.0-openjdk</code>
- <p/>
- <code>yum install gcc gcc-c++</code>
- <p/>
- In addition, it's necessary to set a few environment variables for the build:
-
- <p/>
- <code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-openjdk</code>
- </blockquote>
- <h4>Fedora 11</h4>
- <p>
- <blockquote>
- After installing <a href="http://fedoraproject.org">Fedora</a> 11
- you need to install several build dependencies. The simplest
- way to do it is to execute the following commands as user
- <tt>root</tt>:
- <p/>
- <code>yum-builddep java-1.6.0-openjdk</code>
- <p/>
- <code>yum install gcc gcc-c++</code>
- <p/>
- In addition, it's necessary to set a few environment variables for the build:
-
- <p/>
- <code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-openjdk</code>
+ <b>
+ <code>
+ bash ./configure<br>
+ make all
+ </code>
+ </b>
</blockquote>
- </blockquote>
- <!-- ------------------------------------------------------ -->
- <h3><a name="centos">CentOS 5.5</a></h3>
- <blockquote>
- After installing
- <a href="http://www.centos.org/">CentOS 5.5</a>
- you need to make sure you have
- the following Development bundles installed:
+ Where possible the <code>configure</code> script will attempt to located the
+ various components in the default locations or via component
+ specific variable settings.
+ When the normal defaults fail or components cannot be found,
+ additional <code>configure</code> options may be necessary to help <code>configure</code>
+ find the necessary tools for the build, or you may need to
+ re-visit the setup of your system due to missing software
+ packages.
+ <br>
+ <strong>NOTE:</strong> The <code>configure</code> script
+ file does not have
+ execute permissions and will need to be explicitly run with
+ <code>bash</code>,
+ see the <a href="#guidelines">source guidelines</a>.
+
+ <!-- ====================================================== -->
+ <hr>
+ <h3><a name="setup">System Setup</a></h3>
<blockquote>
+ Before even attempting to use a system to build the OpenJDK
+ there are some very basic system setups needed.
+ For all systems:
<ul>
- <li>Development Libraries</li>
- <li>Development Tools</li>
- <li>Java Development</li>
- <li>X Software Development (Including XFree86-devel)</li>
+ <li>
+ Be sure the GNU make utility is version 3.81 or newer,
+ e.g. run "<code>make -version</code>"
+ </li>
+ <li>
+ Install a
+ <a name="bootjdk">Bootstrap JDK</a>
+ <br>
+ All OpenJDK builds require access to a previously released
+ JDK, this is often called a bootstrap JDK.
+ Currently, for this JDK release we require
+ JDK 7 Update 7 or newer.
+ The JDK 7 binaries can be downloaded from Oracle's
+ <a href="http://www.oracle.com/technetwork/java/javase/downloads/index.html"
+ target="_blank">JDK 7 download site</a>.
+ For build performance reasons
+ is very important that this bootstrap JDK be made available
+ on the local disk of the machine doing the build.
+ You should add its <code>bin</code> directory
+ to the <code>PATH</code> environment variable.
+ If <code>configure</code> has any issues finding this JDK, you may
+ need to use the <code>configure</code> option
+ <code>--with-boot-jdk</code>.
+ </li>
+ <li>
+ Insure that GNU make, the Bootstrap JDK,
+ and the compilers are all
+ in your PATH environment variable
+ </li>
</ul>
- </blockquote>
- <p>
- Plus the following packages:
- <blockquote>
- <ul>
- <li>cups devel: Cups Development Package</li>
- <li>alsa devel: Alsa Development Package</li>
- <li>ant: Ant Package</li>
- <li>Xi devel: libXi.so Development Package</li>
- </ul>
+ And for specific systems:
+ <table border="1">
+ <thead>
+ <tr>
+ <th>Linux</th>
+ <th>Solaris</th>
+ <th>Windows</th>
+ <th>Mac OS X</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>
+ Install all the software development
+ packages needed including
+ <a href="#alsa">alsa</a>,
+ <a href="#freetype">freetype</a>,
+ <a href="#cups">cups</a>, and
+ <a href="#xrender">xrender</a>.
+ <br>
+ See
+ <a href="#SDBE">specific system packages</a>.
+ </td>
+ <td>
+ Install all the software development
+ packages needed including
+ <a href="#studio">Studio Compilers</a>,
+ <a href="#freetype">freetype</a>,
+ <a href="#cups">cups</a>, and
+ <a href="#xrender">xrender</a>.
+ <br>
+ See
+ <a href="#SDBE">specific system packages</a>.
+ </td>
+ <td>
+ <ul>
+ <li>
+ Install one of
+ <a href="#cygwin">CYGWIN</a> or
+ <a href="#msys">MinGW/MSYS</a>
+ </li>
+ <li>
+ Install
+ <a href="#vs2010">Visual Studio 2010</a>
+ </li>
+ <li>
+ Install the
+ <a href="#dxsdk">Microsoft DirectX SDK</a>
+ </li>
+ </ul>
+ </td>
+ <td>
+ Install
+ <a href="https://developer.apple.com/xcode/">XCode 4.5.2</a>
+ and also install the "Command line tools" found under the
+ preferences pane "Downloads"
+ </td>
+ </tr>
+ </tbody>
+ </table>
+
+ <h4><a name="linux">Linux</a></h4>
+ <blockquote>
+ With Linux, try and favor the system packages over
+ building your own
+ or getting packages from other areas.
+ Most Linux builds should be possible with the system's
+ available packages.
+ <br>
+ Note that some Linux systems have a habit of pre-populating
+ your environment variables for you, for example <code>JAVA_HOME</code>
+ might get pre-defined for you to refer to the JDK installed on
+ your Linux system.
+ You will need to unset <code>JAVA_HOME</code>.
+ It's a good idea to run <code>env</code> and verify the
+ environment variables you are getting from the default system
+ settings make sense for building the OpenJDK.
+
+ </blockquote>
+
+ <h4><a name="solaris">Solaris</a></h4>
+ <blockquote>
+ <h5><a name="studio">Studio Compilers</a></h5>
+ <blockquote>
+ At a minimum, the
+ <a href="http://www.oracle.com/technetwork/server-storage/solarisstudio/downloads/index.htm" target="_blank">
+ Studio 12 Update 1 Compilers</a>
+ (containing version 5.10 of the C and C++ compilers) is required,
+ including specific patches.
+ <p>
+ The Solaris SPARC patch list is:
+ <ul>
+ <li>
+ 118683-05: SunOS 5.10: Patch for profiling libraries and assembler
+ </li>
+ <li>
+ 119963-21: SunOS 5.10: Shared library patch for C++
+ </li>
+ <li>
+ 120753-08: SunOS 5.10: Microtasking libraries (libmtsk) patch
+ </li>
+ <li>
+ 128228-09: Sun Studio 12 Update 1: Patch for Sun C++ Compiler
+ </li>
+ <li>
+ 141860-03: Sun Studio 12 Update 1: Patch for Compiler Common patch for Sun C C++ F77 F95
+ </li>
+ <li>
+ 141861-05: Sun Studio 12 Update 1: Patch for Sun C Compiler
+ </li>
+ <li>
+ 142371-01: Sun Studio 12.1 Update 1: Patch for dbx
+ </li>
+ <li>
+ 143384-02: Sun Studio 12 Update 1: Patch for debuginfo handling
+ </li>
+ <li>
+ 143385-02: Sun Studio 12 Update 1: Patch for Compiler Common patch for Sun C C++ F77 F95
+ </li>
+ <li>
+ 142369-01: Sun Studio 12.1: Patch for Performance Analyzer Tools
+ </li>
+ </ul>
+ <p>
+ The Solaris X86 patch list is:
+ <ul>
+ <li>
+ 119961-07: SunOS 5.10_x86, x64, Patch for profiling libraries and assembler
+ </li>
+ <li>
+ 119964-21: SunOS 5.10_x86: Shared library patch for C++_x86
+ </li>
+ <li>
+ 120754-08: SunOS 5.10_x86: Microtasking libraries (libmtsk) patch
+ </li>
+ <li>
+ 141858-06: Sun Studio 12 Update 1_x86: Sun Compiler Common patch for x86 backend
+ </li>
+ <li>
+ 128229-09: Sun Studio 12 Update 1_x86: Patch for C++ Compiler
+ </li>
+ <li>
+ 142363-05: Sun Studio 12 Update 1_x86: Patch for C Compiler
+ </li>
+ <li>
+ 142368-01: Sun Studio 12.1_x86: Patch for Performance Analyzer Tools
+ </li>
+ </ul>
+ <p>
+ Place the <code>bin</code> directory in <code>PATH</code>.
+ <p>
+ The Oracle Solaris Studio Express compilers at:
+ <a href="http://www.oracle.com/technetwork/server-storage/solarisstudio/downloads/index-jsp-142582.html" target="_blank">
+ Oracle Solaris Studio Express Download site</a>
+ are also an option, although these compilers have not
+ been extensively used yet.
+ </blockquote>
+
+ </blockquote> <!-- Solaris -->
+
+ <h4><a name="windows">Windows</a></h4>
+ <blockquote>
+
+ <h5><a name="toolkit">Windows Unix Toolkit</a></h5>
+ <blockquote>
+ Building on Windows requires a Unix-like environment, notably a
+ Unix-like shell.
+ There are several such environments available of which
+ <a href="http://www.cygwin.com/">Cygwin</a> and
+ <a href="http://www.mingw.org/wiki/MSYS">MinGW/MSYS</a> are
+ currently supported for
+ the OpenJDK build. One of the differences of these
+ systems from standard Windows tools is the way
+ they handle Windows path names, particularly path names which contain
+ spaces, backslashes as path separators and possibly drive letters.
+ Depending
+ on the use case and the specifics of each environment these path
+ problems can
+ be solved by a combination of quoting whole paths, translating
+ backslashes to
+ forward slashes, escaping backslashes with additional backslashes and
+ translating the path names to their
+ <a href="http://en.wikipedia.org/wiki/8.3_filename">
+ "8.3" version</a>.
+
+ <h6><a name="cygwin">CYGWIN</a></h6>
+ <blockquote>
+ CYGWIN is an open source, Linux-like environment which tries to emulate
+ a complete POSIX layer on Windows. It tries to be smart about path names
+ and can usually handle all kinds of paths if they are correctly quoted
+ or escaped although internally it maps drive letters <code><drive>:</code>
+ to a virtual directory <code>/cygdrive/<drive></code>.
+ <p>
+ You can always use the <code>cygpath</code> utility to map pathnames with spaces
+ or the backslash character into the <code>C:/</code> style of pathname
+ (called 'mixed'), e.g. <code>cygpath -s -m "<i>path</i>"</code>.
+ </p>
+ <p>
+ Note that the use of CYGWIN creates a unique problem with regards to
+ setting <a href="#path"><code>PATH</code></a>. Normally on Windows
+ the <code>PATH</code> variable contains directories
+ separated with the ";" character (Solaris and Linux use ":").
+ With CYGWIN, it uses ":", but that means that paths like "C:/path"
+ cannot be placed in the CYGWIN version of <code>PATH</code> and
+ instead CYGWIN uses something like <code>/cygdrive/c/path</code>
+ which CYGWIN understands, but only CYGWIN understands.
+ </p>
+ <p>
+ The OpenJDK build requires CYGWIN version 1.7.16 or newer.
+ Information about CYGWIN can
+ be obtained from the CYGWIN website at
+ <a href="http://www.cygwin.com" target="_blank">www.cygwin.com</a>.
+ </p>
+ <p>
+ By default CYGWIN doesn't install all the tools required for building
+ the OpenJDK.
+ Along with the default installation, you need to install
+ the following tools.
+ <blockquote>
+ <table border="1">
+ <thead>
+ <tr>
+ <td>Binary Name</td>
+ <td>Category</td>
+ <td>Package</td>
+ <td>Description</td>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>ar.exe</td>
+ <td>Devel</td>
+ <td>binutils</td>
+ <td>
+ The GNU assembler, linker and binary utilities
+ </td>
+ </tr>
+ <tr>
+ <td>make.exe</td>
+ <td>Devel</td>
+ <td>make</td>
+ <td>
+ The GNU version of the 'make' utility built for CYGWIN
+ </td>
+ </tr>
+ <tr>
+ <td>m4.exe</td>
+ <td>Interpreters</td>
+ <td>m4</td>
+ <td>
+ GNU implementation of the traditional Unix macro
+ processor
+ </td>
+ </tr>
+ <tr>
+ <td>cpio.exe</td>
+ <td>Utils</td>
+ <td>cpio</td>
+ <td>
+ A program to manage archives of files
+ </td>
+ </tr>
+ <tr>
+ <td>gawk.exe</td>
+ <td>Utils</td>
+ <td>awk</td>
+ <td>
+ Pattern-directed scanning and processing language
+ </td>
+ </tr>
+ <tr>
+ <td>file.exe</td>
+ <td>Utils</td>
+ <td>file</td>
+ <td>
+ Determines file type using 'magic' numbers
+ </td>
+ </tr>
+ <tr>
+ <td>zip.exe</td>
+ <td>Archive</td>
+ <td>zip</td>
+ <td>
+ Package and compress (archive) files
+ </td>
+ </tr>
+ <tr>
+ <td>unzip.exe</td>
+ <td>Archive</td>
+ <td>unzip</td>
+ <td>
+ Extract compressed files in a ZIP archive
+ </td>
+ </tr>
+ <tr>
+ <td>free.exe</td>
+ <td>System</td>
+ <td>procps</td>
+ <td>
+ Display amount of free and used memory in the system
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </blockquote>
+ Note that the CYGWIN software can conflict with other non-CYGWIN
+ software on your Windows system.
+ CYGWIN provides a
+ <a href="http://cygwin.com/faq/faq.using.html" target="_blank">FAQ</a> for
+ known issues and problems, of particular interest is the
+ section on
+ <a href="http://cygwin.com/faq/faq.using.html#faq.using.bloda" target="_blank">
+ BLODA (applications that interfere with CYGWIN)</a>.
+ </blockquote>
+
+ <h6><a name="msys">MinGW/MSYS</a></h6>
+ <blockquote>
+ MinGW ("Minimalist GNU for Windows") is a collection of free Windows
+ specific header files and import libraries combined with GNU toolsets that
+ allow one to produce native Windows programs that do not rely on any
+ 3rd-party C runtime DLLs. MSYS is a supplement to MinGW which allows building
+ applications and programs which rely on traditional UNIX tools to
+ be present. Among others this includes tools like <code>bash</code>
+ and <code>make</code>.
+ See <a href="http://www.mingw.org/wiki/MSYS" target="_blank">MinGW/MSYS</a>
+ for more information.
+ <p>
+ Like Cygwin, MinGW/MSYS can handle different types of path formats. They
+ are internally converted to paths with forward slashes and drive letters
+ <code><drive>:</code> replaced by a virtual
+ directory <code>/<drive></code>. Additionally, MSYS automatically
+ detects binaries compiled for the MSYS environment and feeds them with the
+ internal, Unix-style path names. If native Windows applications are called
+ from within MSYS programs their path arguments are automatically converted
+ back to Windows style path names with drive letters and backslashes as
+ path separators. This may cause problems for Windows applications which
+ use forward slashes as parameter separator (e.g. <code>cl /nologo /I</code>)
+ because MSYS may wrongly <a href="http://mingw.org/wiki/Posix_path_conversion">
+ replace such parameters by drive letters</a>.
+ </p>
+ <p>
+ In addition to the tools which will be installed
+ by default, you have
+ to manually install the
+ <code>msys-zip</code> and
+ <code>msys-unzip</code> packages.
+ This can be easily done with the MinGW command line installer:
+ <blockquote>
+ <code>mingw-get.exe install msys-zip</code>
+ <br>
+ <code>mingw-get.exe install msys-unzip</code>
+ </blockquote>
+ </blockquote>
+
+ </blockquote>
+
+ <h5><a name="vs2010">Visual Studio 2010 Compilers</a></h5>
+ <blockquote>
+ <p>
+ The 32-bit and 64-bit OpenJDK Windows build requires
+ Microsoft Visual Studio C++ 2010 (VS2010) Professional
+ Edition or Express compiler.
+ The compiler and other tools are expected to reside
+ in the location defined by the variable
+ <code>VS100COMNTOOLS</code> which
+ is set by the Microsoft Visual Studio installer.
+ </p>
+ <p>
+ Only the C++ part of VS2010 is needed.
+ Try to let the installation go to the default
+ install directory.
+ Always reboot your system after installing VS2010.
+ The system environment variable VS100COMNTOOLS
+ should be
+ set in your environment.
+ </p>
+ <p>
+ Make sure that TMP and TEMP are also set
+ in the environment
+ and refer to Windows paths that exist,
+ like <code>C:\temp</code>,
+ not <code>/tmp</code>, not <code>/cygdrive/c/temp</code>,
+ and not <code>C:/temp</code>.
+ <code>C:\temp</code> is just an example,
+ it is assumed that this area is
+ private to the user, so by default
+ after installs you should
+ see a unique user path in these variables.
+ </p>
+ </blockquote>
+
+
+ </blockquote> <!-- Windows -->
+
+ <h4><a name="macosx">Mac OS X</a></h4>
+ <blockquote>
+ Make sure you get the right XCode version.
+ </blockquote> <!-- Mac OS X -->
+
</blockquote>
- <p>
- The freetype 2.3 packages don't seem to be available,
- but the freetype 2.3 sources can be downloaded, built,
- and installed easily enough from
- <a href="http://downloads.sourceforge.net/freetype">
- the freetype site</a>.
- Build and install with something like:
+
+ <!-- ====================================================== -->
+ <hr>
+ <h3><a name="configure">Configure</a></h3>
<blockquote>
- <tt>./configure && make && sudo -u root make install</tt>
+ The basic invocation of the <code>configure</code> script
+ looks like:
+ <blockquote>
+ <b><code>bash ./configure [<i>options</i>]</code></b>
+ </blockquote>
+ This will create an output directory containing the
+ "configuration" and setup an area for the build result.
+ This directory typically looks like:
+ <blockquote>
+ <b><code>build/linux-x64-normal-server-release</code></b>
+ </blockquote>
+ <code>configure</code> will try to figure out what system you are running on
+ and where all necessary build components are.
+ If you have all prerequisites for building installed,
+ it should find everything.
+ If it fails to detect any component automatically,
+ it will exit and inform you about the problem.
+ When this happens, read more below in
+ <a href="#configureoptions">the <code>configure</code> options</a>.
+ <p>
+ Some examples:
+ </p>
+ <table border="1">
+ <thead>
+ <tr>
+ <th>Description</th>
+ <th>Configure Command Line</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>Windows 32bit build with freetype specified</td>
+ <td>
+ <code>bash ./configure --with-freetype=/cygdrive/c/freetype-i586 --with-target-bits=32</code>
+ </td>
+ </tr>
+ <tr>
+ <td>Debug 64bit Build</td>
+ <td>
+ <code>bash ./configure --enable-debug --with-target-bits=64</code>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+
+ <!-- ====================================================== -->
+ <h4><a name="configureoptions">Configure Options</a></h4>
+ <blockquote>
+ Complete details on all the OpenJDK <code>configure</code> options can
+ be seen with:
+ <blockquote>
+ <b><code>bash ./configure --help=short</code></b>
+ </blockquote>
+ Use <code>-help</code> to see all the <code>configure</code> options
+ available.
+
+ You can generate any number of different configurations,
+ e.g. debug, release, 32, 64, etc.
+
+ Some of the more commonly used <code>configure</code> options are:
+
+ <table border="1">
+ <thead>
+ <tr>
+ <th width="300">OpenJDK Configure Option</th>
+ <th>Description</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td><b><code>--enable-debug</code></b></td>
+ <td>
+ set the debug level to fastdebug (this is a shorthand for
+ <code>--with-debug-level=fastdebug</code>)
+ </td>
+ </tr>
+ <tr>
+ <td><b><code>--with-alsa=</code></b><i>path</i></td>
+ <td>
+ select the location of the
+ <a name="alsa">Advanced Linux Sound Architecture (ALSA)</a>
+ <br>
+ Version 0.9.1 or newer of the ALSA files are
+ required for building the OpenJDK on Linux.
+ These Linux files are usually available from an "alsa"
+ of "libasound"
+ development package,
+ and it's highly recommended that you try and use
+ the package provided by the particular version of Linux that
+ you are using.
+ </td>
+ </tr>
+ <tr>
+ <td><b><code>--with-boot-jdk=</code></b><i>path</i></td>
+ <td>
+ select the <a href="#bootjdk">Bootstrap JDK</a>
+ </td>
+ </tr>
+ <tr>
+ <td><b><code>--with-boot-jdk-jvmargs=</code></b>"<i>args</i>"</td>
+ <td>
+ provide the JVM options to be used to run the
+ <a href="#bootjdk">Bootstrap JDK</a>
+ </td>
+ </tr>
+ <tr>
+ <td><b><code>--with-cacerts=</code></b><i>path</i></td>
+ <td>
+ select the path to the cacerts file.
+ <br>
+ See <a href="http://en.wikipedia.org/wiki/Certificate_Authority" target="_blank">
+ http://en.wikipedia.org/wiki/Certificate_Authority</a>
+ for a better understanding of the Certificate Authority (CA).
+ A certificates file named "cacerts"
+ represents a system-wide keystore with CA certificates.
+ In JDK and JRE
+ binary bundles, the "cacerts" file contains root CA certificates from
+ several public CAs (e.g., VeriSign, Thawte, and Baltimore).
+ The source contain a cacerts file
+ without CA root certificates.
+ Formal JDK builders will need to secure
+ permission from each public CA and include the certificates into their
+ own custom cacerts file.
+ Failure to provide a populated cacerts file
+ will result in verification errors of a certificate chain during runtime.
+ By default an empty cacerts file is provided and that should be
+ fine for most JDK developers.
+ </td>
+ </tr>
+ <tr>
+ <td><b><code>--with-cups=</code></b><i>path</i></td>
+ <td>
+ select the CUPS install location
+ <br>
+ The
+ <a name="cups">Common UNIX Printing System (CUPS) Headers</a>
+ are required for building the
+ OpenJDK on Solaris and Linux.
+ The Solaris header files can be obtained by installing
+ the package <strong>SFWcups</strong> from the Solaris Software
+ Companion CD/DVD, these often will be installed into the
+ directory <code>/opt/sfw/cups</code>.
+ <br>
+ The CUPS header files can always be downloaded from
+ <a href="http://www.cups.org" target="_blank">www.cups.org</a>.
+ </td>
+ </tr>
+ <tr>
+ <td><b><code>--with-cups-include=</code></b><i>path</i></td>
+ <td>
+ select the CUPS include directory location
+ </td>
+ </tr>
+ <tr>
+ <td><b><code>--with-debug-level=</code></b><i>level</i></td>
+ <td>
+ select the debug information level of release,
+ fastdebug, or slowdebug
+ </td>
+ </tr>
+ <tr>
+ <td><b><code>--with-dev-kit=</code></b><i>path</i></td>
+ <td>
+ select location of the compiler install or
+ developer install location
+ </td>
+ </tr>
+ <tr>
+ <td><b><code>--with-dxsdk=</code></b><i>path</i></td>
+ <td>
+ select location of the Windows Direct X SDK install
+ <br>
+ The <a name="dxsdk">Microsoft DirectX 9.0 SDK</a>
+ header files and libraries
+ from the Summer 2004 edition
+ are required for building OpenJDK.
+ This SDK can be downloaded from
+ <a href="http://www.microsoft.com/downloads/details.aspx?FamilyId=FD044A42-9912-42A3-9A9E-D857199F888E&displaylang=en" target="_blank">
+ Microsoft DirectX 9.0 SDK (Summer 2004)</a>.
+ If the link above becomes obsolete, the SDK can be found from
+ <a href="http://download.microsoft.com" target="_blank">the Microsoft Download Site</a>
+ (search with "DirectX 9.0 SDK Update Summer 2004").
+ Installation usually will set the environment variable
+ <code>DXSDK_DIR</code> to it's install location.
+ </td>
+ </tr>
+ <tr>
+ <td><b><code>--with-freetype=</code></b><i>path</i></td>
+ <td>
+ select the freetype files to use.
+ <br>
+ Expecting the
+ <a name="freetype">freetype</a> libraries under
+ <code>lib/</code> and the
+ headers under <code>include/</code>.
+ <br>
+ Version 2.3 or newer of FreeType is required.
+ On Unix systems required files can be available as part of your
+ distribution (while you still may need to upgrade them).
+ Note that you need development version of package that
+ includes both the FreeType library and header files.
+ <br>
+ You can always download latest FreeType version from the
+ <a href="http://www.freetype.org" target="_blank">FreeType website</a>.
+ <br>
+ Building the freetype 2 libraries from scratch is also possible,
+ however on Windows refer to the
+ <a href="http://freetype.freedesktop.org/wiki/FreeType_DLL">
+ Windows FreeType DLL build instructions</a>.
+ <br>
+ Note that by default FreeType is built with byte code hinting
+ support disabled due to licensing restrictions.
+ In this case, text appearance and metrics are expected to
+ differ from Sun's official JDK build.
+ See
+ <a href="http://freetype.sourceforge.net/freetype2/index.html">
+ the SourceForge FreeType2 Home Page
+ </a>
+ for more information.
+ </td>
+ </tr>
+ <tr>
+ <td><b><code>--with-import-hotspot=</code></b><i>path</i></td>
+ <td>
+ select the location to find hotspot
+ binaries from a previous build to avoid building
+ hotspot
+ </td>
+ </tr>
+ <tr>
+ <td><b><code>--with-target-bits=</code></b><i>arg</i></td>
+ <td>
+ select 32 or 64 bit build
+ </td>
+ </tr>
+ <tr>
+ <td><b><code>--with-jvm-variants=</code></b><i>variants</i></td>
+ <td>
+ select the JVM variants to build from, comma
+ separated list that can include:
+ server, client, kernel, zero and zeroshark
+ </td>
+ </tr>
+ <tr>
+ <td><b><code>--with-memory-size=</code></b><i>size</i></td>
+ <td>
+ select the RAM size that GNU make will think
+ this system has
+ </td>
+ </tr>
+ <tr>
+ <td><a name="msvcrNN"><b><code>--with-msvcr-dll=</code></b><i>path</i></a></td>
+ <td>
+ select the <code>msvcr100.dll</code>
+ file to include in the
+ Windows builds (C/C++ runtime library for
+ Visual Studio).
+ <br>
+ This is usually picked up automatically
+ from the redist
+ directories of Visual Studio 2010.
+ </td>
+ </tr>
+ <tr>
+ <td><b><code>--with-num-cores=</code></b><i>cores</i></td>
+ <td>
+ select the number of cores to use (processor
+ count or CPU count)
+ </td>
+ </tr>
+ <tr>
+ <td><b><code>--with-x=</code></b><i>path</i></td>
+ <td>
+ select the location of the X11 and xrender files.
+ <br>
+ The
+ <a name="xrender">XRender Extension Headers</a>
+ are required for building the
+ OpenJDK on Solaris and Linux.
+ <br>
+ The Linux header files are usually available from a "Xrender"
+ development package, it's recommended that you try and use
+ the package provided by the particular distribution of Linux that
+ you are using.
+ <br>
+ The Solaris XRender header files is
+ included with the other X11 header files
+ in the package <strong>SFWxwinc</strong>
+ on new enough versions of
+ Solaris and will be installed in
+ <code>/usr/X11/include/X11/extensions/Xrender.h</code> or
+ <code>/usr/openwin/share/include/X11/extensions/Xrender.h</code>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </blockquote>
+
</blockquote>
- <p>
- Mercurial packages could not be found easily, but a Google
- search should find ones, and they usually include Python if
- it's needed.
- </blockquote>
- <!-- ------------------------------------------------------ -->
- <h3><a name="debian">Debian</a></h3>
- <blockquote>
- <h4>Debian 5.0 (Lenny)</h4>
- <p>
+
+ <!-- ====================================================== -->
+ <hr>
+ <h3><a name="make">Make</a></h3>
<blockquote>
- After installing <a href="http://debian.org">Debian</a> 5
- you need to install several build dependencies.
- The simplest way to install the build dependencies is to
- execute the following commands as user <tt>root</tt>:
- <p/>
- <code>aptitude build-dep openjdk-6</code>
- <p/>
- <code>aptitude install openjdk-6-jdk libmotif-dev</code>
- <p/>
- In addition, it's necessary to set a few environment variables for the build:
- <p/>
- <code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk</code>
+ The basic invocation of the <code>make</code> utility
+ looks like:
+ <blockquote>
+ <b><code>make all</code></b>
+ </blockquote>
+ This will start the build to the output directory containing the
+ "configuration" that was created by the <code>configure</code>
+ script. Run <code>make help</code> for more information on
+ the available targets.
+ <br>
+ There are some of the make targets that
+ are of general interest:
+ <table border="1">
+ <thead>
+ <tr>
+ <th>Make Target</th>
+ <th>Description</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td><i>empty</i></td>
+ <td>build everything but no images</td>
+ </tr>
+ <tr>
+ <td><b><code>all</code></b></td>
+ <td>build everything including images</td>
+ </tr>
+ <tr>
+ <td><b><code>all-conf</code></b></td>
+ <td>build all configurations</td>
+ </tr>
+ <tr>
+ <td><b><code>images</code></b></td>
+ <td>create complete j2sdk and j2re images</td>
+ </tr>
+ <tr>
+ <td><b><code>install</code></b></td>
+ <td>install the generated images locally,
+ typically in <code>/usr/local</code></td>
+ </tr>
+ <tr>
+ <td><b><code>clean</code></b></td>
+ <td>remove all files generated by make,
+ but not those generated by <code>configure</code></td>
+ </tr>
+ <tr>
+ <td><b><code>dist-clean</code></b></td>
+ <td>remove all files generated by both
+ and <code>configure</code> (basically killing the configuration)</td>
+ </tr>
+ <tr>
+ <td><b><code>help</code></b></td>
+ <td>give some help on using <code>make</code>,
+ including some interesting make targets</td>
+ </tr>
+ </tbody>
+ </table>
</blockquote>
</blockquote>
+
<!-- ====================================================== -->
- <h3><a name="ubuntu">Ubuntu</a></h3>
- <blockquote>
- <h4>Ubuntu 8.04</h4>
- <p>
- <blockquote>
- After installing <a href="http://ubuntu.org">Ubuntu</a> 8.04
- you need to install several build dependencies.
- <p/>
- First, you need to enable the universe repository in the
- Software Sources application and reload the repository
- information. The Software Sources application is available
- under the System/Administration menu.
- <p/>
- The simplest way to install the build dependencies is to
- execute the following commands:
- <p/>
- <code>sudo aptitude build-dep openjdk-6</code>
- <p/>
- <code>sudo aptitude install openjdk-6-jdk</code>
- <p/>
- In addition, it's necessary to set a few environment variables for the build:
- <p/>
- <code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk</code>
- </blockquote>
- <h4>Ubuntu 8.10</h4>
- <p>
- <blockquote>
- After installing <a href="http://ubuntu.org">Ubuntu</a> 8.10
- you need to install several build dependencies. The simplest
- way to do it is to execute the following commands:
- <p/>
- <code>sudo aptitude build-dep openjdk-6</code>
- <p/>
- <code>sudo aptitude install openjdk-6-jdk</code>
- <p/>
- In addition, it's necessary to set a few environment variables for the build:
- <p/>
- <code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk</code>
- </blockquote>
- <h4>Ubuntu 9.04</h4>
- <p>
- <blockquote>
- After installing <a href="http://ubuntu.org">Ubuntu</a> 9.04
- you need to install several build dependencies. The simplest
- way to do it is to execute the following commands:
- <p/>
- <code>sudo aptitude build-dep openjdk-6</code>
- <p/>
- <code>sudo aptitude install openjdk-6-jdk</code>
- <p/>
- In addition, it's necessary to set a few environment variables for the build:
- <p/>
- <code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk</code>
- </blockquote>
- </blockquote>
- <!-- ====================================================== -->
- <h3><a name="opensuse">OpenSUSE</a></h3>
+ <hr>
+ <h2><a name="testing">Testing</a></h2>
<blockquote>
- <h4>OpenSUSE 11.1</h4>
- <p>
- <blockquote>
- After installing <a href="http://opensuse.org">OpenSUSE</a> 11.1
- you need to install several build dependencies.
- The simplest way to install the build dependencies is to
- execute the following commands:
- <p/>
- <code>sudo zypper source-install -d java-1_6_0-openjdk</code>
- <p/>
- <code>sudo zypper install make</code>
- <p/>
- In addition, it is necessary to set a few environment variables for the build:
- <p/>
- <code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-1.6.0-openjdk</code>
- <p/>
- Finally, you need to unset the <code>JAVA_HOME</code> environment variable:
- <p/>
- <code>export -n JAVA_HOME</code>
- </blockquote>
- </blockquote>
- <!-- ====================================================== -->
- <h3><a name="mandriva">Mandriva</a></h3>
- <blockquote>
- <h4>Mandriva Linux One 2009 Spring</h4>
- <p>
+ When the build is completed, you should see the generated
+ binaries and associated files in the <code>j2sdk-image</code>
+ directory in the output directory.
+ In particular, the
+ <code>build/<i>*</i>/images/j2sdk-image/bin</code>
+ directory should contain executables for the
+ OpenJDK tools and utilities for that configuration.
+ The testing tool <code>jtreg</code> will be needed
+ and can be found at:
+ <a href="http://openjdk.java.net/jtreg/" target="_blank">
+ the jtreg site</a>.
+ The provided regression tests in the repositories
+ can be run with the command:
<blockquote>
- After installing <a href="http://mandriva.org">Mandriva</a> Linux One 2009 Spring
- you need to install several build dependencies.
- The simplest way to install the build dependencies is to
- execute the following commands as user <tt>root</tt>:
- <p/>
- <code>urpmi java-1.6.0-openjdk-devel ant make gcc gcc-c++ freetype-devel zip unzip libcups2-devel libxrender1-devel libalsa2-devel libstc++-static-devel libxtst6-devel libxi-devel</code>
- <p/>
- In addition, it is necessary to set a few environment variables for the build:
- <p/>
- <code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-1.6.0-openjdk</code>
- </blockquote>
- </blockquote>
- <!-- ====================================================== -->
- <h3><a name="opensolaris">OpenSolaris</a></h3>
- <blockquote>
- <h4>OpenSolaris 2009.06</h4>
- <p>
- <blockquote>
- After installing <a href="http://opensolaris.org">OpenSolaris</a> 2009.06
- you need to install several build dependencies.
- The simplest way to install the build dependencies is to
- execute the following commands:
- <p/>
- <code>pfexec pkg install SUNWgmake SUNWj6dev SUNWant sunstudioexpress SUNWcups SUNWzip SUNWunzip SUNWxwhl SUNWxorg-headers SUNWaudh SUNWfreetype2</code>
- <p/>
- In addition, it is necessary to set a few environment variables for the build:
- <p/>
- <code>export LANG=C ALT_COMPILER_PATH=/opt/SunStudioExpress/bin/ ALT_CUPS_HEADERS_PATH=/usr/include/</code>
- <p/>
- Finally, you need to make sure that the build process can find the Sun Studio compilers:
- <p/>
- <code>export PATH=$PATH:/opt/SunStudioExpress/bin/</code>
+ <code><b>cd test && make PRODUCT_HOME=`pwd`/../build/*/images/j2sdk-image all</b></code>
</blockquote>
</blockquote>
- <!-- ------------------------------------------------------ -->
+
+ <!-- ====================================================== -->
+ <!-- ====================================================== -->
+ <!-- ====================================================== -->
+ <!-- ====================================================== -->
+ <!-- ====================================================== -->
+ <!-- ====================================================== -->
+ <!-- ====================================================== -->
+ <!-- ====================================================== -->
+ <!-- ====================================================== -->
+
+ <!-- ====================================================== -->
<hr>
- <h2><a name="directories">Source Directory Structure</a></h2>
+ <h2><a name="hints">Appendix A: Hints and Tips</a></h2>
<blockquote>
- <p>
- The source code for the OpenJDK is delivered in a set of
- directories:
- <tt>hotspot</tt>,
- <tt>langtools</tt>,
- <tt>corba</tt>,
- <tt>jaxws</tt>,
- <tt>jaxp</tt>,
- and
- <tt>jdk</tt>.
- The <tt>hotspot</tt> directory contains the source code and make
- files for building the OpenJDK Hotspot Virtual Machine.
- The <tt>langtools</tt> directory contains the source code and make
- files for building the OpenJDK javac and language tools.
- The <tt>corba</tt> directory contains the source code and make
- files for building the OpenJDK Corba files.
- The <tt>jaxws</tt> directory contains the source code and make
- files for building the OpenJDK JAXWS files.
- The <tt>jaxp</tt> directory contains the source code and make
- files for building the OpenJDK JAXP files.
- The <tt>jdk</tt> directory contains the source code and make files for
- building the OpenJDK runtime libraries and misc files.
- The top level <tt>Makefile</tt>
- is used to build the entire OpenJDK.
+
+ <h3><a name="faq">FAQ</a></h3>
+ <blockquote>
- <h3><a name="drops">Managing the Source Drops</a></h3>
- <blockquote>
+ <p>
+ <b>Q:</b> The <code>configure</code> file looks horrible!
+ How are you going to edit it?
+ <br>
+ <b>A:</b> The <code>configure</code> file is generated (think
+ "compiled") by the autoconf tools. The source code is
+ in <code>configure.ac</code> various .m4 files in common/autoconf,
+ which are
+ much more readable.
+ </p>
+
<p>
- The repositories <tt>jaxp</tt> and <tt>jaxws</tt> actually
- do not contain the sources for JAXP or JAX-WS.
- These products have their own open source procedures at their
- <a href="http://jaxp.java.net/">JAXP</a> and
- <a href="http://jax-ws.java.net/">JAX-WS</a> home pages.
- The OpenJDK project does need access to these sources to build
- a complete JDK image because JAXP and JAX-WS are part of the JDK.
- The current process for delivery of the JAXP and JAX-WS sources
- involves so called "source drop bundles" downloaded from a public
- website.
- There are many reasons for this current mechanism, and it is
- understood that this is not ideal for the open source community.
- It is possible this process could change in the future.
+ <b>Q:</b>
+ Why is the <code>configure</code> file checked in,
+ if it is generated?
<br>
- <b>NOTE:</b> The <a href="http://download.java.net/openjdk/jdk8/">
- Complete OpenJDK Source Bundles</a> <u>will</u> contain the JAXP and
- JAX-WS sources.
+ <b>A:</b>
+ If it was not generated, every user would need to have the autoconf
+ tools installed, and re-generate the <code>configure</code> file
+ as the first step.
+ Our goal is to minimize the work needed to be done by the user
+ to start building OpenJDK, and to minimize
+ the number of external dependencies required.
</p>
- <h4><a name="dropcreation">Creation of New Source Drop Bundles</a></h4>
+ <p>
+ <b>Q:</b>
+ Do you require a specific version of autoconf for regenerating
+ <code>configure</code>?
+ <br>
+ <b>A:</b>
+ Currently, no, but this will likely be the case when things have
+ settled down a bit more. (The reason for this is to avoid
+ large spurious changes in <code>configure</code>
+ in commits that made small changes to <code>configure.ac</code>).
+ </p>
+
+ <p>
+ <b>Q:</b>
+ What are the files in <code>common/makefiles/support/*</code> for?
+ They look like gibberish.
+ <br>
+ <b>A:</b>
+ They are a somewhat ugly hack to compensate for command line length
+ limitations on certain platforms (Windows, Solaris).
+ Due to a combination of limitations in make and the shell,
+ command lines containing too many files will not work properly.
+ These
+ helper files are part of an elaborate hack that will compress the
+ command line in the makefile and then uncompress it safely.
+ We're
+ not proud of it, but it does fix the problem.
+ If you have any better suggestions, we're all ears! :-)
+ </p>
+
+ <p>
+ <b>Q:</b>
+ I want to see the output of the commands that make runs,
+ like in the old build. How do I do that?
+ <br>
+ <b>A:</b>
+ You specify the <code>LOG</code> variable to make. There are
+ several log levels:
+ </p>
<blockquote>
- <ol>
+ <ul>
<li>
- The JAXP or JAX-WS team prepares a new zip bundle,
- places a copy in a public download area on java.net,
- sends us a link and a list of CRs (Change Request Numbers).
- The older download bundles should not be deleted.
- It is the responsibility of the JAXP and JAX-WS team to
- place the proper GPL legal notices on the sources
- and do any filtering or java re-packaging for the
- OpenJDK instances of these classes.
+ <b><code>warn</code></b> — Default and very quiet.
</li>
<li>
- The OpenJDK team copies this new bundle into shared
- area (e.g. <tt>/java/devtools/share/jdk8-drops</tt>).
- Older bundles are never deleted so we retain the history.
+ <b><code>info</code></b> — Shows more progress information
+ than warn.
</li>
<li>
- The OpenJDK team edits the ant property file
- <tt>jaxp/jaxp.properties</tt> or
- <tt>jaxws/jaxws.properties</tt> to update the
- base URL, the zip bundle name, and the MD5 checksum
- of the zip bundle
- (on Solaris: <tt>sum -c md5 <i>bundlename</i></tt>)
+ <b><code>debug</code></b> — Echos all command lines and
+ prints all macro calls for compilation definitions.
</li>
<li>
- OpenJDK team reviews and commits those changes with the
- given CRs.
+ <b><code>trace</code></b> — Echos all $(shell) command
+ lines as well.
</li>
- </ol>
+ </ul>
</blockquote>
- <h4><a name="dropusage">Using Source Drop Bundles</a></h4>
+ <p>
+ <b>Q:</b>
+ When do I have to re-run <code>configure</code>?
+ <br>
+ <b>A:</b>
+ Normally you will run <code>configure</code> only once for creating a
+ configuration.
+ You need to re-run configuration only if you want to change any
+ configuration options,
+ or if you pull down changes to the <code>configure</code> script.
+ </p>
+
+ <p>
+ <b>Q:</b>
+ I have added a new source file. Do I need to modify the makefiles?
+ <br>
+ <b>A:</b>
+ Normally, no. If you want to create e.g. a new native
+ library,
+ you will need to modify the makefiles. But for normal file
+ additions or removals, no changes are needed. There are certan
+ exceptions for some native libraries where the source files are spread
+ over many directories which also contain courses for other
+ libraries. In these cases it was simply easier to create include lists
+ rather thane excludes.
+ </p>
+
+ <p>
+ <b>Q:</b>
+ When I run <code>configure --help</code>, I see many strange options,
+ like <code>--dvidir</code>. What is this?
+ <br>
+ <b>A:</b>
+ Configure provides a slew of options by default, to all projects
+ that use autoconf. Most of them are not used in OpenJDK,
+ so you can safely ignore them. To list only OpenJDK specific features,
+ use <code>configure --help=short</code> instead.
+ </p>
+
+ <p>
+ <b>Q:</b>
+ <code>configure</code> provides OpenJDK-specific features such as
+ <code>--enable-jigsaw</code> or <code>--with-builddeps-server</code>
+ that are not described in this document. What about those?
+ <br>
+ <b>A:</b>
+ Try them out if you like! But be aware that most of these are
+ experimental features.
+ Many of them don't do anything at all at the moment; the option
+ is just a placeholder. Other depends on
+ pieces of code or infrastructure that is currently
+ not ready for prime time.
+ </p>
+
+ <p>
+ <b>Q:</b>
+ How will you make sure you don't break anything?
+ <br>
+ <b>A:</b>
+ We have a script that compares the result of the new build system
+ with the result of the old. For most part, we aim for (and achieve)
+ byte-by-byte identical output. There are however technical issues
+ with e.g. native binaries, which might differ in a byte-by-byte
+ comparison, even
+ when building twice with the old build system.
+ For these, we compare relevant aspects
+ (e.g. the symbol table and file size).
+ Note that we still don't have 100%
+ equivalence, but we're close.
+ </p>
+
+ <p>
+ <b>Q:</b>
+ I noticed this thing X in the build that looks very broken by design.
+ Why don't you fix it?
+ <br>
+ <b>A:</b>
+ Our goal is to produce a build output that is as close as
+ technically possible to the old build output.
+ If things were weird in the old build,
+ they will be weird in the new build.
+ Often, things were weird before due to obscurity,
+ but in the new build system the weird stuff comes up to the surface.
+ The plan is to attack these things at a later stage,
+ after the new build system is established.
+ </p>
+
+ <p>
+ <b>Q:</b>
+ The code in the new build system is not that well-structured.
+ Will you fix this?
+ <br>
+ <b>A:</b>
+ Yes! The new build system has grown bit by bit as we converted
+ the old system. When all of the old build system is converted,
+ we can take a step back and clean up the structure of the new build
+ system. Some of this we plan to do before replacing the old build
+ system and some will need to wait until after.
+ </p>
+
+ <p>
+ <b>Q:</b> What is @GenerateNativeHeaders?
+ <br>
+ <b>A:</b>
+ To speed up compilation, we added a flag to javac which makes it
+ do the job of javah as well, as a by-product; that is, generating
+ native .h header files. These files are only generated
+ if a class contains native methods. However, sometimes
+ a class contains no native method,
+ but still contains constants that native code needs to use.
+ The new GenerateNativeHeaders annotation tells javac to
+ force generation of a
+ header file in these cases. (We don't want to generate
+ native headers for all classes that contains constants
+ but no native methods, since
+ that would slow down the compilation process needlessly.)
+ </p>
+
+ <p>
+ <b>Q:</b>
+ Is anything able to use the results of the new build's default make target?
+ <br>
+ <b>A:</b>
+ Yes, this is the minimal (or roughly minimal)
+ set of compiled output needed for a developer to actually
+ execute the newly built JDK. The idea is that in an incremental
+ development fashion, when doing a normal make,
+ you should only spend time recompiling what's changed
+ (making it purely incremental) and only do the work that's
+ needed to actually run and test your code.
+ The packaging stuff that is part of the <code>images</code>
+ target is not needed for a normal developer who wants to
+ test his new code. Even if it's quite fast, it's still unnecessary.
+ We're targeting sub-second incremental rebuilds! ;-)
+ (Or, well, at least single-digit seconds...)
+ </p>
+
+ <p>
+ <b>Q:</b>
+ I usually set a specific environment variable when building,
+ but I can't find the equivalent in the new build.
+ What should I do?
+ <br>
+ <b>A:</b>
+ It might very well be that we have missed to add support for
+ an option that was actually used from outside the build system.
+ Email us and we will
+ add support for it!
+ </p>
+
+ </blockquote>
+
+ <h3><a name="performance">Build Performance Tips</a></h3>
+ <blockquote>
+
+ <p>Building OpenJDK requires a lot of horsepower.
+ Some of the build tools can be adjusted to utilize more or less
+ of resources such as
+ parallel threads and memory.
+ The <code>configure</code> script analyzes your system and selects reasonable
+ values for such options based on your hardware.
+ If you encounter resource problems, such as out of memory conditions,
+ you can modify the detected values with:</p>
+
+ <ul>
+ <li>
+ <b><code>--with-num-cores</code></b>
+ —
+ number of cores in the build system,
+ e.g. <code>--with-num-cores=8</code>
+ </li>
+ <li>
+ <b><code>--with-memory-size</code></b>
+ — memory (in MB) available in the build system,
+ e.g. <code>--with-memory-size=1024</code>
+ </li>
+ </ul>
+
+ <p>It might also be necessary to specify the JVM arguments passed
+ to the Bootstrap JDK, using e.g.
+ <code>--with-boot-jdk-jvmargs="-Xmx8G -enableassertions"</code>.
+ Doing this will override the default JVM arguments
+ passed to the Bootstrap JDK.</p>
+
+
+ <p>One of the top goals of the new build system is to improve the
+ build performance and decrease the time needed to build. This will
+ soon also apply to the java compilation when the Smart Javac wrapper
+ is making its way into jdk8. It can be tried in the build-infra
+ repository already. You are likely to find that the new build system
+ is faster than the old one even without this feature.</p>
+
+ <p>At the end of a successful execution of <code>configure</code>,
+ you will get a performance summary,
+ indicating how well the build will perform. Here you will
+ also get performance hints.
+ If you want to build fast, pay attention to those!</p>
+
+ <h4>Building with ccache</h4>
+
+ <p>A simple way to radically speed up compilation of native code
+ (typically hotspot and native libraries in JDK) is to install
+ ccache. This will cache and reuse prior compilation results, if the
+ source code is unchanged. However, ccache versions prior to 3.1.4
+ does not work correctly with the precompiled headers used in
+ OpenJDK. So if your platform supports ccache at 3.1.4 or later, we
+ highly recommend installing it. This is currently only supported on
+ linux.</p>
+
+ <h4>Building on local disk</h4>
+
+ <p>If you are using network shares, e.g. via NFS, for your source code,
+ make sure the build directory is situated on local disk.
+ The performance
+ penalty is extremely high for building on a network share,
+ close to unusable.</p>
+
+ <h4>Building only one JVM</h4>
+
+ <p>The old build builds multiple JVMs on 32-bit systems (client and
+ server; and on Windows kernel as well). In the new build we have
+ changed this default to only build server when it's available. This
+ improves build times for those not interested in multiple JVMs. To
+ mimic the old behavior on platforms that support it,
+ use <code>--with-jvm-variants=client,server</code>.</p>
+
+ <h4>Selecting the number of cores to build on</h4>
+
+ <p>By default, <code>configure</code> will analyze your machine and run the make
+ process in parallel with as many threads as you have cores. This
+ behavior can be overridden, either "permanently" (on a <code>configure</code>
+ basis) using <code>--with-num-cores=N</code> or for a single build
+ only (on a make basis), using <code>make JOBS=N</code>.</p>
+
+ <p>If you want to make a slower build just this time, to save some CPU
+ power for other processes, you can run
+ e.g. <code>make JOBS=2</code>. This will force the makefiles
+ to only run 2 parallel processes, or even <code>make JOBS=1</code>
+ which will disable parallelism.</p>
+
+ <p>If you want to have it the other way round, namely having slow
+ builds default and override with fast if you're
+ impatient, you should call <code>configure</code> with
+ <code>--with-num-cores=2</code>, making 2 the default.
+ If you want to run with more
+ cores, run <code>make JOBS=8</code></p>
+
+ </blockquote>
+
+ <h3><a name="troubleshooting">Troubleshooting</a></h3>
+ <blockquote>
+
+ <h4>Solving build problems</h4>
+
<blockquote>
- <p>
- The ant scripts that build <tt>jaxp</tt> and <tt>jaxws</tt>
- will attempt to locate these zip bundles from the directory
- in the environment variable
- <tt><a href="#ALT_DROPS_DIR">ALT_DROPS_DIR</a></tt>.
- The checksums protect from getting the wrong, corrupted, or
- improperly modified sources.
- Once the sources are made available, the population will not
- happen again unless a <tt>make clobber</tt> is requested
- or the <tt>jaxp/drop/</tt> or <tt>jaxws/drop/</tt>
- directory is explicitly deleted.
- <br>
- <b>NOTE:</b> The default Makefile and ant script behavior
- is to NOT download these bundles from the public http site.
- In general, doing downloads
- during the build process is not advised, it creates too much
- unpredictability in the build process.
- However, you can use <tt>make ALLOW_DOWNLOADS=true</tt> to
- tell the ant script that the download of the zip bundle is
- acceptable.
- </p>
- <p>
- The recommended procedure for keeping a cache of these
- source bundles would be to download them once, place them
- in a directory outside the repositories, and then set
- <tt><a href="#ALT_DROPS_DIR">ALT_DROPS_DIR</a></tt> to refer
- to that directory.
- These drop bundles do change occasionally, so the newer
- bundles may need to be added to this area from time to time.
- </p>
+ If the build fails (and it's not due to a compilation error in
+ a source file you've changed), the first thing you should do
+ is to re-run the build with more verbosity.
+ Do this by adding <code>LOG=debug</code> to your make command line.
+ <br>
+ The build log (with both stdout and stderr intermingled,
+ basically the same as you see on your console) can be found as
+ <code>build.log</code> in your build directory.
+ <br>
+ You can ask for help on build problems with the new build system
+ on either the
+ <a href="http://mail.openjdk.java.net/mailman/listinfo/build-dev">
+ build-dev</a>
+ or the
+ <a href="http://mail.openjdk.java.net/mailman/listinfo/build-infra-dev">
+ build-infra-dev</a>
+ mailing lists. Please include the relevant parts
+ of the build log.
+ <br>
+ A build can fail for any number of reasons.
+ Most failures
+ are a result of trying to build in an environment in which all the
+ pre-build requirements have not been met.
+ The first step in
+ troubleshooting a build failure is to recheck that you have satisfied
+ all the pre-build requirements for your platform.
+ Scanning the <code>configure</code> log is a good first step, making
+ sure that what it found makes sense for your system.
+ Look for strange error messages or any difficulties that
+ <code>configure</code> had in finding things.
+ <br>
+ Some of the more common problems with builds are briefly
+ described
+ below, with suggestions for remedies.
+ <ul>
+ <li>
+ <b>Corrupted Bundles on Windows:</b>
+ <blockquote>
+ Some virus scanning software has been known to
+ corrupt the
+ downloading of zip bundles.
+ It may be necessary to disable the 'on access' or
+ 'real time'
+ virus scanning features to prevent this corruption.
+ This type of "real time" virus scanning can also
+ slow down the
+ build process significantly.
+ Temporarily disabling the feature, or excluding the build
+ output directory may be necessary to get correct and
+ faster builds.
+ </blockquote>
+ </li>
+ <li>
+ <b>Slow Builds:</b>
+ <blockquote>
+ If your build machine seems to be overloaded from too many
+ simultaneous C++ compiles, try setting the
+ <code>JOBS=1</code> on the <code>make</code> command line.
+ Then try increasing the count slowly to an acceptable
+ level for your system. Also:
+ <blockquote>
+ Creating the javadocs can be very slow,
+ if you are running
+ javadoc, consider skipping that step.
+ <br>
+ Faster CPUs, more RAM, and a faster DISK usually helps.
+ The VM build tends to be CPU intensive
+ (many C++ compiles),
+ and the rest of the JDK will often be disk intensive.
+ <br>
+ Faster compiles are possible using a tool called
+ <a href="http://ccache.samba.org/" target="_blank">ccache</a>.
+ </blockquote>
+ </blockquote>
+ </li>
+ <li>
+ <b>File time issues:</b>
+ <blockquote>
+ If you see warnings that refer to file time stamps, e.g.
+ <blockquote>
+ <i>Warning message:</i><code>
+ File `xxx' has modification time in
+ the future.</code>
+ <br>
+ <i>Warning message:</i> <code> Clock skew detected.
+ Your build may
+ be incomplete.</code>
+ </blockquote>
+ These warnings can occur when the clock on the build
+ machine is out of
+ sync with the timestamps on the source files.
+ Other errors, apparently
+ unrelated but in fact caused by the clock skew,
+ can occur along with
+ the clock skew warnings.
+ These secondary errors may tend to obscure the
+ fact that the true root cause of the problem
+ is an out-of-sync clock.
+ <p>
+ If you see these warnings, reset the clock on the
+ build
+ machine, run "<code><i>gmake</i> clobber</code>"
+ or delete the directory
+ containing the build output, and restart the
+ build from the beginning.
+ </blockquote>
+ </li>
+ <li>
+ <b>Error message:
+ <code>Trouble writing out table to disk</code></b>
+ <blockquote>
+ Increase the amount of swap space on your build machine.
+ This could be caused by overloading the system and
+ it may be necessary to use:
+ <blockquote>
+ <code>make JOBS=1</code>
+ </blockquote>
+ to reduce the load on the system.
+ </blockquote>
+ </li>
+ <li>
+ <b>Error Message:
+ <code>libstdc++ not found:</code></b>
+ <blockquote>
+ This is caused by a missing libstdc++.a library.
+ This is installed as part of a specific package
+ (e.g. libstdc++.so.devel.386).
+ By default some 64-bit Linux versions (e.g. Fedora)
+ only install the 64-bit version of the libstdc++ package.
+ Various parts of the JDK build require a static
+ link of the C++ runtime libraries to allow for maximum
+ portability of the built images.
+ </blockquote>
+ </li>
+ <li>
+ <b>Linux Error Message:
+ <code>cannot restore segment prot after reloc</code></b>
+ <blockquote>
+ This is probably an issue with SELinux (See
+ <a href="http://en.wikipedia.org/wiki/SELinux" target="_blank">
+ http://en.wikipedia.org/wiki/SELinux</a>).
+ Parts of the VM is built without the <code>-fPIC</code> for
+ performance reasons.
+ <p>
+ To completely disable SELinux:
+ <ol>
+ <li><code>$ su root</code></li>
+ <li><code># system-config-securitylevel</code></li>
+ <li><code>In the window that appears, select the SELinux tab</code></li>
+ <li><code>Disable SELinux</code></li>
+ </ol>
+ <p>
+ Alternatively, instead of completely disabling it you could
+ disable just this one check.
+ <ol>
+ <li>Select System->Administration->SELinux Management</li>
+ <li>In the SELinux Management Tool which appears,
+ select "Boolean" from the menu on the left</li>
+ <li>Expand the "Memory Protection" group</li>
+ <li>Check the first item, labeled
+ "Allow all unconfined executables to use
+ libraries requiring text relocation ..."</li>
+ </ol>
+ </blockquote>
+ </li>
+ <li>
+ <b>Windows Error Messages:</b>
+ <br>
+ <code>*** fatal error - couldn't allocate heap, ... </code>
+ <br>
+ <code>rm fails with "Directory not empty"</code>
+ <br>
+ <code>unzip fails with "cannot create ... Permission denied"</code>
+ <br>
+ <code>unzip fails with "cannot create ... Error 50"</code>
+ <br>
+ <blockquote>
+ The CYGWIN software can conflict with other non-CYGWIN
+ software. See the CYGWIN FAQ section on
+ <a href="http://cygwin.com/faq/faq.using.html#faq.using.bloda" target="_blank">
+ BLODA (applications that interfere with CYGWIN)</a>.
+ </blockquote>
+ </li>
+ <li>
+ <b>Windows Error Message: <code>spawn failed</code></b>
+ <blockquote>
+ Try rebooting the system, or there could be some kind of
+ issue with the disk or disk partition being used.
+ Sometimes it comes with a "Permission Denied" message.
+ </blockquote>
+ </li>
+ </ul>
</blockquote>
- </blockquote>
- </blockquote>
- <!-- ------------------------------------------------------ -->
+
+ </blockquote> <!-- Troubleshooting -->
+
+ </blockquote> <!-- Appendix A -->
+
+ <!-- ====================================================== -->
<hr>
- <h2><a name="building">Build Information</a></h2>
+ <h2><a name="gmake">Appendix B: GNU make</a></h2>
<blockquote>
- Building the OpenJDK
- is done with a <a href="#gmake">GNU <tt>make</tt></a> command line
- and various
- environment or make variable settings that direct the makefile rules
- to where various components have been installed.
- Where possible the makefiles will attempt to located the various
- components in the default locations or any component specific
- variable settings.
- When the normal defaults fail or components cannot be found,
- the various
- <tt>ALT_*</tt> variables (alternates)
- can be used to help the makefiles locate components.
- <p>
- Refer to the bash/sh/ksh setup file
- <tt>jdk/make/jdk_generic_profile.sh</tt>
- if you need help in setting up your environment variables.
- A build could be as simple as:
- <blockquote>
- <pre><tt>
- bash
- . jdk/make/jdk_generic_profile.sh
- <a href="#gmake"><tt>make</tt></a> sanity && <a href="#gmake"><tt>make</tt></a>
- </tt></pre>
- </blockquote>
- <p>
- Of course ksh or sh would work too.
- But some customization will probably be necessary.
- The <tt>sanity</tt> rule will make some basic checks on build
- dependencies and generate appropriate warning messages
- regarding missing, out of date, or newer than expected components
- found on your system.
- </blockquote>
- <!-- ------------------------------------------------------ -->
- <hr>
- <h3><a name="gmake">GNU make (<tt><i>gmake</i></tt>)</a></h3>
- <blockquote>
+
The Makefiles in the OpenJDK are only valid when used with the
- GNU version of the utility command <tt>make</tt>
- (<tt><i>gmake</i></tt>).
+ GNU version of the utility command <code>make</code>
+ (usually called <code>gmake</code> on Solaris).
A few notes about using GNU make:
<ul>
<li>
You need GNU make version 3.81 or newer.
- </li>
- <li>
- Place the location of the GNU make binary in the <tt>PATH</tt>.
+ If the GNU make utility on your systems is not
+ 3.81 or newer,
+ see <a href="#buildgmake">"Building GNU make"</a>.
</li>
<li>
- <strong>Linux:</strong>
- The <tt>/usr/bin/make</tt> should be 3.81 or newer
- and should work fine for you.
- If this version is not 3.81 or newer,
- see the <a href="#buildgmake">"Building GNU make"</a> section.
+ Place the location of the GNU make binary in the
+ <code>PATH</code>.
</li>
<li>
<strong>Solaris:</strong>
- Do NOT use <tt>/usr/bin/make</tt> on Solaris.
+ Do NOT use <code>/usr/bin/make</code> on Solaris.
If your Solaris system has the software
- from the Solaris Companion CD installed,
- you should try and use <tt>gmake</tt>
- which will be located in either the <tt>/opt/sfw/bin</tt> or
- <tt>/usr/sfw/bin</tt> directory.
- In more recent versions of Solaris GNU make might be found
- at <tt>/usr/bin/gmake</tt>.<br>
- <b>NOTE:</b> It is very likely that this <tt>gmake</tt>
- could be 3.80, you need 3.81, in which case,
- see the <a href="#buildgmake">"Building GNU make"</a> section.
+ from the Solaris Developer Companion CD installed,
+ you should try and use <code>gmake</code>
+ which will be located in either the
+ <code>/usr/bin</code>, <code>/opt/sfw/bin</code> or
+ <code>/usr/sfw/bin</code> directory.
</li>
<li>
<strong>Windows:</strong>
- Make sure you start your build inside a bash/sh/ksh shell and are
- using a <tt>make.exe</tt> utility built for that environment.<br/>
- <strong>MKS</strong> builds need a native Windows version of GNU make
- (see <a href="#buildgmake">Building GNU make</a>).<br/>
- <strong>Cygwin</strong> builds need
- a make version which was specially compiled for the Cygwin environment
- (see <a href="#buildgmake">Building GNU make</a>). <strong>WARNING:</strong>
- the OpenJDK build with the make utility provided by Cygwin will <strong>not</strong>
- work because it does not support drive letters in paths. Make sure that
- your version of make will be found before the Cygwins default make by
- setting an appropriate <tt>PATH</tt> environment variable or by removing
- Cygwin's make after you built your own make version.<br/>
- <strong>MinGW/MSYS</strong> builds can use the default make which
- comes with the environment.
+ Make sure you start your build inside a bash shell.
+ </li>
+ <li>
+ <strong>Mac OS X:</strong>
+ The XCode "command line tools" must be installed on your Mac.
</li>
</ul>
<p>
@@ -714,1539 +1775,728 @@
<a href="http://ftp.gnu.org/pub/gnu/make/" target="_blank">
ftp.gnu.org/pub/gnu/make/</a>.
</p>
- <!-- ------------------------------------------------------ -->
- <h4><a name="buildgmake">Building GNU make</a></h4>
+
+ <h3><a name="buildgmake">Building GNU make</a></h3>
<blockquote>
- First step is to get the GNU make 3.81 (or newer) source from
+ First step is to get the GNU make 3.81 or newer source from
<a href="http://ftp.gnu.org/pub/gnu/make/" target="_blank">
ftp.gnu.org/pub/gnu/make/</a>.
- Building is a little different depending on the OS and unix toolset
- on Windows:
- <ul>
- <li>
- <strong>Linux:</strong>
- <tt>./configure && make</tt>
- </li>
- <li>
- <strong>Solaris:</strong>
- <tt>./configure && gmake CC=gcc</tt>
- </li>
- <li>
- <strong>Windows for CYGWIN:</strong><br/>
- <tt>./configure</tt><br/>
- Add the line <tt>#define HAVE_CYGWIN_SHELL 1</tt> to the end of <tt>config.h</tt><br/>
- <tt>make</tt><br/>
- <br/>
- This should produce <tt>make.exe</tt> in the current directory.
- </li>
- <li>
- <strong>Windows for MKS:</strong><br/>
- Edit <tt>config.h.W32</tt> and uncomment the line <tt>#define HAVE_MKS_SHELL 1</tt><br/>
- Set the environment for your native compiler (e.g. by calling:<br/>
- <tt>"C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /Release /xp /x64)</tt>
- <tt>nmake -f NMakefile.win32</tt>
- <br/>
- This should produce <tt>WinDebug/make.exe</tt> and <tt>WinRel/make.exe</tt>
- <br/>
- If you get the error: <tt>NMAKE : fatal error U1045: spawn failed : Permission denied</tt>
- you have to set the <tt>Read & execute</tt> permission for the file <tt>subproc.bat</tt>.
- </li>
- </ul>
- </blockquote>
- </blockquote>
- <!-- ------------------------------------------------------ -->
- <hr>
- <h3><a name="linux">Basic Linux System Setup</a></h3>
- <blockquote>
- <strong>i586 only:</strong>
- The minimum recommended hardware for building the Linux version
- is a Pentium class processor or better, at least 256 MB of RAM, and
- approximately 1.5 GB of free disk space.
- <p>
- <strong>X64 only:</strong>
- The minimum recommended hardware for building the Linux
- version is an AMD Opteron class processor, at least 512 MB of RAM, and
- approximately 4 GB of free disk space.
- <p>
- The build will use the tools contained in
- <tt>/bin</tt> and
- <tt>/usr/bin</tt>
- of a standard installation of the Linux operating environment.
- You should ensure that these directories are in your
- <tt>PATH</tt>.
- <p>
- Note that some Linux systems have a habit of pre-populating
- your environment variables for you, for example <tt>JAVA_HOME</tt>
- might get pre-defined for you to refer to the JDK installed on
- your Linux system.
- You will need to unset <tt>JAVA_HOME</tt>.
- It's a good idea to run <tt>env</tt> and verify the
- environment variables you are getting from the default system
- settings make sense for building the
- OpenJDK.
- </blockquote>
- <!-- ------------------------------------------------------ -->
- <h4><a name="linux_checklist">Basic Linux Check List</a></h4>
- <blockquote>
- <ol>
- <li>
- Install the
- <a href="#bootjdk">Bootstrap JDK</a>, set
- <tt><a href="#ALT_BOOTDIR">ALT_BOOTDIR</a></tt>.
- </li>
- <li>
- <a href="#importjdk">Optional Import JDK</a>, set
- <tt><a href="#ALT_JDK_IMPORT_PATH">ALT_JDK_IMPORT_PATH</a></tt>.
- </li>
- <li>
- Install or upgrade the <a href="#freetype">FreeType development
- package</a>.
- </li>
- <li>
- Install
- <a href="#ant">Ant 1.7.1 or newer</a>,
- make sure it is in your PATH.
- </li>
- </ol>
- </blockquote>
- <!-- ------------------------------------------------------ -->
- <hr>
- <h3><a name="solaris">Basic Solaris System Setup</a></h3>
- <blockquote>
- The minimum recommended hardware for building the
- Solaris SPARC version is an UltraSPARC with 512 MB of RAM.
- For building
- the Solaris x86 version, a Pentium class processor or better and at
- least 512 MB of RAM are recommended.
- Approximately 1.4 GB of free disk
- space is needed for a 32-bit build.
- <p>
- If you are building the 64-bit version, you should
- run the command "isainfo -v" to verify that you have a
- 64-bit installation, it should say <tt>sparcv9</tt> or
- <tt>amd64</tt>.
- An additional 7 GB of free disk space is needed
- for a 64-bit build.
- <p>
- The build uses the tools contained in <tt>/usr/ccs/bin</tt>
- and <tt>/usr/bin</tt> of a standard developer or full installation of
- the Solaris operating environment.
- <p>
- Solaris patches specific to the JDK can be downloaded from the
- <a href="http://sunsolve.sun.com/show.do?target=patches/JavaSE" target="_blank">
- SunSolve JDK Solaris patches download page</a>.
- You should ensure that the latest patch cluster for
- your version of the Solaris operating environment has also
- been installed.
- </blockquote>
- <!-- ------------------------------------------------------ -->
- <h4><a name="solaris_checklist">Basic Solaris Check List</a></h4>
- <blockquote>
- <ol>
- <li>
- Install the
- <a href="#bootjdk">Bootstrap JDK</a>, set
- <tt><a href="#ALT_BOOTDIR">ALT_BOOTDIR</a></tt>.
- </li>
- <li>
- <a href="#importjdk">Optional Import JDK</a>, set
- <tt><a href="#ALT_JDK_IMPORT_PATH">ALT_JDK_IMPORT_PATH</a></tt>.
- </li>
- <li>
- Install the
- <a href="#studio">Sun Studio Compilers</a>, set
- <a href="#ALT_COMPILER_PATH"><tt>ALT_COMPILER_PATH</tt></a>.
- </li>
- <li>
- Install the
- <a href="#cups">CUPS Include files</a>, set
- <tt><a href="#ALT_CUPS_HEADERS_PATH">ALT_CUPS_HEADERS_PATH</a></tt>.
- </li>
- <li>
- Install the <a href="#xrender">XRender Include files</a>.
- </li>
- <li>
- Install
- <a href="#ant">Ant 1.7.1 or newer</a>,
- make sure it is in your PATH.
- </li>
- </ol>
- </blockquote>
- <!-- ------------------------------------------------------ -->
- <hr>
- <h3><a name="windows">Basic Windows System Setup</a></h3>
- <blockquote>
- <strong>i586 only:</strong>
- The minimum recommended hardware for building the 32-bit or X86
- Windows version is an Pentium class processor or better, at least
- 512 MB of RAM, and approximately 600 MB of free disk space.
- <strong>
- NOTE: The Windows build machines need to use the
- file system NTFS.
- Build machines formatted to FAT32 will not work
- because FAT32 doesn't support case-sensitivity in file names.
- </strong>
- <p>
- <strong>X64 only:</strong>
- The minimum recommended hardware for building
- the Windows X64 version is an AMD Opteron class processor, at least 1
- GB of RAM, and approximately 10 GB of free disk space.
- </blockquote>
- <!-- ------------------------------------------------------ -->
- <h4><a name="paths">Windows Paths</a></h4>
- <blockquote>
- <strong>Windows:</strong>
- Note that GNU make, the shell and other Unix-tools required during the build
- do not tolerate the Windows habit
- of having spaces in pathnames or the use of the <tt>\</tt>characters in pathnames.
- Luckily on most Windows systems, you can use <tt>/</tt>instead of <tt>\</tt>, and
- there is always a short <a href="http://en.wikipedia.org/wiki/8.3_filename">
- "8.3" pathname</a> without spaces for any path that contains spaces.
- Unfortunately, this short pathname is somewhat dynamic (i.e. dependant on the
- other files and directories inside a given directory) and can not be
- algorithmicly calculated by only looking at a specific path name.
- <p>
- The makefiles will try to translate any pathnames supplied
- to it into the <tt>C:/</tt> style automatically.
- </p>
- <p>
- Special care has to be taken if native Windows applications
- like <tt>nmake</tt> or <tt>cl</tt> are called with file arguments processed
- by Unix-tools like <tt>make</tt> or <tt>sh</tt>!
- </p>
- </blockquote>
- <!-- ------------------------------------------------------ -->
- <h4><a name="paths">Windows build environments</a></h4>
- <blockquote>
- Building on Windows requires a Unix-like environment, notably a Unix-like shell.
- There are several such environments available of which
- <a href="http://www.mkssoftware.com/products/tk/ds_tkdev.asp">MKS</a>,
- <a href="http://www.cygwin.com/">Cygwin</a> and
- <a href="http://www.mingw.org/wiki/MSYS">MinGW/MSYS</a> are currently supported for
- the OpenJDK build. One of the differences of these three systems is the way
- they handle Windows path names, particularly path names which contain
- spaces, backslashes as path separators and possibly drive letters. Depending
- on the use case and the specifics of each environment these path problems can
- be solved by a combination of quoting whole paths, translating backslashes to
- forward slashes, escaping backslashes with additional backslashes and
- translating the path names to their <a href="http://en.wikipedia.org/wiki/8.3_filename">
- "8.3" version</a>.
- <p>
- As of this writing (MKS ver. 9.4, Cygwin ver. 1.7.9, MinGW/MSYS 1.0.17),
- MKS builds are known to be the fastest Windows builds while MingGW/MSYS
- builds are slightly slower (about 10%) than MKS builds and Cygwin builds
- require nearly twice the time (about 180%) of MKS builds (e.g. on a
- DualCore i7 notebook with 8GB of RAM, HDD and 64-bit Windows 7 operating system
- the complete OpenJDK 8 product build takes about 49min with MKS, 54min with
- MinGW/MSYS and 88min with Cygwin).
- </p>
- <p>
- Mixing tools from the different Unix emulation environments is not a good
- idea and will probably not work!
- </p>
- <p>
- <strong>MKS:</strong> is a commercial product which includes
- all the Unix utilities which are required to build the OpenJDK except GNU
- make. In pre-OpenJDK times it was the only supported build environment on
- Windows. The MKS tools support Windows paths with drive letters and
- forward slashes as path separator. Paths in environment variables like (for
- example) <tt>PATH</tt> are separated by semicolon '<tt>;</tt>'.
- </p>
- <p>
- Recent versions of MKS provide the <tt>dosname</tt> utility to convert paths
- with spaces to short (8.3) path names,e .g.
- <tt>dosname -s "<i>path</i>"</tt>.
- </p>
- <p>
- If you are using the MKS environment, you need a native Windows version
- of Gnu make <a href="#buildgmake">which you can easily build yourself</a>.
- </p>
- <p>
- <strong>Cygwin:</strong>
- is an open source, Linux-like environment which tries to emulate
- a complete POSIX layer on Windows. It tries to be smart about path names
- and can usually handle all kinds of paths if they are correctly quoted
- or escaped although internally it maps drive letters <tt><drive>:</tt>
- to a virtual directory <tt>/cygdrive/<drive></tt>.
- </p>
- <p>
- You can always use the <tt>cygpath</tt> utility to map pathnames with spaces
- or the backslash character into the <tt>C:/</tt> style of pathname
- (called 'mixed'), e.g. <tt>cygpath -s -m "<i>path</i>"</tt>.
- </p>
- <p>
- Note that the use of CYGWIN creates a unique problem with regards to
- setting <a href="#path"><tt>PATH</tt></a>. Normally on Windows
- the <tt>PATH</tt> variable contains directories
- separated with the ";" character (Solaris and Linux use ":").
- With CYGWIN, it uses ":", but that means that paths like "C:/path"
- cannot be placed in the CYGWIN version of <tt>PATH</tt> and
- instead CYGWIN uses something like <tt>/cygdrive/c/path</tt>
- which CYGWIN understands, but only CYGWIN understands.
- </p>
- <p>
- If you are using the Cygwin environment, you need to
- <a href="#buildgmake">compile your own version</a>
- of GNU make because the default Cygwin make can not handle drive letters in paths.
- </p>
- <p>
- <strong>MinGW/MSYS:</strong>
- MinGW ("Minimalist GNU for Windows") is a collection of free Windows
- specific header files and import libraries combined with GNU toolsets that
- allow one to produce native Windows programs that do not rely on any
- 3rd-party C runtime DLLs. MSYS is a supplement to MinGW which allows building
- applications and programs which rely on traditional UNIX tools to
- be present. Among others this includes tools like <tt>bash</tt> and <tt>make</tt>.
- </p>
- <p>
- Like Cygwin, MinGW/MSYS can handle different types of path formats. They
- are internally converted to paths with forward slashes and drive letters
- <tt><drive>:</tt> replaced by a virtual
- directory <tt>/<drive></tt>. Additionally, MSYS automatically
- detects binaries compiled for the MSYS environment and feeds them with the
- internal, Unix-style path names. If native Windows applications are called
- from within MSYS programs their path arguments are automatically converted
- back to Windows style path names with drive letters and backslashes as
- path separators. This may cause problems for Windows applications which
- use forward slashes as parameter separator (e.g. <tt>cl /nologo /I</tt>)
- because MSYS may wrongly <a href="http://mingw.org/wiki/Posix_path_conversion">
- replace such parameters by drive letters</a>.
- </p>
- <p>
- If you are using the MinGW/MSYS system you can use the default make
- version supplied by the environment.
- </p>
- </blockquote>
- <!-- ------------------------------------------------------ -->
- <h4><a name="windows_checklist">Basic Windows Check List</a></h4>
- <blockquote>
- <ol>
- <li>
- Install one of the
- <a href="#cygwin">CYGWIN</a>, <a href="#msys">MinGW/MSYS</a> or
- <a href="http://www.mkssoftware.com/products/tk/ds_tkdev.asp">MKS</a> environments.
- </li>
- <li>
- Install the
- <a href="#bootjdk">Bootstrap JDK</a>, set
- <tt><a href="#ALT_BOOTDIR">ALT_BOOTDIR</a></tt>.
- </li>
- <li>
- <a href="#importjdk">Optional Import JDK</a>, set
- <tt><a href="#ALT_JDK_IMPORT_PATH">ALT_JDK_IMPORT_PATH</a></tt>.
- </li>
- <li>
- Install the
- <a href="#msvc32">Microsoft Visual Studio Compilers</a>).
- </li>
- <li>
- Setup all environment variables for compilers
- (see <a href="#msvc32">compilers</a>).
- </li>
- <li>
- Install
- <a href="#dxsdk">Microsoft DirectX SDK</a>.
- </li>
- <li>
- Install
- <a href="#ant">Ant 1.7.1 or newer</a>,
- make sure it is in your PATH and set
- <tt><a href="#ANT_HOME">ANT_HOME</a></tt>.
- </li>
- </ol>
- </blockquote>
- <!-- ------------------------------------------------------ -->
- <hr>
- <h3><a name="macosx">Basic Mac OS X System Setup</a></h3>
- <blockquote>
- <strong>X64 only:</strong>
- The minimum recommended hardware for building
- the Mac OS X version is any 64-bit capable Intel processor, at least 2
- GB of RAM, and approximately 3 GB of free disk space. You should also
- have OS X Lion 10.7.3 installed.
- </blockquote>
- <!-- ------------------------------------------------------ -->
-
- <h4><a name="macosx_checklist">Basic Mac OS X Check List</a></h4>
- <blockquote>
- <ol>
- <li>
- Install <a href="https://developer.apple.com/xcode/">XCode 4.1</a> or newer.
- If you install XCode 4.3 or newer, make sure you also install
- "Command line tools" found under the preferences pane "Downloads".
- </li>
- <li>
- Install <a href="http://support.apple.com/kb/dl1421" target="_blank">"Java for OS X Lion Update 1"</a>,
- set <tt><a href="#ALT_BOOTDIR">ALT_BOOTDIR</a> to <code>`/usr/libexec/java_home -v 1.6`</code></tt>
- </li>
- <li>
- <a href="#importjdk">Optional Import JDK</a>, set
- <tt><a href="#ALT_JDK_IMPORT_PATH">ALT_JDK_IMPORT_PATH</a></tt>.
- </li>
- </ol>
- </blockquote>
- <!-- ------------------------------------------------------ -->
- <hr>
- <h3><a name="dependencies">Build Dependencies</a></h3>
- <blockquote>
- Depending on the platform, the OpenJDK build process has some basic
- dependencies on components not part of the OpenJDK sources.
- Some of these are specific to a platform, some even specific to
- an architecture.
- Each dependency will have a set of ALT variables that can be set
- to tell the makefiles where to locate the component.
- In most cases setting these ALT variables may not be necessary
- and the makefiles will find defaults on the system in standard
- install locations or through component specific variables.
- <!-- ------------------------------------------------------ -->
- <h4><a name="bootjdk">Bootstrap JDK</a></h4>
- <blockquote>
- All OpenJDK builds require access to the previously released
- JDK 6, this is often called a bootstrap JDK.
- The JDK 6 binaries can be downloaded from Sun's
- <a href="http://java.sun.com/javase/downloads/index.jsp"
- target="_blank">JDK 6 download site</a>.
- For build performance reasons
- is very important that this bootstrap JDK be made available on the
- local disk of the machine doing the build.
- You should always set
- <tt><a href="#ALT_BOOTDIR">ALT_BOOTDIR</a></tt>
- to point to the location of
- the bootstrap JDK installation, this is the directory pathname
- that contains a <tt>bin, lib, and include</tt>
- It's also a good idea to also place its <tt>bin</tt> directory
- in the <tt>PATH</tt> environment variable, although it's
- not required.
- <p>
- <strong>Solaris:</strong>
- Some pre-installed JDK images may be available to you in the
- directory <tt>/usr/jdk/instances</tt>.
- If you don't set
- <tt><a href="#ALT_BOOTDIR">ALT_BOOTDIR</a></tt>
- the makefiles will look in that location for a JDK it can use.
- </blockquote>
- <!-- ------------------------------------------------------ -->
- <h4><a name="importjdk">Optional Import JDK</a></h4>
- <blockquote>
- The <tt><a href="#ALT_JDK_IMPORT_PATH">ALT_JDK_IMPORT_PATH</a></tt>
- setting is only needed if you are not building the entire
- JDK. For example, if you have built the entire JDK once, and
- wanted to avoid repeatedly building the Hotspot VM, you could
- set this to the location of the previous JDK install image
- and the build will copy the needed files from this import area.
- </blockquote>
- <!-- ------------------------------------------------------ -->
- <h4><a name="ant">Ant</a></h4>
- <blockquote>
- All OpenJDK builds require access to least Ant 1.7.1.
- The Ant tool is available from the
- <a href="http://archive.apache.org/dist/ant/binaries/apache-ant-1.7.1-bin.zip" target="_blank">
- Ant 1.7.1 archive download site</a>.
- You should always make sure <tt>ant</tt> is in your PATH, and
- on Windows you may also need to set
- <tt><a href="#ANT_HOME">ANT_HOME</a></tt>
- to point to the location of
- the Ant installation, this is the directory pathname
- that contains a <tt>bin and lib</tt>.
- <br>
- <b>WARNING:</b> Ant versions used from IDE tools like NetBeans
- or installed via system packages may not operate the same
- as the one obtained from the Ant download bundles.
- These system and IDE installers sometimes choose to change
- the ant installation enough to cause differences.
- </blockquote>
- <!-- ------------------------------------------------------ -->
- <h4><a name="cacerts">Certificate Authority File (cacert)</a></h4>
- <blockquote>
- See <a href="http://en.wikipedia.org/wiki/Certificate_Authority" target="_blank">
- http://en.wikipedia.org/wiki/Certificate_Authority</a>
- for a better understanding of the Certificate Authority (CA).
- A certificates file named "cacerts"
- represents a system-wide keystore with CA certificates.
- In JDK and JRE
- binary bundles, the "cacerts" file contains root CA certificates from
- several public CAs (e.g., VeriSign, Thawte, and Baltimore).
- The source contain a cacerts file
- without CA root certificates.
- Formal JDK builders will need to secure
- permission from each public CA and include the certificates into their
- own custom cacerts file.
- Failure to provide a populated cacerts file
- will result in verification errors of a certificate chain during runtime.
- The variable
- <tt><a href="#ALT_CACERTS_FILE">ALT_CACERTS_FILE</a></tt>
- can be used to override the default location of the
- cacerts file that will get placed in your build.
- By default an empty cacerts file is provided and that should be
- fine for most JDK developers.
- </blockquote>
- <!-- ------------------------------------------------------ -->
- <h4><a name="compilers">Compilers</a></h4>
- <blockquote>
- <strong><a name="gcc">Linux gcc/binutils</a></strong>
+ Building is a little different depending on the OS but is
+ basically done with:
<blockquote>
- The GNU gcc compiler version should be 4.3 or newer.
- The compiler used should be the default compiler installed
- in <tt>/usr/bin</tt>.
- </blockquote>
- <strong><a name="studio">Solaris: Sun Studio</a></strong>
- <blockquote>
- At a minimum, the
- <a href="http://www.oracle.com/technetwork/server-storage/solarisstudio/downloads/index.htm" target="_blank">
- Sun Studio 12 Update 1 Compilers</a>
- (containing version 5.10 of the C and C++ compilers) is required,
- including specific patches.
- <p>
- The Solaris SPARC patch list is:
- <ul>
- <li>
- 118683-05: SunOS 5.10: Patch for profiling libraries and assembler
- </li>
- <li>
- 119963-21: SunOS 5.10: Shared library patch for C++
- </li>
- <li>
- 120753-08: SunOS 5.10: Microtasking libraries (libmtsk) patch
- </li>
- <li>
- 128228-09: Sun Studio 12 Update 1: Patch for Sun C++ Compiler
- </li>
- <li>
- 141860-03: Sun Studio 12 Update 1: Patch for Compiler Common patch for Sun C C++ F77 F95
- </li>
- <li>
- 141861-05: Sun Studio 12 Update 1: Patch for Sun C Compiler
- </li>
- <li>
- 142371-01: Sun Studio 12.1 Update 1: Patch for dbx
- </li>
- <li>
- 143384-02: Sun Studio 12 Update 1: Patch for debuginfo handling
- </li>
- <li>
- 143385-02: Sun Studio 12 Update 1: Patch for Compiler Common patch for Sun C C++ F77 F95
- </li>
- <li>
- 142369-01: Sun Studio 12.1: Patch for Performance Analyzer Tools
- </li>
- </ul>
- <p>
- The Solaris X86 patch list is:
- <ul>
- <li>
- 119961-07: SunOS 5.10_x86, x64, Patch for profiling libraries and assembler
- </li>
- <li>
- 119964-21: SunOS 5.10_x86: Shared library patch for C++_x86
- </li>
- <li>
- 120754-08: SunOS 5.10_x86: Microtasking libraries (libmtsk) patch
- </li>
- <li>
- 141858-06: Sun Studio 12 Update 1_x86: Sun Compiler Common patch for x86 backend
- </li>
- <li>
- 128229-09: Sun Studio 12 Update 1_x86: Patch for C++ Compiler
- </li>
- <li>
- 142363-05: Sun Studio 12 Update 1_x86: Patch for C Compiler
- </li>
- <li>
- 142368-01: Sun Studio 12.1_x86: Patch for Performance Analyzer Tools
- </li>
- </ul>
- <p>
- Set
- <a href="#ALT_COMPILER_PATH"><tt>ALT_COMPILER_PATH</tt></a>
- to point to the location of
- the compiler binaries, and place this location in the <tt>PATH</tt>.
- <p>
- The Oracle Solaris Studio Express compilers at:
- <a href="http://developers.sun.com/sunstudio/downloads/express.jsp" target="_blank">
- Oracle Solaris Studio Express Download site</a>
- are also an option, although these compilers have not
- been extensively used yet.
- </blockquote>
- <strong><a name="msvc32">Windows i586: Microsoft Visual Studio 2010 Compilers</a></strong>
- <blockquote>
- <p>
- <b>BEGIN WARNING</b>: JDK 7 has transitioned to
- use the newest VS2010 Microsoft compilers.
- No other compilers are known to build the entire JDK,
- including non-open portions.
- Visual Studio 2010 Express compilers are now able to build all the
- open source repositories, but this is 32 bit only. To build 64 bit
- Windows binaries use the the 7.1 Windows SDK.
- <b>END WARNING.</b>
- <p>
- The 32-bit OpenJDK Windows build requires
- Microsoft Visual Studio C++ 2010 (VS2010) Professional
- Edition or Express compiler.
- The compiler and other tools are expected to reside
- in the location defined by the variable
- <tt>VS100COMNTOOLS</tt> which
- is set by the Microsoft Visual Studio installer.
- <p>
- Once the compiler is installed,
- it is recommended that you run <tt>VCVARS32.BAT</tt>
- to set the compiler environment variables
- <tt>INCLUDE</tt>,
- <tt>LIB</tt>, and
- <tt>PATH</tt>
- prior to building the
- OpenJDK.
- The above environment variables <b>MUST</b> be set.
- This compiler also contains the Windows SDK v 7.0a,
- which is an update to the Windows 7 SDK.
- <p>
- <b>WARNING:</b> Make sure you check out the
- <a href="#cygwin">CYGWIN link.exe WARNING</a>.
- The path <tt>/usr/bin</tt> must be after the path to the
- Visual Studio product.
- </blockquote>
- <strong><a name="msvc64">Windows x64: Microsoft Visual Studio 2010 Professional Compiler</a></strong>
- <blockquote>
- For <b>X64</b>, the set up is much the same as 32 bit
- except that you run <tt>amd64\VCVARS64.BAT</tt>
- to set the compiler environment variables.
- Previously 64 bit builds had to use the 64 bit compiler in
- an unbundled Windows SDK but this is no longer necessary if
- you have VS2010 Professional.
- </blockquote>
- <strong><a name="mssdk64">Windows x64: Microsoft Windows 7.1 SDK 64 bit compilers.</a></strong>
- For a free alternative for 64 bit builds, use the 7.1 SDK.
- Microsoft say that to set up your paths for this run
- <pre>
- c:\Program Files\Microsoft SDKs\Windows\v7.1\bin\setenv.cmd /x64.
- </pre>
- What was tested is just directly setting up LIB, INCLUDE,
- PATH and based on the installation directories using the
- DOS short name appropriate for the system, (you will
- need to set them for yours, not just blindly copy this) eg :
- <pre>
- set VSINSTALLDIR=c:\PROGRA~2\MICROS~1.0
- set WindowsSdkDir=c:\PROGRA~1\MICROS~1\Windows\v7.1
- set PATH=%VSINSTALLDIR%\vc\bin\amd64;%VSINSTALLDIR%\Common7\IDE;%WindowsSdkDir%\bin;%PATH%
- set INCLUDE=%VSINSTALLDIR%\vc\include;%WindowsSdkDir%\include
- set LIB=%VSINSTALLDIR%\vc\lib\amd64;%WindowsSdkDir%\lib\x64
- </pre>
- <strong><a name="llvmgcc">OS X Lion 10.7.3: LLVM GCC</a></strong>
- <blockquote>
- LLVM GCC is bundled with XCode. The version should be at least 4.2.1.
+ <code>bash ./configure</code>
+ <br>
+ <code>make</code>
</blockquote>
</blockquote>
- <!-- ------------------------------------------------------ -->
- <h4><a name="zip">Zip and Unzip</a></h4>
- <blockquote>
- Version 2.2 (November 3rd 1997) or newer of the zip utility
- and version 5.12 or newer of the unzip utility is needed
- to build the JDK.
- With Solaris, Linux, and Windows CYGWIN, the zip and unzip
- utilities installed on the system should be fine.
- Information and the source code for
- ZIP.EXE and UNZIP.EXE is available on the
- <a href="http://www.info-zip.org"
- target="_blank">info-zip web site</a>.
- </blockquote>
- <!-- ------------------------------------------------------ -->
- <h4><a name="cups">Common UNIX Printing System (CUPS) Headers (Solaris & Linux)</a></h4>
- <blockquote>
- <strong>Solaris:</strong>
- CUPS header files are required for building the
- OpenJDK on Solaris.
- The Solaris header files can be obtained by installing
- the package <strong>SFWcups</strong> from the Solaris Software
- Companion CD/DVD, these often will be installed into
- <tt>/opt/sfw/cups</tt>.
- <p>
- <strong>Linux:</strong>
- CUPS header files are required for building the
- OpenJDK on Linux.
- The Linux header files are usually available from a "cups"
- development package, it's recommended that you try and use
- the package provided by the particular version of Linux that
- you are using.
- <p>
- The CUPS header files can always be downloaded from
- <a href="http://www.cups.org" target="_blank">www.cups.org</a>.
- The variable
- <tt><a href="#ALT_CUPS_HEADERS_PATH">ALT_CUPS_HEADERS_PATH</a></tt>
- can be used to override the default location of the
- CUPS Header files.
- </blockquote>
- <!-- ------------------------------------------------------ -->
- <h4><a name="xrender">XRender Extension Headers (Solaris & Linux)</a></h4>
- <blockquote>
- <p>
- <strong>Solaris:</strong>
- XRender header files are required for building the
- OpenJDK on Solaris.
- The XRender header file is included with the other X11 header files
- in the package <strong>SFWxwinc</strong> on new enough versions of
- Solaris and will be installed in
- <tt>/usr/X11/include/X11/extensions/Xrender.h</tt> or
- <tt>/usr/openwin/share/include/X11/extensions/Xrender.h</tt>
- </p><p>
- <strong>Linux:</strong>
- XRender header files are required for building the
- OpenJDK on Linux.
- The Linux header files are usually available from a "Xrender"
- development package, it's recommended that you try and use
- the package provided by the particular distribution of Linux that
- you are using.
- </p>
- </blockquote>
- <!-- ------------------------------------------------------ -->
- <h4><a name="freetype">FreeType 2</a></h4>
- <blockquote>
- Version 2.3 or newer of FreeType is required for building the OpenJDK.
- On Unix systems required files can be available as part of your
- distribution (while you still may need to upgrade them).
- Note that you need development version of package that
- includes both FreeType library and header files.
- <p>
- You can always download latest FreeType version from the
- <a href="http://www.freetype.org" target="_blank">FreeType website</a>.
- <p>
- Makefiles will try to pick FreeType from /usr/lib and /usr/include.
- In case it is installed elsewhere you will need to set environment
- variables
- <tt><a href="#ALT_FREETYPE_LIB_PATH">ALT_FREETYPE_LIB_PATH</a></tt>
- and
- <tt><a href="#ALT_FREETYPE_HEADERS_PATH">ALT_FREETYPE_HEADERS_PATH</a></tt>
- to refer to place where library and header files are installed.
- <p>
- Building the freetype 2 libraries from scratch is also possible,
- however on Windows refer to the
- <a href="http://freetype.freedesktop.org/wiki/FreeType_DLL">
- Windows FreeType DLL build instructions</a>.
- <p>
- Note that by default FreeType is built with byte code hinting
- support disabled due to licensing restrictions.
- In this case, text appearance and metrics are expected to
- differ from Sun's official JDK build.
- See
- <a href="http://freetype.sourceforge.net/freetype2/index.html">
- the SourceForge FreeType2 Home Page
- </a>
- for more information.
- </blockquote>
- <!-- ------------------------------------------------------ -->
- <h4><a name="alsa">Advanced Linux Sound Architecture (ALSA) (Linux only)</a></h4>
- <blockquote>
- <strong>Linux only:</strong>
- Version 0.9.1 or newer of the ALSA files are
- required for building the OpenJDK on Linux.
- These Linux files are usually available from an "alsa"
- of "libasound"
- development package, it's highly recommended that you try and use
- the package provided by the particular version of Linux that
- you are using.
- The makefiles will check this emit a sanity error if it is
- missing or the wrong version.
- <p>
- In particular, older Linux systems will likely not have the
- right version of ALSA installed, for example
- Redhat AS 2.1 U2 and SuSE 8.1 do not include a sufficiently
- recent ALSA distribution.
- On rpm-based systems, you can see if ALSA is installed by
- running this command:
- <pre>
- <tt>rpm -qa | grep alsa</tt>
- </pre>
- Both <tt>alsa</tt> and <tt>alsa-devel</tt> packages are needed.
- <p>
- If your distribution does not come with ALSA, and you can't
- find ALSA packages built for your particular system,
- you can try to install the pre-built ALSA rpm packages from
- <a href="http://www.freshrpms.net/" target="_blank">
- <tt>www.freshrpms.net</tt></a>.
- Note that installing a newer ALSA could
- break sound output if an older version of ALSA was previously
- installed on the system, but it will enable JDK compilation.
- <blockquote>
- Installation: execute as root<br>
- [i586]: <code>rpm -Uv --force alsa-lib-devel-0.9.1-rh61.i386.rpm</code><br>
- [x64]: <code>rpm -Uv --force alsa-lib-devel-0.9.8-amd64.x86_64.rpm</code><br>
- Uninstallation:<br>
- [i586]: <code>rpm -ev alsa-lib-devel-0.9.1-rh61</code><br>
- [x64]:<code>rpm -ev alsa-lib-devel-0.9.8-amd64</code><br>
- Make sure that you do not link to the static library
- (<tt>libasound.a</tt>),
- by verifying that the dynamic library (<tt>libasound.so</tt>) is
- correctly installed in <tt>/usr/lib</tt>.
- </blockquote>
- As a last resort you can go to the
- <a href="http://www.alsa-project.org" target="_blank">
- Advanced Linux Sound Architecture Site</a> and build it from
- source.
- <blockquote>
- Download driver and library
- source tarballs from
- <a href="http://www.alsa-project.org" target="_blank">ALSA's homepage</a>.
- As root, execute the following
- commands (you may need to adapt the version number):
- <pre>
- <tt>
- $ tar xjf alsa-driver-0.9.1.tar.bz2
- $ cd alsa-driver-0.9.1
- $ ./configure
- $ make install
- $ cd ..
- $ tar xjf alsa-lib-0.9.1.tar.bz2
- $ cd alsa-lib-0.9.1
- $ ./configure
- $ make install
- </tt>
- </pre>
- Should one of the above steps fail, refer to the documentation on
- ALSA's home page.
- </blockquote>
- Note that this is a minimum install that enables
- building the JDK platform. To actually use ALSA sound drivers, more
- steps are necessary as outlined in the documentation on ALSA's homepage.
- <p>
- ALSA can be uninstalled by executing <tt>make uninstall</tt> first in
- the <tt>alsa-lib-0.9.1</tt> directory and then in
- <tt>alsa-driver-0.9.1</tt>.
- </blockquote>
- There are no ALT* variables to change the assumed locations of ALSA,
- the makefiles will expect to find the ALSA include files and library at:
- <tt>/usr/include/alsa</tt> and <tt>/usr/lib/libasound.so</tt>.
- </blockquote>
- <!-- ------------------------------------------------------ -->
- <h4>Windows Specific Dependencies</h4>
- <blockquote>
- <strong>Unix Command Tools (<a name="cygwin">CYGWIN</a>)</strong>
- <blockquote>
- The OpenJDK requires access to a set of unix command tools
- on Windows which can be supplied by
- <a href="http://www.cygwin.com" target="_blank">CYGWIN</a>.
- <p>
- The OpenJDK build requires CYGWIN version 1.5.12 or newer.
- Information about CYGWIN can
- be obtained from the CYGWIN website at
- <a href="http://www.cygwin.com" target="_blank">www.cygwin.com</a>.
- <p>
- By default CYGWIN doesn't install all the tools required for building
- the OpenJDK.
- Along with the default installation, you need to install
- the following tools.
- <blockquote>
- <table border="1">
- <thead>
- <tr>
- <td>Binary Name</td>
- <td>Category</td>
- <td>Package</td>
- <td>Description</td>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>ar.exe</td>
- <td>Devel</td>
- <td>binutils</td>
- <td>The GNU assembler, linker and binary
- utilities</td>
- </tr>
- <tr>
- <td>make.exe</td>
- <td>Devel</td>
- <td>make</td>
- <td>The GNU version of the 'make' utility built for CYGWIN.<br>
- <b>NOTE</b>: the Cygwin make can not be used to build the
- OpenJDK. You only need it to build your own version of make
- (see <a href="#gmake">the GNU make section</a>)</td>
- </tr>
- <tr>
- <td>m4.exe</td>
- <td>Interpreters</td>
- <td>m4</td>
- <td>GNU implementation of the traditional Unix macro
- processor</td>
- </tr>
- <tr>
- <td>cpio.exe</td>
- <td>Utils</td>
- <td>cpio</td>
- <td>A program to manage archives of files</td>
- </tr>
- <tr>
- <td>gawk.exe</td>
- <td>Utils</td>
- <td>awk</td>
- <td>Pattern-directed scanning and processing language</td>
- </tr>
- <tr>
- <td>file.exe</td>
- <td>Utils</td>
- <td>file</td>
- <td>Determines file type using 'magic' numbers</td>
- </tr>
- <tr>
- <td>zip.exe</td>
- <td>Archive</td>
- <td>zip</td>
- <td>Package and compress (archive) files</td>
- </tr>
- <tr>
- <td>unzip.exe</td>
- <td>Archive</td>
- <td>unzip</td>
- <td>Extract compressed files in a ZIP archive</td>
- </tr>
- <tr>
- <td>free.exe</td>
- <td>System</td>
- <td>procps</td>
- <td>Display amount of free and used memory in the system</td>
- </tr>
- </tbody>
- </table>
- </blockquote>
- <p>
- Note that the CYGWIN software can conflict with other non-CYGWIN
- software on your Windows system.
- CYGWIN provides a
- <a href="http://cygwin.com/faq/faq.using.html" target="_blank">FAQ</a> for
- known issues and problems, of particular interest is the
- section on
- <a href="http://cygwin.com/faq/faq.using.html#faq.using.bloda" target="_blank">
- BLODA (applications that interfere with CYGWIN)</a>.
- <p>
- <b>WARNING:</b>
- Be very careful with <b><tt>link.exe</tt></b>, it will conflict
- with the Visual Studio version. You need the Visual Studio
- version of <tt>link.exe</tt>, not the CYGWIN one.
- So it's important that the Visual Studio paths in PATH preceed
- the CYGWIN path <tt>/usr/bin</tt>.
- </blockquote>
- <strong> Minimalist GNU for Windows (<a name="msys">MinGW/MSYS</a>)</strong>
- <blockquote>
- Alternatively, the set of unix command tools for the OpenJDK build on
- Windows can be supplied by
- <a href="http://www.mingw.org/wiki/MSYS" target="_blank">MinGW/MSYS</a>.
- <p>
- In addition to the tools which will be installed by default, you have
- to manually install the <tt>msys-zip</tt> and <tt>msys-unzip</tt> packages.
- This can be easily done with the MinGW command line installer:<br/>
- <tt><br/>
- mingw-get.exe install msys-zip<br/>
- mingw-get.exe install msys-unzip<br/>
- </tt>
- </p>
- </blockquote>
- <strong><a name="dxsdk">Microsoft DirectX 9.0 SDK header files and libraries</a></strong>
- <blockquote>
- Microsoft DirectX 9.0 SDK (Summer 2004)
- headers are required for building
- OpenJDK.
- This SDK can be downloaded from
- <a href="http://www.microsoft.com/downloads/details.aspx?FamilyId=FD044A42-9912-42A3-9A9E-D857199F888E&displaylang=en" target="_blank">
- Microsoft DirectX 9.0 SDK (Summer 2004)</a>.
- If the link above becomes obsolete, the SDK can be found from
- <a href="http://download.microsoft.com" target="_blank">the Microsoft Download Site</a>
- (search with "DirectX 9.0 SDK Update Summer 2004").
- The location of this SDK can be set with
- <tt><a href="#ALT_DXSDK_PATH">ALT_DXSDK_PATH</a></tt>
- but it's normally found via the DirectX environment variable
- <tt>DXSDK_DIR</tt>.
- </blockquote>
- <strong><a name="msvcrNN"><tt>MSVCR100.DLL</tt></a></strong>
- <blockquote>
- The OpenJDK build requires access to a redistributable
- <tt>MSVCR100.DLL</tt>.
- This is usually picked up automatically from the redist
- directories of Visual Studio 2010.
- If this cannot be found set the
- <a href="#ALT_MSVCRNN_DLL_PATH"><tt>ALT_MSVCRNN_DLL_PATH</tt></a>
- variable to the location of this file.
- <p>
- </blockquote>
- </blockquote>
- <!-- ------------------------------------------------------ -->
+
+ </blockquote> <!-- Appendix B -->
+
+ <!-- ====================================================== -->
<hr>
- <h2><a name="creating">Creating the Build</a></h2>
- <blockquote>
- Once a machine is setup to build the OpenJDK,
- the steps to create the build are fairly simple.
- The various ALT settings can either be made into variables
- or can be supplied on the
- <a href="#gmake"><tt><i>gmake</i></tt></a>
- command.
- <ol>
- <li>Use the sanity rule to double check all the ALT settings:
- <blockquote>
- <tt>
- <i>gmake</i>
- sanity
- [ARCH_DATA_MODEL=<i>32 or 64</i>]
- [other "ALT_" overrides]
- </tt>
- </blockquote>
- </li>
- <li>Start the build with the command:
- <blockquote>
- <tt>
- <i>gmake</i>
- [ARCH_DATA_MODEL=<i>32 or 64</i>]
- [ALT_OUTPUTDIR=<i>output_directory</i>]
- [other "ALT_" overrides]
- </tt>
- </blockquote>
- </li>
- </ol>
- <p>
- <strong>Solaris:</strong>
- Note that ARCH_DATA_MODEL is really only needed on Solaris to
- indicate you want to built the 64-bit version.
- And before the Solaris 64-bit binaries can be used, they
- must be merged with the binaries from a separate 32-bit build.
- The merged binaries may then be used in either 32-bit or 64-bit mode, with
- the selection occurring at runtime
- with the <tt>-d32</tt> or <tt>-d64</tt> options.
- </blockquote>
- <!-- ------------------------------------------------------ -->
- <hr>
- <h2><a name="testing">Testing the Build</a></h2>
- <blockquote>
- When the build is completed, you should see the generated
- binaries and associated files in the <tt>j2sdk-image</tt>
- directory in the output directory.
- The default output directory is
- <tt>build/<i>platform</i></tt>,
- where <tt><i>platform</i></tt> is one of
- <blockquote>
- <ul>
- <li><tt>solaris-sparc</tt></li>
- <li><tt>solaris-sparcv9</tt></li>
- <li><tt>solaris-i586</tt></li>
- <li><tt>solaris-amd64</tt></li>
- <li><tt>linux-i586</tt></li>
- <li><tt>linux-amd64</tt></li>
- <li><tt>windows-i586</tt></li>
- <li><tt>windows-amd64</tt></li>
- </ul>
- </blockquote>
- In particular, the
- <tt>build/<i>platform</i>/j2sdk-image/bin</tt>
- directory should contain executables for the
- OpenJDK tools and utilities.
- <p>
- You can test that the build completed properly by using the build
- to run the various demos that you will find in the
- <tt>build/<i>platform</i>/j2sdk-image/demo</tt>
- directory.
- <p>
- The provided regression tests can be run with the <tt>jtreg</tt>
- utility from
- <a href="http://openjdk.java.net/jtreg/" target="_blank">the jtreg site</a>.
- </blockquote>
- <!-- ------------------------------------------------------ -->
- <hr>
- <h2><a name="variables">Environment/Make Variables</a></h2>
- <p>
- Some of the
- environment or make variables (just called <b>variables</b> in this
- document) that can impact the build are:
+ <h2><a name="buildenvironments">Appendix C: Build Environments</a></h2>
<blockquote>
- <dl>
- <dt><a name="path"><tt>PATH</tt></a> </dt>
- <dd>Typically you want to set the <tt>PATH</tt> to include:
- <ul>
- <li>The location of the GNU make binary</li>
- <li>The location of the Bootstrap JDK <tt>java</tt>
- (see <a href="#bootjdk">Bootstrap JDK</a>)</li>
- <li>The location of the C/C++ compilers
- (see <a href="#compilers"><tt>compilers</tt></a>)</li>
- <li>The location or locations for the Unix command utilities
- (e.g. <tt>/usr/bin</tt>)</li>
- </ul>
- </dd>
- <dt><tt>MILESTONE</tt> </dt>
- <dd>
- The milestone name for the build (<i>e.g.</i>"beta").
- The default value is "internal".
- </dd>
- <dt><tt>BUILD_NUMBER</tt> </dt>
- <dd>
- The build number for the build (<i>e.g.</i> "b27").
- The default value is "b00".
- </dd>
- <dt><a name="arch_data_model"><tt>ARCH_DATA_MODEL</tt></a></dt>
- <dd>The <tt>ARCH_DATA_MODEL</tt> variable
- is used to specify whether the build is to generate 32-bit or 64-bit
- binaries.
- The Solaris build supports either 32-bit or 64-bit builds, but
- Windows and Linux will support only one, depending on the specific
- OS being used.
- Normally, setting this variable is only necessary on Solaris.
- Set <tt>ARCH_DATA_MODEL</tt> to <tt>32</tt> for generating 32-bit binaries,
- or to <tt>64</tt> for generating 64-bit binaries.
- </dd>
- <dt><a name="ALT_BOOTDIR"><tt>ALT_BOOTDIR</tt></a></dt>
- <dd>
- The location of the bootstrap JDK installation.
- See <a href="#bootjdk">Bootstrap JDK</a> for more information.
- You should always install your own local Bootstrap JDK and
- always set <tt>ALT_BOOTDIR</tt> explicitly.
- </dd>
- <dt><a name="ALT_JDK_IMPORT_PATH"><tt>ALT_JDK_IMPORT_PATH</tt></a></dt>
- <dd>
- The location of a previously built JDK installation.
- See <a href="#importjdk">Optional Import JDK</a> for more information.
- </dd>
- <dt><a name="ALT_OUTPUTDIR"><tt>ALT_OUTPUTDIR</tt></a> </dt>
- <dd>
- An override for specifying the (absolute) path of where the
- build output is to go.
- The default output directory will be build/<i>platform</i>.
- </dd>
- <dt><a name="ALT_COMPILER_PATH"><tt>ALT_COMPILER_PATH</tt></a> </dt>
- <dd>
- The location of the C/C++ compiler.
- The default varies depending on the platform.
- </dd>
- <dt><tt><a name="ALT_CACERTS_FILE">ALT_CACERTS_FILE</a></tt></dt>
- <dd>
- The location of the <a href="#cacerts">cacerts</a> file.
- The default will refer to
- <tt>jdk/src/share/lib/security/cacerts</tt>.
- </dd>
- <dt><a name="ALT_CUPS_HEADERS_PATH"><tt>ALT_CUPS_HEADERS_PATH</tt></a> </dt>
- <dd>
- The location of the CUPS header files.
- See <a href="#cups">CUPS information</a> for more information.
- If this path does not exist the fallback path is
- <tt>/usr/include</tt>.
- </dd>
- <dt><a name="ALT_FREETYPE_LIB_PATH"><tt>ALT_FREETYPE_LIB_PATH</tt></a></dt>
- <dd>
- The location of the FreeType shared library.
- See <a href="#freetype">FreeType information</a> for details.
- </dd>
- <dt><a name="ALT_FREETYPE_HEADERS_PATH"><tt>ALT_FREETYPE_HEADERS_PATH</tt></a></dt>
- <dd>
- The location of the FreeType header files.
- See <a href="#freetype">FreeType information</a> for details.
- </dd>
- <dt><a name="ALT_JDK_DEVTOOLS_PATH"><tt>ALT_JDK_DEVTOOLS_PATH</tt></a></dt>
- <dd>
- The default root location of the devtools.
- The default value is
- <tt>$(ALT_SLASH_JAVA)/devtools</tt>.
- </dd>
- <dt><tt><a name="ALT_DEVTOOLS_PATH">ALT_DEVTOOLS_PATH</a></tt> </dt>
- <dd>
- The location of tools like the
- <a href="#zip"><tt>zip</tt> and <tt>unzip</tt></a>
- binaries, but might also contain the GNU make utility
- (<tt><i>gmake</i></tt>).
- So this area is a bit of a grab bag, especially on Windows.
- The default value depends on the platform and
- Unix Commands being used.
- On Linux the default will be
- <tt>$(ALT_JDK_DEVTOOLS_PATH)/linux/bin</tt>,
- on Solaris
- <tt>$(ALT_JDK_DEVTOOLS_PATH)/<i>{sparc,i386}</i>/bin</tt>,
- and on Windows with CYGWIN
- <tt>/usr/bin</tt>.
- </dd>
- <dt><tt><a name="ALT_DROPS_DIR">ALT_DROPS_DIR</a></tt> </dt>
- <dd>
- The location of any source drop bundles
- (see <a href="#drops">Managing the Source Drops</a>).
- The default will be
- <tt>$(ALT_JDK_DEVTOOLS_PATH)/share/jdk8-drops</tt>.
- </dd>
- <dt><a name="ALT_UNIXCCS_PATH"><tt>ALT_UNIXCCS_PATH</tt></a></dt>
- <dd>
- <strong>Solaris only:</strong>
- An override for specifying where the Unix CCS
- command set are located.
- The default location is <tt>/usr/ccs/bin</tt>
- </dd>
- <dt><a name="ALT_SLASH_JAVA"><tt>ALT_SLASH_JAVA</tt></a></dt>
- <dd>
- The default root location for many of the ALT path locations
- of the following ALT variables.
- The default value is
- <tt>"/java"</tt> on Solaris and Linux,
- <tt>"J:"</tt> on Windows.
- </dd>
- <dt><a name="ALT_BUILD_JDK_IMPORT_PATH"><tt>ALT_BUILD_JDK_IMPORT_PATH</tt></a></dt>
- <dd>
- These are useful in managing builds on multiple platforms.
- The default network location for all of the import JDK images
- for all platforms.
- If <tt><a href="#ALT_JDK_IMPORT_PATH">ALT_JDK_IMPORT_PATH</a></tt>
- is not set, this directory will be used and should contain
- the following directories:
- <tt>solaris-sparc</tt>,
- <tt>solaris-i586</tt>,
- <tt>solaris-sparcv9</tt>,
- <tt>solaris-amd64</tt>,
- <tt>linux-i586</tt>,
- <tt>linux-amd64</tt>,
- <tt>windows-i586</tt>,
- and
- <tt>windows-amd64</tt>.
- Where each of these directories contain the import JDK image
- for that platform.
- </dd>
- <dt><a name="ALT_OPENWIN_HOME"><tt>ALT_OPENWIN_HOME</tt></a></dt>
- <dd>
- The top-level directory of the libraries and include files for the platform's
- graphical programming environment. The default location is platform specific.
- For example, on Linux it defaults to <tt>/usr/X11R6/</tt>.
- </dd>
- <dt><strong>Windows specific:</strong></dt>
- <dd>
- <dl>
- <dt><a name="ALT_WINDOWSSDKDIR"><tt>ALT_WINDOWSSDKDIR</tt></a> </dt>
- <dd>
- The location of the
- Microsoft Windows SDK where some tools will be
- located.
- The default is whatever WINDOWSSDKDIR is set to
- (or WindowsSdkDir) or the path
- <br>
- <tt>c:\Program Files\Microsoft SDKs\Windows\v7.0a</tt>
- </dd>
- <dt><tt><a name="ALT_DXSDK_PATH">ALT_DXSDK_PATH</a></tt> </dt>
- <dd>
- The location of the
- <a href="#dxsdk">Microsoft DirectX 9 SDK</a>.
- The default will be to try and use the DirectX environment
- variable <tt>DXSDK_DIR</tt>,
- failing that, look in <tt>C:/DXSDK</tt>.
- </dd>
- <dt><tt><a name="ALT_MSVCRNN_DLL_PATH">ALT_MSVCRNN_DLL_PATH</a></tt> </dt>
- <dd>
- The location of the
- <a href="#msvcrNN"><tt>MSVCR100.DLL</tt></a>.
- </dd>
- </dl>
- </dd>
- <dt><strong>Cross-Compilation Support:</strong></dt>
- <dd>
- <dl>
- <dt><a name="CROSS_COMPILE_ARCH"><tt>CROSS_COMPILE_ARCH</tt></a> </dt>
- <dd>
- Set to the target architecture of a cross-compilation build. If set, this
- variable is used to signify that we are cross-compiling. The expectation
- is that <a href="#ALT_COMPILER_PATH"><tt>ALT_COMPILER_PATH</tt></a> is set
- to point to the cross-compiler and that any cross-compilation specific flags
- are passed using <a href="#EXTRA_CFLAGS"><tt>EXTRA_CFLAGS</tt></a>.
- The <a href="#ALT_OPENWIN_HOME"><tt>ALT_OPENWIN_HOME</tt></a> variable should
- also be set to point to the graphical header files (e.g. X11) provided with
- the cross-compiler.
- When cross-compiling we skip execution of any demos etc that may be built, and
- also skip binary-file verification.
- </dd>
- <dt><tt><a name="EXTRA_CFLAGS">EXTRA_CFLAGS</a></tt> </dt>
- <dd>
- Used to pass cross-compilation options to the cross-compiler.
- These are added to the <tt>CFLAGS</tt> and <tt>CXXFLAGS</tt> variables.
- </dd>
- <dt><tt><a name="USE_ONLY_BOOTDIR_TOOLS">USE_ONLY_BOOTDIR_TOOLS</a></tt> </dt>
- <dd>
- Used primarily for cross-compilation builds (and always set in that case)
- this variable indicates that tools from the boot JDK should be used during
- the build process, not the tools (<tt>javac</tt>, <tt>javah</tt>, <tt>jar</tt>)
- just built (which can't execute on the build host).
- </dd>
- <dt><tt><a name="HOST_CC">HOST_CC</a></tt> </dt>
- <dd>
- The location of the C compiler to generate programs to run on the build host.
- Some parts of the build generate programs that are then compiled and executed
- to produce other parts of the build. Normally the primary C compiler is used
- to do this, but when cross-compiling that would be the cross-compiler and the
- resulting program could not be executed.
- On Linux this defaults to <tt>/usr/bin/gcc</tt>; on other platforms it must be
- set explicitly.
- </dd>
- </dl>
- <dt><strong>Specialized Build Options:</strong></dt>
- <dd>
- Some build variables exist to support specialized build environments and/or specialized
- build products. Their use is only supported in those contexts:
- <dl>
- <dt><tt><a name="BUILD_CLIENT_ONLY">BUILD_CLIENT_ONLY</a></tt> </dt>
- <dd>
- Indicates this build will only contain the Hotspot client VM. In addition to
- controlling the Hotspot build target, it ensures that we don't try to copy
- any server VM files/directories, and defines a default <tt>jvm.cfg</tt> file
- suitable for a client-only environment. Using this in a 64-bit build will
- generate a sanity warning as 64-bit client builds are not directly supported.
- </dd>
- <dt><tt><a name="BUILD_HEADLESS_ONLY"></a>BUILD_HEADLESS_ONLY</tt> </dt>
- <dd>
- Used when the build environment has no graphical capabilities at all. This
- excludes building anything that requires graphical libraries to be available.
- </dd>
- <dt><tt><a name="JAVASE_EMBEDDED"></a>JAVASE_EMBEDDED</tt> </dt>
- <dd>
- Used to indicate this is a build of the Oracle Java SE Embedded product.
- This will enable the directives included in the SE-Embedded specific build
- files.
- </dd>
- <dt><tt><a name="LIBZIP_CAN_USE_MMAP">LIBZIP_CAN_USE_MMAP</a></tt> </dt>
- <dd>
- If set to false, disables the use of mmap by the zip utility. Otherwise,
- mmap will be used.
- </dd>
- <dt><tt><a name="COMPRESS_JARS"></a>COMPRESS_JARS</tt> </dt>
- <dd>
- If set to true, causes certain jar files that would otherwise be built without
- compression, to use compression.
- </dd>
- </dl>
- </dd>
- </dl>
- </blockquote>
- <!-- ------------------------------------------------------ -->
+
+ <h3><a name="MBE">Minimum Build Environments</a></h3>
+ <blockquote>
+ This file often describes specific requirements for what we
+ call the
+ "minimum build environments" (MBE) for this
+ specific release of the JDK.
+ What is listed below is what the Oracle Release
+ Engineering Team will use to build the Oracle JDK product.
+ Building with the MBE will hopefully generate the most compatible
+ bits that install on, and run correctly on, the most variations
+ of the same base OS and hardware architecture.
+ In some cases, these represent what is often called the
+ least common denominator, but each Operating System has different
+ aspects to it.
+ <p>
+ In all cases, the Bootstrap JDK version minimum is critical,
+ we cannot guarantee builds will work with older Bootstrap JDK's.
+ Also in all cases, more RAM and more processors is better,
+ the minimums listed below are simply recommendations.
+ <p>
+ With Solaris and Mac OS X, the version listed below is the
+ oldest release we can guarantee builds and works, and the
+ specific version of the compilers used could be critical.
+ <p>
+ With Windows the critical aspect is the Visual Studio compiler
+ used, which due to it's runtime, generally dictates what Windows
+ systems can do the builds and where the resulting bits can
+ be used.<br>
+ <b>NOTE: We expect a change here off these older Windows OS releases
+ and to a 'less older' one, probably Windows 2008R2 X64.</b>
+ <p>
+ With Linux, it was just a matter of picking a
+ stable distribution that is a good representative for Linux
+ in general.<br>
+ <b>NOTE: We expect a change here from Fedora 9 to something else,
+ but it has not been completely determined yet, possibly
+ Ubuntu 12.04 X64, unbiased community feedback would be welcome on
+ what a good choice would be here.</b>
+ <p>
+ It is understood that most developers will NOT be using these
+ specific versions, and in fact creating these specific versions
+ may be difficult due to the age of some of this software.
+ It is expected that developers are more often using the more
+ recent releases and distributions of these operating systems.
+ <p>
+ Compilation problems with newer or different C/C++ compilers is a
+ common problem.
+ Similarly, compilation problems related to changes to the
+ <code>/usr/include</code> or system header files is also a
+ common problem with older, newer, or unreleased OS versions.
+ Please report these types of problems as bugs so that they
+ can be dealt with accordingly.
+ </p>
+ <table border="1">
+ <thead>
+ <tr>
+ <th>Base OS and Architecture</th>
+ <th>OS</th>
+ <th>C/C++ Compiler</th>
+ <th>Bootstrap JDK</th>
+ <th>Processors</th>
+ <th>RAM Minimum</th>
+ <th>DISK Needs</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>Linux X86 (32-bit) and X64 (64-bit)</td>
+ <td>Fedora 9</td>
+ <td>gcc 4.3 </td>
+ <td>JDK 7u7</td>
+ <td>2 or more</td>
+ <td>1 GB</td>
+ <td>6 GB</td>
+ </tr>
+ <tr>
+ <td>Solaris SPARC (32-bit) and SPARCV9 (64-bit)</td>
+ <td>Solaris 10 Update 6</td>
+ <td>Studio 12 Update 1 + patches</td>
+ <td>JDK 7u7</td>
+ <td>4 or more</td>
+ <td>4 GB</td>
+ <td>8 GB</td>
+ </tr>
+ <tr>
+ <td>Solaris X86 (32-bit) and X64 (64-bit)</td>
+ <td>Solaris 10 Update 6</td>
+ <td>Studio 12 Update 1 + patches</td>
+ <td>JDK 7u7</td>
+ <td>4 or more</td>
+ <td>4 GB</td>
+ <td>8 GB</td>
+ </tr>
+ <tr>
+ <td>Windows X86 (32-bit)</td>
+ <td>Windows XP</td>
+ <td>Microsoft Visual Studio C++ 2010 Professional Edition</td>
+ <td>JDK 7u7</td>
+ <td>2 or more</td>
+ <td>2 GB</td>
+ <td>6 GB</td>
+ </tr>
+ <tr>
+ <td>Windows X64 (64-bit)</td>
+ <td>Windows Server 2003 - Enterprise x64 Edition</td>
+ <td>Microsoft Visual Studio C++ 2010 Professional Edition</td>
+ <td>JDK 7u7</td>
+ <td>2 or more</td>
+ <td>2 GB</td>
+ <td>6 GB</td>
+ </tr>
+ <tr>
+ <td>Mac OS X X64 (64-bit)</td>
+ <td>Mac OS X 10.7 "Lion"</td>
+ <td>XCode 4.5.2 or newer</td>
+ <td>JDK 7u7</td>
+ <td>2 or more</td>
+ <td>4 GB</td>
+ <td>6 GB</td>
+ </tr>
+ </tbody>
+ </table>
+ </blockquote>
+
+ <!-- ====================================================== -->
+ <hr>
+ <h3><a name="SDBE">Specific Developer Build Environments</a></h3>
+ <blockquote>
+ We won't be listing all the possible environments, but
+ we will try to provide what information we have available to us.
+ <p>
+ <strong>NOTE: The community can help out by updating
+ this part of the document.
+ </strong>
+
+ <h4><a name="fedora">Fedora</a></h4>
+ <blockquote>
+ After installing the latest
+ <a href="http://fedoraproject.org">Fedora</a>
+ you need to install several build dependencies.
+ The simplest way to do it is to execute the
+ following commands as user <code>root</code>:
+ <blockquote>
+ <code>yum-builddep java-1.7.0-openjdk</code>
+ <br>
+ <code>yum install gcc gcc-c++</code>
+ </blockquote>
+ <p>
+ In addition, it's necessary to set a few environment
+ variables for the build:
+ <blockquote>
+ <code>export LANG=C</code>
+ <br>
+ <code>export PATH="/usr/lib/jvm/java-openjdk/bin:${PATH}"</code>
+ </blockquote>
+ </blockquote>
+
+
+ <h4><a name="centos">CentOS 5.5</a></h4>
+ <blockquote>
+ After installing
+ <a href="http://www.centos.org/">CentOS 5.5</a>
+ you need to make sure you have
+ the following Development bundles installed:
+ <blockquote>
+ <ul>
+ <li>Development Libraries</li>
+ <li>Development Tools</li>
+ <li>Java Development</li>
+ <li>X Software Development (Including XFree86-devel)</li>
+ </ul>
+ </blockquote>
+ <p>
+ Plus the following packages:
+ <blockquote>
+ <ul>
+ <li>cups devel: Cups Development Package</li>
+ <li>alsa devel: Alsa Development Package</li>
+ <li>Xi devel: libXi.so Development Package</li>
+ </ul>
+ </blockquote>
+ <p>
+ The freetype 2.3 packages don't seem to be available,
+ but the freetype 2.3 sources can be downloaded, built,
+ and installed easily enough from
+ <a href="http://downloads.sourceforge.net/freetype">
+ the freetype site</a>.
+ Build and install with something like:
+ <blockquote>
+ <code>bash ./configure</code>
+ <br>
+ <code>make</code>
+ <br>
+ <code>sudo -u root make install</code>
+ </blockquote>
+ <p>
+ Mercurial packages could not be found easily, but a Google
+ search should find ones, and they usually include Python if
+ it's needed.
+ </blockquote>
+
+ <h4><a name="debian">Debian 5.0 (Lenny)</a></h4>
+ <blockquote>
+ After installing <a href="http://debian.org">Debian</a> 5
+ you need to install several build dependencies.
+ The simplest way to install the build dependencies is to
+ execute the following commands as user <code>root</code>:
+ <blockquote>
+ <code>aptitude build-dep openjdk-7</code>
+ <br>
+ <code>aptitude install openjdk-7-jdk libmotif-dev</code>
+ </blockquote>
+ <p>
+ In addition, it's necessary to set a few environment
+ variables for the build:
+ <blockquote>
+ <code>export LANG=C</code>
+ <br>
+ <code>export PATH="/usr/lib/jvm/java-7-openjdk/bin:${PATH}"</code>
+ </blockquote>
+ </blockquote>
+
+ <h4><a name="ubuntu">Ubuntu 12.04</a></h4>
+ <blockquote>
+ After installing <a href="http://ubuntu.org">Ubuntu</a> 12.04
+ you need to install several build dependencies. The simplest
+ way to do it is to execute the following commands:
+ <blockquote>
+ <code>sudo aptitude build-dep openjdk-7</code>
+ <br>
+ <code>sudo aptitude install openjdk-7-jdk</code>
+ </blockquote>
+ <p>
+ In addition, it's necessary to set a few environment
+ variables for the build:
+ <blockquote>
+ <code>export LANG=C</code>
+ <br>
+ <code>export PATH="/usr/lib/jvm/java-7-openjdk/bin:${PATH}"</code>
+ </blockquote>
+ </blockquote>
+
+ <h4><a name="opensuse">OpenSUSE 11.1</a></h4>
+ <blockquote>
+ After installing <a href="http://opensuse.org">OpenSUSE</a> 11.1
+ you need to install several build dependencies.
+ The simplest way to install the build dependencies is to
+ execute the following commands:
+ <blockquote>
+ <code>sudo zypper source-install -d java-1_7_0-openjdk</code>
+ <br>
+ <code>sudo zypper install make</code>
+ </blockquote>
+ <p>
+ In addition, it is necessary to set a few environment
+ variables for the build:
+ <blockquote>
+ <code>export LANG=C</code>
+ <br>
+ <code>export PATH="/usr/lib/jvm/java-1.7.0-openjdk/bin:$[PATH}"</code>
+ </blockquote>
+ <p>
+ Finally, you need to unset the <code>JAVA_HOME</code>
+ environment variable:
+ <blockquote>
+ <code>export -n JAVA_HOME</code>
+ </blockquote>
+ </blockquote>
+
+ <h4><a name="mandriva">Mandriva Linux One 2009 Spring</a></h4>
+ <blockquote>
+ After installing <a href="http://mandriva.org">Mandriva</a>
+ Linux One 2009 Spring
+ you need to install several build dependencies.
+ The simplest way to install the build dependencies is to
+ execute the following commands as user <code>root</code>:
+ <blockquote>
+ <code>urpmi java-1.7.0-openjdk-devel make gcc gcc-c++
+ freetype-devel zip unzip libcups2-devel libxrender1-devel
+ libalsa2-devel libstc++-static-devel libxtst6-devel
+ libxi-devel</code>
+ </blockquote>
+ <p>
+ In addition, it is necessary to set a few environment
+ variables for the build:
+ <blockquote>
+ <code>export LANG=C</code>
+ <br>
+ <code>export PATH="/usr/lib/jvm/java-1.7.0-openjdk/bin:${PATH}"</code>
+ </blockquote>
+ </blockquote>
+
+ <h4><a name="opensolaris">OpenSolaris 2009.06</a></h4>
+ <blockquote>
+ After installing <a href="http://opensolaris.org">OpenSolaris</a> 2009.06
+ you need to install several build dependencies.
+ The simplest way to install the build dependencies is to
+ execute the following commands:
+ <blockquote>
+ <code>pfexec pkg install SUNWgmake SUNWj7dev
+ sunstudioexpress SUNWcups SUNWzip SUNWunzip SUNWxwhl
+ SUNWxorg-headers SUNWaudh SUNWfreetype2</code>
+ </blockquote>
+ <p>
+ In addition, it is necessary to set a few environment
+ variables for the build:
+ <blockquote>
+ <code>export LANG=C</code>
+ <br>
+ <code>export PATH="/opt/SunStudioExpress/bin:${PATH}"</code>
+ </blockquote>
+ </blockquote>
+
+ </blockquote>
+
+ </blockquote> <!-- Appendix C -->
+
+ <!-- ====================================================== -->
+
+ <!-- Leave out Appendix D --
+
+<hr>
+<h2><a name="mapping">Appendix D: Mapping Old to New</a></h2>
+<blockquote>
+ <p>This table will help you convert some idioms of the old build
+ system to the new build system.</p>
+ <table summary="Cheat sheet for converting from old to new build system">
+ <tr valign="top">
+ <th>In the old build system, you used to...</th>
+ <th>In the new build system, you should ...</th>
+ </tr>
+ <tr valign="top">
+ <td>run <code>make sanity</code></td>
+ <td>run <code>bash ./configure</code></td>
+ </tr>
+ <tr valign="top">
+ <td>set <code>ALT_OUTPUTDIR=build/my-special-output</code></td>
+ <td>before building the first time:
+ <br>
+ <code>cd build/my-special-output</code>
+ <br>
+ <code>bash ../../configure</code>
+ <br>
+ to build:
+ <br>
+ <code>cd build/my-special-output</code>
+ <br>
+ <code>make</code>
+ </td>
+ </tr>
+ <tr valign="top">
+ <td>set <code>ALT_BOOTDIR=/opt/java/jdk7</code></td>
+ <td>run <code>configure --with-boot-jdk=/opt/java/jdk7</code></td>
+ </tr>
+ <tr valign="top">
+ <td>run <code>make ARCH_DATA_MODEL=32</code></td>
+ <td>run <code>configure --with-target-bits=32</code></td>
+ </tr>
+ <tr valign="top">
+ <td>set <code>BUILD_CLIENT_ONLY=true</code></td>
+ <td>run <code>configure --with-jvm-variants=client</code></td>
+ </tr>
+ <tr valign="top">
+ <td>set <code>ALT_FREETYPE_LIB_PATH=/opt/freetype/lib</code>
+ and <code>ALT_FREETYPE_HEADERS_PATH=/opt/freetype/include</code></td>
+ <td>run <code>configure --with-freetype=/opt/freetype</code></td>
+ </tr>
+ <tr valign="top">
+ <td>set <code>ALT_CUPS_HEADERS_PATH=/opt/cups/include</code></td>
+ <td>run <code>configure --with-cups=/opt/cups</code></td>
+ </tr>
+ <tr valign="top">
+ <td>set <code>ALT_OPENWIN_HOME=/opt/X11R6</code></td>
+ <td>run <code>configure --with-x=/opt/X11R6</code></td>
+ </tr>
+ <tr valign="top">
+ <td>set <code>ALT_MSVCRNN_DLL_PATH=c:/vc_redist</code></td>
+ <td>run <code>configure --with-msvcr100dll=/cygdrive/c/vc_redist</code></td>
+ </tr>
+ <tr valign="top">
+ <td>set <code>ALT_COMPILER_PATH=/opt/my-gcc/bin/gcc</code></td>
+ <td>run <code>CC=/opt/my-gcc/bin/gcc configure</code>
+ or <code>CXX=/opt/my-gcc/bin/g++ configure</code>
+ </td>
+ </tr>
+ <tr valign="top">
+ <td>set <code>BUILD_HEADLESS_ONLY=true</code></td>
+ <td>run <code>configure --disable-headful</code></td>
+ </tr>
+ <tr valign="top">
+ <td>set <code>ALT_DEVTOOLS_PATH=/opt/mytools</code></td>
+ <td>just run <code>configure</code>,
+ your tools should be detected automatically.
+ If you have an unusual configuration,
+ add the tools directory to your <code>PATH</code>.
+ </td>
+ </tr>
+ <tr valign="top">
+ <td>set <code>ALT_DROPS_DIR=/home/user/dropdir</code></td>
+ <td>source drops are not used anymore</td>
+ </tr>
+ <tr valign="top">
+ <td>set <code>USE_ONLY_BOOTDIR_TOOLS=true</code></td>
+ <td>not needed, <code>configure</code> should always do the Right Thing automatically</td>
+ </tr>
+ <tr valign="top">
+ <td>set <code>ALT_JDK_IMPORT_PATH=/opt/java/import-jdk</code>
+ or <code>ALT_BUILD_JDK_IMPORT_PATH=/opt/java/import-jdk</code>
+ </td>
+ <td>Importing JDKs is no longer possible,
+ but hotspot can be imported using
+ <code>--with-import-hotspot</code>.
+ Documentation on how to achieve a
+ similar solution will come soon!
+ </td>
+ </tr>
+ <tr valign="top">
+ <td>set <code>EXTRA_CFLAGS=-Xfoo</code></td>
+ <td>run <code>CFLAGS=-Xfoo configure</code></td>
+ </tr>
+ <tr valign="top">
+ <td>set <code>CROSS_COMPILE_ARCH=i586</code></td>
+ <td>see <a href="#sec7.3"> section 7.3, Cross-compilation</a></td>
+ </tr>
+ <tr valign="top">
+ <td>set <code>SKIP_BOOT_CYCLE=false</code></td>
+ <td>Run <code>make bootcycle-images</code>.</td>
+ </tr>
+ </table>
+
+ <h3><a name="variables">Environment/Make Variables</a></h3>
+ <p>
+ Some of the
+ environment or make variables (just called <b>variables</b> in this
+ document) that can impact the build are:
+ <blockquote>
+ <dl>
+ <dt><a name="path"><code>PATH</code></a> </dt>
+ <dd>Typically you want to set the <code>PATH</code> to include:
+ <ul>
+ <li>The location of the GNU make binary</li>
+ <li>The location of the Bootstrap JDK <code>java</code>
+ (see <a href="#bootjdk">Bootstrap JDK</a>)</li>
+ <li>The location of the C/C++ compilers
+ (see <a href="#compilers"><code>compilers</code></a>)</li>
+ <li>The location or locations for the Unix command utilities
+ (e.g. <code>/usr/bin</code>)</li>
+ </ul>
+ </dd>
+ <dt><code>MILESTONE</code> </dt>
+ <dd>
+ The milestone name for the build (<i>e.g.</i>"beta").
+ The default value is "internal".
+ </dd>
+ <dt><code>BUILD_NUMBER</code> </dt>
+ <dd>
+ The build number for the build (<i>e.g.</i> "b27").
+ The default value is "b00".
+ </dd>
+ <dt><a name="arch_data_model"><code>ARCH_DATA_MODEL</code></a></dt>
+ <dd>The <code>ARCH_DATA_MODEL</code> variable
+ is used to specify whether the build is to generate 32-bit or 64-bit
+ binaries.
+ The Solaris build supports either 32-bit or 64-bit builds, but
+ Windows and Linux will support only one, depending on the specific
+ OS being used.
+ Normally, setting this variable is only necessary on Solaris.
+ Set <code>ARCH_DATA_MODEL</code> to <code>32</code> for generating 32-bit binaries,
+ or to <code>64</code> for generating 64-bit binaries.
+ </dd>
+ <dt><a name="ALT_BOOTDIR"><code>ALT_BOOTDIR</code></a></dt>
+ <dd>
+ The location of the bootstrap JDK installation.
+ See <a href="#bootjdk">Bootstrap JDK</a> for more information.
+ You should always install your own local Bootstrap JDK and
+ always set <code>ALT_BOOTDIR</code> explicitly.
+ </dd>
+ <dt><a name="ALT_OUTPUTDIR"><code>ALT_OUTPUTDIR</code></a> </dt>
+ <dd>
+ An override for specifying the (absolute) path of where the
+ build output is to go.
+ The default output directory will be build/<i>platform</i>.
+ </dd>
+ <dt><a name="ALT_COMPILER_PATH"><code>ALT_COMPILER_PATH</code></a> </dt>
+ <dd>
+ The location of the C/C++ compiler.
+ The default varies depending on the platform.
+ </dd>
+ <dt><code><a name="ALT_CACERTS_FILE">ALT_CACERTS_FILE</a></code></dt>
+ <dd>
+ The location of the <a href="#cacerts">cacerts</a> file.
+ The default will refer to
+ <code>jdk/src/share/lib/security/cacerts</code>.
+ </dd>
+ <dt><a name="ALT_CUPS_HEADERS_PATH"><code>ALT_CUPS_HEADERS_PATH</code></a> </dt>
+ <dd>
+ The location of the CUPS header files.
+ See <a href="#cups">CUPS information</a> for more information.
+ If this path does not exist the fallback path is
+ <code>/usr/include</code>.
+ </dd>
+ <dt><a name="ALT_FREETYPE_LIB_PATH"><code>ALT_FREETYPE_LIB_PATH</code></a></dt>
+ <dd>
+ The location of the FreeType shared library.
+ See <a href="#freetype">FreeType information</a> for details.
+ </dd>
+ <dt><a name="ALT_FREETYPE_HEADERS_PATH"><code>ALT_FREETYPE_HEADERS_PATH</code></a></dt>
+ <dd>
+ The location of the FreeType header files.
+ See <a href="#freetype">FreeType information</a> for details.
+ </dd>
+ <dt><a name="ALT_JDK_DEVTOOLS_PATH"><code>ALT_JDK_DEVTOOLS_PATH</code></a></dt>
+ <dd>
+ The default root location of the devtools.
+ The default value is
+ <code>$(ALT_SLASH_JAVA)/devtools</code>.
+ </dd>
+ <dt><code><a name="ALT_DEVTOOLS_PATH">ALT_DEVTOOLS_PATH</a></code> </dt>
+ <dd>
+ The location of tools like the
+ <a href="#zip"><code>zip</code> and <code>unzip</code></a>
+ binaries, but might also contain the GNU make utility
+ (<code><i>gmake</i></code>).
+ So this area is a bit of a grab bag, especially on Windows.
+ The default value depends on the platform and
+ Unix Commands being used.
+ On Linux the default will be
+ <code>$(ALT_JDK_DEVTOOLS_PATH)/linux/bin</code>,
+ on Solaris
+ <code>$(ALT_JDK_DEVTOOLS_PATH)/<i>{sparc,i386}</i>/bin</code>,
+ and on Windows with CYGWIN
+ <code>/usr/bin</code>.
+ </dd>
+ <dt><a name="ALT_UNIXCCS_PATH"><code>ALT_UNIXCCS_PATH</code></a></dt>
+ <dd>
+ <strong>Solaris only:</strong>
+ An override for specifying where the Unix CCS
+ command set are located.
+ The default location is <code>/usr/ccs/bin</code>
+ </dd>
+ <dt><a name="ALT_SLASH_JAVA"><code>ALT_SLASH_JAVA</code></a></dt>
+ <dd>
+ The default root location for many of the ALT path locations
+ of the following ALT variables.
+ The default value is
+ <code>"/java"</code> on Solaris and Linux,
+ <code>"J:"</code> on Windows.
+ </dd>
+
+ <dt><a name="ALT_OPENWIN_HOME"><code>ALT_OPENWIN_HOME</code></a></dt>
+ <dd>
+ The top-level directory of the libraries and include files
+ for the platform's
+ graphical programming environment.
+ The default location is platform specific.
+ For example, on Linux it defaults to <code>/usr/X11R6/</code>.
+ </dd>
+ <dt><strong>Windows specific:</strong></dt>
+ <dd>
+ <dl>
+ <dt><a name="ALT_WINDOWSSDKDIR"><code>ALT_WINDOWSSDKDIR</code></a> </dt>
+ <dd>
+ The location of the
+ Microsoft Windows SDK where some tools will be
+ located.
+ The default is whatever WINDOWSSDKDIR is set to
+ (or WindowsSdkDir) or the path
+ <br>
+ <code>c:\Program Files\Microsoft SDKs\Windows\v7.0a</code>
+ </dd>
+ <dt><code><a name="ALT_DXSDK_PATH">ALT_DXSDK_PATH</a></code> </dt>
+ <dd>
+ The location of the
+ <a href="#dxsdk">Microsoft DirectX 9 SDK</a>.
+ The default will be to try and use the DirectX environment
+ variable <code>DXSDK_DIR</code>,
+ failing that, look in <code>C:/DXSDK</code>.
+ </dd>
+ <dt><code><a name="ALT_MSVCRNN_DLL_PATH">ALT_MSVCRNN_DLL_PATH</a></code> </dt>
+ <dd>
+ The location of the
+ <a href="#msvcrNN"><code>MSVCR100.DLL</code></a>.
+ </dd>
+ </dl>
+ </dd>
+ <dt><strong>Cross-Compilation Support:</strong></dt>
+ <dd>
+ <dl>
+ <dt><a name="CROSS_COMPILE_ARCH"><code>CROSS_COMPILE_ARCH</code></a> </dt>
+ <dd>
+ Set to the target architecture of a
+ cross-compilation build. If set, this
+ variable is used to signify that we are
+ cross-compiling. The expectation
+ is that
+ <a href="#ALT_COMPILER_PATH"><code>ALT_COMPILER_PATH</code></a>
+ is set
+ to point to the cross-compiler and that any
+ cross-compilation specific flags
+ are passed using
+ <a href="#EXTRA_CFLAGS"><code>EXTRA_CFLAGS</code></a>.
+ The <a href="#ALT_OPENWIN_HOME"><code>ALT_OPENWIN_HOME</code></a>
+ variable should
+ also be set to point to the graphical header files
+ (e.g. X11) provided with
+ the cross-compiler.
+ When cross-compiling we skip execution of any demos
+ etc that may be built, and
+ also skip binary-file verification.
+ </dd>
+ <dt><code><a name="EXTRA_CFLAGS">EXTRA_CFLAGS</a></code> </dt>
+ <dd>
+ Used to pass cross-compilation options to the
+ cross-compiler.
+ These are added to the <code>CFLAGS</code>
+ and <code>CXXFLAGS</code> variables.
+ </dd>
+ <dt><code><a name="USE_ONLY_BOOTDIR_TOOLS">USE_ONLY_BOOTDIR_TOOLS</a></code> </dt>
+ <dd>
+ Used primarily for cross-compilation builds
+ (and always set in that case)
+ this variable indicates that tools from the
+ boot JDK should be used during
+ the build process, not the tools
+ (<code>javac</code>, <code>javah</code>, <code>jar</code>)
+ just built (which can't execute on the build host).
+ </dd>
+ <dt><code><a name="HOST_CC">HOST_CC</a></code> </dt>
+ <dd>
+ The location of the C compiler to generate programs
+ to run on the build host.
+ Some parts of the build generate programs that are
+ then compiled and executed
+ to produce other parts of the build. Normally the
+ primary C compiler is used
+ to do this, but when cross-compiling that would be
+ the cross-compiler and the
+ resulting program could not be executed.
+ On Linux this defaults to <code>/usr/bin/gcc</code>;
+ on other platforms it must be
+ set explicitly.
+ </dd>
+ </dl>
+ <dt><strong>Specialized Build Options:</strong></dt>
+ <dd>
+ Some build variables exist to support specialized build
+ environments and/or specialized
+ build products. Their use is only supported in those contexts:
+ <dl>
+ <dt><code><a name="BUILD_CLIENT_ONLY">BUILD_CLIENT_ONLY</a></code> </dt>
+ <dd>
+ Indicates this build will only contain the
+ Hotspot client VM. In addition to
+ controlling the Hotspot build target,
+ it ensures that we don't try to copy
+ any server VM files/directories,
+ and defines a default <code>jvm.cfg</code> file
+ suitable for a client-only environment.
+ Using this in a 64-bit build will
+ generate a sanity warning as 64-bit client
+ builds are not directly supported.
+ </dd>
+ <dt><code><a name="BUILD_HEADLESS_ONLY"></a>BUILD_HEADLESS_ONLY</code> </dt>
+ <dd>
+ Used when the build environment has no graphical
+ capabilities at all. This
+ excludes building anything that requires graphical
+ libraries to be available.
+ </dd>
+ <dt><code><a name="JAVASE_EMBEDDED"></a>JAVASE_EMBEDDED</code> </dt>
+ <dd>
+ Used to indicate this is a build of the Oracle
+ Java SE Embedded product.
+ This will enable the directives included in the
+ SE-Embedded specific build
+ files.
+ </dd>
+ <dt><code><a name="LIBZIP_CAN_USE_MMAP">LIBZIP_CAN_USE_MMAP</a></code> </dt>
+ <dd>
+ If set to false, disables the use of mmap by the
+ zip utility. Otherwise,
+ mmap will be used.
+ </dd>
+ <dt><code><a name="COMPRESS_JARS"></a>COMPRESS_JARS</code> </dt>
+ <dd>
+ If set to true, causes certain jar files that
+ would otherwise be built without
+ compression, to use compression.
+ </dd>
+ </dl>
+ </dd>
+ </dl>
+ </blockquote>
+
+</blockquote> <!-- Appendix D -->
+
+ <!-- ====================================================== -->
<hr>
- <h2><a name="hints">Hints and Tips</a></h2>
- <blockquote>
- You don't have to use all these hints and tips, and in fact people do actually
- build with systems that contradict these, but they might prove to be
- helpful to some.
- <ul>
- <li>
- If <tt>make sanity</tt> does not work, find out why, fix that
- before going any further. Or at least understand what the
- complaints are from it.
- </li>
- <li>
- JDK: Keep in mind that you are building a JDK, but you need
- a JDK (BOOTDIR JDK) to build this JDK.
- </li>
- <li>
- Ant: The ant utility is a java application and besides having
- ant available to you, it's important that ant finds the right
- java to run with. Make sure you can type <tt>ant -version</tt>
- and get clean results with no error messages.
- </li>
- <li>
- Linux: Try and favor the system packages over building your own
- or getting packages from other areas.
- Most Linux builds should be possible with the system's
- available packages.
- </li>
- <li>
- Solaris: Typically you will need to get compilers on your systems
- and occasionally GNU make 3.81 if a gmake binary is not available.
- The gmake binary might not be 3.81, be careful.
- </li>
- <li>
- Windows VS2010:
- <ul>
- <li>
- Only the C++ part of VS2010 is needed.
- Try to let the installation go to the default install directory.
- Always reboot your system after installing VS2010.
- The system environment variable VS100COMNTOOLS should be
- set in your environment.
- </li>
- <li>
- Make sure that TMP and TEMP are also set in the environment
- and refer to Windows paths that exist, like <tt>C:\temp</tt>,
- not <tt>/tmp</tt>, not <tt>/cygdrive/c/temp</tt>, and not <tt>C:/temp</tt>.
- <tt>C:\temp</tt> is just an example, it is assumed that this area is
- private to the user, so by default after installs you should
- see a unique user path in these variables.
- </li>
- <li>
- You need to use vsvars32.bat or vsvars64.bat to get the
- PATH, INCLUDE, LIB, LIBPATH, and WINDOWSSDKDIR
- variables set in your shell environment.
- These bat files are not easy to use from a shell environment.
- However, there is a script placed in the root jdk8 repository called
- vsvars.sh that can help, it should only be done once in a shell
- that will be doing the build, e.g.<br>
- <tt>sh ./make/scripts/vsvars.sh -v10 > settings<br>
- eval `cat settings`</tt><br>
- Or just <tt>eval `sh ./make/scripts/vsvars.sh -v10`</tt>.
- </li>
- </ul>
- </li>
- <li>
- Windows: PATH order is critical, see the
- <a href="#paths">paths</a> section for more information.
- </li>
- <li>
- Windows 64bit builds: Use ARCH_DATA_MODEL=64.
- </li>
- </ul>
- </blockquote>
- <!-- ------------------------------------------------------ -->
+ <p>End of OpenJDK README-builds.html document.<br>Please come again!
<hr>
- <h2><a name="troubleshooting">Troubleshooting</a></h2>
- <blockquote>
- A build can fail for any number of reasons.
- Most failures
- are a result of trying to build in an environment in which all the
- pre-build requirements have not been met.
- The first step in
- troubleshooting a build failure is to recheck that you have satisfied
- all the pre-build requirements for your platform.
- Look for the check list of the platform you are building on in the
- <a href="#contents">Table of Contents</a>.
- <p>
- You can validate your build environment by using the <tt>sanity</tt>
- target.
- Any errors listed
- will stop the build from starting, and any warnings may result in
- a flawed product build.
- We strongly encourage you to evaluate every
- sanity check warning and fix it if required, before you proceed
- further with your build.
- <p>
- Some of the more common problems with builds are briefly described
- below, with suggestions for remedies.
- <ul>
- <li>
- <b>Corrupted Bundles on Windows:</b>
- <blockquote>
- Some virus scanning software has been known to corrupt the
- downloading of zip bundles.
- It may be necessary to disable the 'on access' or 'real time'
- virus scanning features to prevent this corruption.
- This type of "real time" virus scanning can also slow down the
- build process significantly.
- Temporarily disabling the feature, or excluding the build
- output directory may be necessary to get correct and faster builds.
- </blockquote>
- </li>
- <li>
- <b>Slow Builds:</b>
- <blockquote>
- If your build machine seems to be overloaded from too many
- simultaneous C++ compiles, try setting the <tt>HOTSPOT_BUILD_JOBS</tt>
- variable to <tt>1</tt> (if you're using a multiple CPU
- machine, setting it to more than the the number of CPUs is probably
- not a good idea).
- <p>
- Creating the javadocs can be very slow, if you are running
- javadoc, consider skipping that step.
- <p>
- Faster hardware and more RAM always helps too.
- The VM build tends to be CPU intensive (many C++ compiles),
- and the rest of the JDK will often be disk intensive.
- <p>
- Faster compiles are possible using a tool called
- <a href="http://ccache.samba.org/" target="_blank">ccache</a>.
- </blockquote>
- </li>
- <li>
- <b>File time issues:</b>
- <blockquote>
- If you see warnings that refer to file time stamps, e.g.
- <blockquote>
- <i>Warning message:</i><tt> File `xxx' has modification time in
- the future.</tt>
- <br>
- <i>Warning message:</i> <tt> Clock skew detected. Your build may
- be incomplete.</tt>
- </blockquote>
- These warnings can occur when the clock on the build machine is out of
- sync with the timestamps on the source files. Other errors, apparently
- unrelated but in fact caused by the clock skew, can occur along with
- the clock skew warnings. These secondary errors may tend to obscure the
- fact that the true root cause of the problem is an out-of-sync clock.
- For example, an out-of-sync clock has been known to cause an old
- version of javac to be used to compile some files, resulting in errors
- when the pre-1.4 compiler ran across the new <tt>assert</tt> keyword
- in the 1.4 source code.
- <p>
- If you see these warnings, reset the clock on the build
- machine, run "<tt><i>gmake</i> clobber</tt>" or delete the directory
- containing the build output, and restart the build from the beginning.
- </blockquote>
- </li>
- <li>
- <b>Error message: <tt>Trouble writing out table to disk</tt></b>
- <blockquote>
- Increase the amount of swap space on your build machine.
- </blockquote>
- </li>
- <li>
- <b>Error Message: <tt>libstdc++ not found:</tt></b>
- <blockquote>
- This is caused by a missing libstdc++.a library.
- This is installed as part of a specific package
- (e.g. libstdc++.so.devel.386).
- By default some 64-bit Linux versions (e.g. Fedora)
- only install the 64-bit version of the libstdc++ package.
- Various parts of the JDK build require a static
- link of the C++ runtime libraries to allow for maximum
- portability of the built images.
- </blockquote>
- </li>
- <li>
- <b>Error Message: <tt>cannot restore segment prot after reloc</tt></b>
- <blockquote>
- This is probably an issue with SELinux (See
- <a href="http://en.wikipedia.org/wiki/SELinux" target="_blank">
- http://en.wikipedia.org/wiki/SELinux</a>).
- Parts of the VM is built without the <tt>-fPIC</tt> for
- performance reasons.
- <p>
- To completely disable SELinux:
- <ol>
- <li><tt>$ su root</tt></li>
- <li><tt># system-config-securitylevel</tt></li>
- <li><tt>In the window that appears, select the SELinux tab</tt></li>
- <li><tt>Disable SELinux</tt></li>
- </ol>
- <p>
- Alternatively, instead of completely disabling it you could
- disable just this one check.
- <ol>
- <li>Select System->Administration->SELinux Management</li>
- <li>In the SELinux Management Tool which appears,
- select "Boolean" from the menu on the left</li>
- <li>Expand the "Memory Protection" group</li>
- <li>Check the first item, labeled
- "Allow all unconfined executables to use libraries requiring text relocation ..."</li>
- </ol>
- </blockquote>
- </li>
- <li>
- <b>Windows Error Messages:</b><br>
- <tt>*** fatal error - couldn't allocate heap, ... </tt><br>
- <tt>rm fails with "Directory not empty"</tt><br>
- <tt>unzip fails with "cannot create ... Permission denied"</tt><br>
- <tt>unzip fails with "cannot create ... Error 50"</tt><br>
- <blockquote>
- The CYGWIN software can conflict with other non-CYGWIN
- software. See the CYGWIN FAQ section on
- <a href="http://cygwin.com/faq/faq.using.html#faq.using.bloda" target="_blank">
- BLODA (applications that interfere with CYGWIN)</a>.
- </blockquote>
- </li>
- <li>
- <b>Windows Error Message: <tt>spawn failed</tt></b>
- <blockquote>
- Try rebooting the system, or there could be some kind of
- issue with the disk or disk partition being used.
- Sometimes it comes with a "Permission Denied" message.
- </blockquote>
- </li>
- </ul>
- </blockquote>
- <!-- ------------------------------------------------------ -->
- <hr>
- <h2><a name="newbuild">The New Build</a></h2>
- <blockquote>
- The <a href="http://openjdk.java.net/projects/build-infra/">
- Build Infrastructure project</a> is working on a new
- build. For information on how to try it out, please see the
- <a href="http://openjdk.java.net/projects/build-infra/guide.html">
- Build Infra User Guide</a>
- </blockquote>
- <hr>
+
</body>
</html>
--- a/common/autoconf/build-performance.m4 Tue Mar 05 09:50:53 2013 -0500
+++ b/common/autoconf/build-performance.m4 Tue Mar 05 11:49:33 2013 -0800
@@ -47,10 +47,6 @@
FOUND_CORES=yes
fi
- # For c/c++ code we run twice as many concurrent build
- # jobs than we have cores, otherwise we will stall on io.
- CONCURRENT_BUILD_JOBS=`expr $NUM_CORES \* 2`
-
if test "x$FOUND_CORES" = xyes; then
AC_MSG_RESULT([$NUM_CORES])
else
@@ -98,32 +94,62 @@
AC_DEFUN_ONCE([BPERF_SETUP_BUILD_CORES],
[
-# How many cores do we have on this build system?
-AC_ARG_WITH(num-cores, [AS_HELP_STRING([--with-num-cores],
+ # How many cores do we have on this build system?
+ AC_ARG_WITH(num-cores, [AS_HELP_STRING([--with-num-cores],
[number of cores in the build system, e.g. --with-num-cores=8 @<:@probed@:>@])])
-if test "x$with_num_cores" = x; then
+ if test "x$with_num_cores" = x; then
# The number of cores were not specified, try to probe them.
BPERF_CHECK_CORES
-else
+ else
NUM_CORES=$with_num_cores
- CONCURRENT_BUILD_JOBS=`expr $NUM_CORES \* 2`
-fi
-AC_SUBST(NUM_CORES)
-AC_SUBST(CONCURRENT_BUILD_JOBS)
+ fi
+ AC_SUBST(NUM_CORES)
])
AC_DEFUN_ONCE([BPERF_SETUP_BUILD_MEMORY],
[
-# How much memory do we have on this build system?
-AC_ARG_WITH(memory-size, [AS_HELP_STRING([--with-memory-size],
+ # How much memory do we have on this build system?
+ AC_ARG_WITH(memory-size, [AS_HELP_STRING([--with-memory-size],
[memory (in MB) available in the build system, e.g. --with-memory-size=1024 @<:@probed@:>@])])
-if test "x$with_memory_size" = x; then
+ if test "x$with_memory_size" = x; then
# The memory size was not specified, try to probe it.
BPERF_CHECK_MEMORY_SIZE
-else
+ else
MEMORY_SIZE=$with_memory_size
-fi
-AC_SUBST(MEMORY_SIZE)
+ fi
+ AC_SUBST(MEMORY_SIZE)
+])
+
+AC_DEFUN_ONCE([BPERF_SETUP_BUILD_JOBS],
+[
+ # Provide a decent default number of parallel jobs for make depending on
+ # number of cores, amount of memory and machine architecture.
+ AC_ARG_WITH(jobs, [AS_HELP_STRING([--with-jobs],
+ [number of parallel jobs to let make run @<:@calculated based on cores and memory@:>@])])
+ if test "x$with_jobs" = x; then
+ # Number of jobs was not specified, calculate.
+ AC_MSG_CHECKING([for appropriate number of jobs to run in parallel])
+ # Approximate memory in GB, rounding up a bit.
+ memory_gb=`expr $MEMORY_SIZE / 1100`
+ # Pick the lowest of memory in gb and number of cores.
+ if test "$memory_gb" -lt "$NUM_CORES"; then
+ JOBS="$memory_gb"
+ else
+ JOBS="$NUM_CORES"
+ # On bigger machines, leave some room for other processes to run
+ if test "$JOBS" -gt "4"; then
+ JOBS=`expr $JOBS '*' 90 / 100`
+ fi
+ fi
+ # Cap number of jobs to 16
+ if test "$JOBS" -gt "16"; then
+ JOBS=16
+ fi
+ AC_MSG_RESULT([$JOBS])
+ else
+ JOBS=$with_jobs
+ fi
+ AC_SUBST(JOBS)
])
AC_DEFUN([BPERF_SETUP_CCACHE],
--- a/common/autoconf/configure.ac Tue Mar 05 09:50:53 2013 -0500
+++ b/common/autoconf/configure.ac Tue Mar 05 11:49:33 2013 -0800
@@ -204,6 +204,7 @@
BPERF_SETUP_BUILD_CORES
BPERF_SETUP_BUILD_MEMORY
+BPERF_SETUP_BUILD_JOBS
# Setup smart javac (after cores and memory have been setup)
BPERF_SETUP_SMART_JAVAC
--- a/common/autoconf/generated-configure.sh Tue Mar 05 09:50:53 2013 -0500
+++ b/common/autoconf/generated-configure.sh Tue Mar 05 11:49:33 2013 -0800
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for OpenJDK jdk8.
+# Generated by GNU Autoconf 2.67 for OpenJDK jdk8.
#
# Report bugs to <build-dev@openjdk.java.net>.
#
@@ -91,7 +91,6 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-as_myself=
case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -217,18 +216,11 @@
# We cannot yet assume a decent shell, so we have to provide a
# neutralization value for shells without unset; and this also
# works around shells that cannot unset nonexistent variables.
- # Preserve -v and -x to the replacement shell.
BASH_ENV=/dev/null
ENV=/dev/null
(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
export CONFIG_SHELL
- case $- in # ((((
- *v*x* | *x*v* ) as_opts=-vx ;;
- *v* ) as_opts=-v ;;
- *x* ) as_opts=-x ;;
- * ) as_opts= ;;
- esac
- exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
fi
if test x$as_have_required = xno; then :
@@ -609,8 +601,8 @@
ENABLE_SJAVAC
SJAVAC_SERVER_CORES
SJAVAC_SERVER_JAVA
+JOBS
MEMORY_SIZE
-CONCURRENT_BUILD_JOBS
NUM_CORES
SALIB_NAME
HOTSPOT_MAKE_ARGS
@@ -649,7 +641,7 @@
CXXFLAGS_JDKLIB
CFLAGS_JDKEXE
CFLAGS_JDKLIB
-MACOSX_REQUIRED_VERSION
+MACOSX_VERSION_MIN
PACKAGE_PATH
LEGACY_EXTRA_LDFLAGS
LEGACY_EXTRA_CXXFLAGS
@@ -1010,6 +1002,7 @@
with_stdc__lib
with_num_cores
with_memory_size
+with_jobs
with_sjavac_server_java
with_sjavac_server_cores
enable_sjavac
@@ -1442,7 +1435,7 @@
$as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
$as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
- : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
+ : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
;;
esac
@@ -1768,6 +1761,8 @@
--with-num-cores=8 [probed]
--with-memory-size memory (in MB) available in the build system, e.g.
--with-memory-size=1024 [probed]
+ --with-jobs number of parallel jobs to let make run [calculated
+ based on cores and memory]
--with-sjavac-server-java
use this java binary for running the sjavac
background server [Boot JDK java]
@@ -1867,7 +1862,7 @@
if $ac_init_version; then
cat <<\_ACEOF
OpenJDK configure jdk8
-generated by GNU Autoconf 2.68
+generated by GNU Autoconf 2.67
Copyright (C) 2010 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
@@ -1913,7 +1908,7 @@
ac_retval=1
fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
as_fn_set_status $ac_retval
} # ac_fn_c_try_compile
@@ -1951,7 +1946,7 @@
ac_retval=1
fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
as_fn_set_status $ac_retval
} # ac_fn_cxx_try_compile
@@ -1989,7 +1984,7 @@
ac_retval=1
fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
as_fn_set_status $ac_retval
} # ac_fn_objc_try_compile
@@ -2026,7 +2021,7 @@
ac_retval=1
fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
as_fn_set_status $ac_retval
} # ac_fn_c_try_cpp
@@ -2063,7 +2058,7 @@
ac_retval=1
fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
as_fn_set_status $ac_retval
} # ac_fn_cxx_try_cpp
@@ -2076,10 +2071,10 @@
ac_fn_cxx_check_header_mongrel ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if eval \${$3+:} false; then :
+ if eval "test \"\${$3+set}\"" = set; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
fi
eval ac_res=\$$3
@@ -2146,7 +2141,7 @@
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
eval "$3=\$ac_header_compiler"
@@ -2155,7 +2150,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
} # ac_fn_cxx_check_header_mongrel
@@ -2196,7 +2191,7 @@
ac_retval=$ac_status
fi
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
as_fn_set_status $ac_retval
} # ac_fn_cxx_try_run
@@ -2210,7 +2205,7 @@
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2228,7 +2223,7 @@
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
} # ac_fn_cxx_check_header_compile
@@ -2405,7 +2400,7 @@
rm -f conftest.val
fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
as_fn_set_status $ac_retval
} # ac_fn_cxx_compute_int
@@ -2451,7 +2446,7 @@
# interfere with the next link command; also delete a directory that is
# left behind by Apple's compiler. We do this before executing the actions.
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
as_fn_set_status $ac_retval
} # ac_fn_cxx_try_link
@@ -2464,7 +2459,7 @@
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2519,7 +2514,7 @@
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
} # ac_fn_cxx_check_func
@@ -2532,7 +2527,7 @@
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2550,7 +2545,7 @@
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
} # ac_fn_c_check_header_compile
cat >config.log <<_ACEOF
@@ -2558,7 +2553,7 @@
running configure, to aid debugging if configure makes a mistake.
It was created by OpenJDK $as_me jdk8, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+generated by GNU Autoconf 2.67. Invocation command line was
$ $0 $@
@@ -2816,7 +2811,7 @@
|| { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
fi
done
@@ -3337,6 +3332,8 @@
+
+
#
# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -3732,7 +3729,7 @@
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1361218904
+DATE_WHEN_GENERATED=1362411827
###############################################################################
#
@@ -3770,7 +3767,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_BASENAME+:} false; then :
+if test "${ac_cv_path_BASENAME+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $BASENAME in
@@ -3829,7 +3826,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_BASH+:} false; then :
+if test "${ac_cv_path_BASH+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $BASH in
@@ -3888,7 +3885,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CAT+:} false; then :
+if test "${ac_cv_path_CAT+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $CAT in
@@ -3947,7 +3944,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CHMOD+:} false; then :
+if test "${ac_cv_path_CHMOD+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $CHMOD in
@@ -4006,7 +4003,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CMP+:} false; then :
+if test "${ac_cv_path_CMP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $CMP in
@@ -4065,7 +4062,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_COMM+:} false; then :
+if test "${ac_cv_path_COMM+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $COMM in
@@ -4124,7 +4121,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CP+:} false; then :
+if test "${ac_cv_path_CP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $CP in
@@ -4183,7 +4180,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CPIO+:} false; then :
+if test "${ac_cv_path_CPIO+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $CPIO in
@@ -4242,7 +4239,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CUT+:} false; then :
+if test "${ac_cv_path_CUT+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $CUT in
@@ -4301,7 +4298,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_DATE+:} false; then :
+if test "${ac_cv_path_DATE+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $DATE in
@@ -4360,7 +4357,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_DIFF+:} false; then :
+if test "${ac_cv_path_DIFF+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $DIFF in
@@ -4419,7 +4416,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_DIRNAME+:} false; then :
+if test "${ac_cv_path_DIRNAME+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $DIRNAME in
@@ -4478,7 +4475,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ECHO+:} false; then :
+if test "${ac_cv_path_ECHO+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $ECHO in
@@ -4537,7 +4534,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_EXPR+:} false; then :
+if test "${ac_cv_path_EXPR+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $EXPR in
@@ -4596,7 +4593,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_FILE+:} false; then :
+if test "${ac_cv_path_FILE+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $FILE in
@@ -4655,7 +4652,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_FIND+:} false; then :
+if test "${ac_cv_path_FIND+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $FIND in
@@ -4714,7 +4711,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_HEAD+:} false; then :
+if test "${ac_cv_path_HEAD+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $HEAD in
@@ -4773,7 +4770,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_LN+:} false; then :
+if test "${ac_cv_path_LN+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $LN in
@@ -4832,7 +4829,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_LS+:} false; then :
+if test "${ac_cv_path_LS+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $LS in
@@ -4891,7 +4888,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MKDIR+:} false; then :
+if test "${ac_cv_path_MKDIR+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $MKDIR in
@@ -4950,7 +4947,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MKTEMP+:} false; then :
+if test "${ac_cv_path_MKTEMP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $MKTEMP in
@@ -5009,7 +5006,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MV+:} false; then :
+if test "${ac_cv_path_MV+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $MV in
@@ -5068,7 +5065,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PRINTF+:} false; then :
+if test "${ac_cv_path_PRINTF+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $PRINTF in
@@ -5127,7 +5124,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_THEPWDCMD+:} false; then :
+if test "${ac_cv_path_THEPWDCMD+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $THEPWDCMD in
@@ -5186,7 +5183,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_RM+:} false; then :
+if test "${ac_cv_path_RM+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $RM in
@@ -5245,7 +5242,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_SH+:} false; then :
+if test "${ac_cv_path_SH+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $SH in
@@ -5304,7 +5301,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_SORT+:} false; then :
+if test "${ac_cv_path_SORT+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $SORT in
@@ -5363,7 +5360,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_TAIL+:} false; then :
+if test "${ac_cv_path_TAIL+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $TAIL in
@@ -5422,7 +5419,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_TAR+:} false; then :
+if test "${ac_cv_path_TAR+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $TAR in
@@ -5481,7 +5478,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_TEE+:} false; then :
+if test "${ac_cv_path_TEE+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $TEE in
@@ -5540,7 +5537,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_TOUCH+:} false; then :
+if test "${ac_cv_path_TOUCH+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $TOUCH in
@@ -5599,7 +5596,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_TR+:} false; then :
+if test "${ac_cv_path_TR+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $TR in
@@ -5658,7 +5655,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_UNAME+:} false; then :
+if test "${ac_cv_path_UNAME+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $UNAME in
@@ -5717,7 +5714,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_UNIQ+:} false; then :
+if test "${ac_cv_path_UNIQ+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $UNIQ in
@@ -5776,7 +5773,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_WC+:} false; then :
+if test "${ac_cv_path_WC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $WC in
@@ -5835,7 +5832,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_WHICH+:} false; then :
+if test "${ac_cv_path_WHICH+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $WHICH in
@@ -5894,7 +5891,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_XARGS+:} false; then :
+if test "${ac_cv_path_XARGS+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $XARGS in
@@ -5954,7 +5951,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; then :
+if test "${ac_cv_prog_AWK+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
@@ -6004,7 +6001,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
+if test "${ac_cv_path_GREP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
@@ -6079,7 +6076,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
$as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
+if test "${ac_cv_path_EGREP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -6158,7 +6155,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
$as_echo_n "checking for fgrep... " >&6; }
-if ${ac_cv_path_FGREP+:} false; then :
+if test "${ac_cv_path_FGREP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
@@ -6237,7 +6234,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if ${ac_cv_path_SED+:} false; then :
+if test "${ac_cv_path_SED+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
@@ -6323,7 +6320,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_NAWK+:} false; then :
+if test "${ac_cv_path_NAWK+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $NAWK in
@@ -6383,7 +6380,7 @@
set dummy cygpath; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CYGPATH+:} false; then :
+if test "${ac_cv_path_CYGPATH+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $CYGPATH in
@@ -6423,7 +6420,7 @@
set dummy readlink; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_READLINK+:} false; then :
+if test "${ac_cv_path_READLINK+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $READLINK in
@@ -6463,7 +6460,7 @@
set dummy df; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_DF+:} false; then :
+if test "${ac_cv_path_DF+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $DF in
@@ -6503,7 +6500,7 @@
set dummy SetFile; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_SETFILE+:} false; then :
+if test "${ac_cv_path_SETFILE+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $SETFILE in
@@ -6549,7 +6546,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
$as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
+if test "${ac_cv_build+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_build_alias=$build_alias
@@ -6565,7 +6562,7 @@
$as_echo "$ac_cv_build" >&6; }
case $ac_cv_build in
*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
@@ -6583,7 +6580,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
$as_echo_n "checking host system type... " >&6; }
-if ${ac_cv_host+:} false; then :
+if test "${ac_cv_host+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "x$host_alias" = x; then
@@ -6598,7 +6595,7 @@
$as_echo "$ac_cv_host" >&6; }
case $ac_cv_host in
*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
@@ -6616,7 +6613,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
$as_echo_n "checking target system type... " >&6; }
-if ${ac_cv_target+:} false; then :
+if test "${ac_cv_target+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "x$target_alias" = x; then
@@ -6631,7 +6628,7 @@
$as_echo "$ac_cv_target" >&6; }
case $ac_cv_target in
*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;;
esac
target=$ac_cv_target
ac_save_IFS=$IFS; IFS='-'
@@ -8097,7 +8094,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_PKGHANDLER+:} false; then :
+if test "${ac_cv_prog_PKGHANDLER+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$PKGHANDLER"; then
@@ -8462,7 +8459,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CHECK_GMAKE+:} false; then :
+if test "${ac_cv_path_CHECK_GMAKE+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $CHECK_GMAKE in
@@ -8816,7 +8813,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CHECK_MAKE+:} false; then :
+if test "${ac_cv_path_CHECK_MAKE+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $CHECK_MAKE in
@@ -9175,7 +9172,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CHECK_TOOLSDIR_GMAKE+:} false; then :
+if test "${ac_cv_path_CHECK_TOOLSDIR_GMAKE+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $CHECK_TOOLSDIR_GMAKE in
@@ -9528,7 +9525,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CHECK_TOOLSDIR_MAKE+:} false; then :
+if test "${ac_cv_path_CHECK_TOOLSDIR_MAKE+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $CHECK_TOOLSDIR_MAKE in
@@ -9924,7 +9921,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_UNZIP+:} false; then :
+if test "${ac_cv_path_UNZIP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $UNZIP in
@@ -9983,7 +9980,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ZIP+:} false; then :
+if test "${ac_cv_path_ZIP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $ZIP in
@@ -10042,7 +10039,7 @@
set dummy ldd; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_LDD+:} false; then :
+if test "${ac_cv_path_LDD+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $LDD in
@@ -10088,7 +10085,7 @@
set dummy otool; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_OTOOL+:} false; then :
+if test "${ac_cv_path_OTOOL+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $OTOOL in
@@ -10133,7 +10130,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_READELF+:} false; then :
+if test "${ac_cv_path_READELF+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $READELF in
@@ -10176,7 +10173,7 @@
set dummy hg; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_HG+:} false; then :
+if test "${ac_cv_path_HG+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $HG in
@@ -10216,7 +10213,7 @@
set dummy stat; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_STAT+:} false; then :
+if test "${ac_cv_path_STAT+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $STAT in
@@ -10256,7 +10253,7 @@
set dummy time; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_TIME+:} false; then :
+if test "${ac_cv_path_TIME+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $TIME in
@@ -10301,7 +10298,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_COMM+:} false; then :
+if test "${ac_cv_path_COMM+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $COMM in
@@ -10365,7 +10362,7 @@
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
@@ -10408,7 +10405,7 @@
set dummy pkg-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
@@ -10581,7 +10578,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_BDEPS_UNZIP+:} false; then :
+if test "${ac_cv_prog_BDEPS_UNZIP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$BDEPS_UNZIP"; then
@@ -10627,7 +10624,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_BDEPS_FTP+:} false; then :
+if test "${ac_cv_prog_BDEPS_FTP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$BDEPS_FTP"; then
@@ -11894,7 +11891,7 @@
set dummy javac; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_JAVAC_CHECK+:} false; then :
+if test "${ac_cv_path_JAVAC_CHECK+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $JAVAC_CHECK in
@@ -11934,7 +11931,7 @@
set dummy java; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_JAVA_CHECK+:} false; then :
+if test "${ac_cv_path_JAVA_CHECK+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $JAVA_CHECK in
@@ -15993,7 +15990,7 @@
set dummy link; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CYGWIN_LINK+:} false; then :
+if test "${ac_cv_path_CYGWIN_LINK+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $CYGWIN_LINK in
@@ -16982,7 +16979,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_BUILD_CC+:} false; then :
+if test "${ac_cv_path_BUILD_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $BUILD_CC in
@@ -17293,7 +17290,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_BUILD_CXX+:} false; then :
+if test "${ac_cv_path_BUILD_CXX+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $BUILD_CXX in
@@ -17602,7 +17599,7 @@
set dummy ld; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_BUILD_LD+:} false; then :
+if test "${ac_cv_path_BUILD_LD+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $BUILD_LD in
@@ -18114,7 +18111,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_TOOLS_DIR_CC+:} false; then :
+if test "${ac_cv_path_TOOLS_DIR_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $TOOLS_DIR_CC in
@@ -18166,7 +18163,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_POTENTIAL_CC+:} false; then :
+if test "${ac_cv_path_POTENTIAL_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $POTENTIAL_CC in
@@ -18579,7 +18576,7 @@
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_PROPER_COMPILER_CC+:} false; then :
+if test "${ac_cv_prog_PROPER_COMPILER_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$PROPER_COMPILER_CC"; then
@@ -18623,7 +18620,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_PROPER_COMPILER_CC+:} false; then :
+if test "${ac_cv_prog_ac_ct_PROPER_COMPILER_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_PROPER_COMPILER_CC"; then
@@ -19073,7 +19070,7 @@
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -19117,7 +19114,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -19170,7 +19167,7 @@
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
# Provide some information about the compiler.
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -19285,7 +19282,7 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -19328,7 +19325,7 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
fi
rm -f conftest conftest$ac_cv_exeext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -19387,7 +19384,7 @@
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot run C compiled programs.
If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
fi
fi
fi
@@ -19398,7 +19395,7 @@
ac_clean_files=$ac_clean_files_save
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
$as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
+if test "${ac_cv_objext+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -19439,7 +19436,7 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
@@ -19449,7 +19446,7 @@
ac_objext=$OBJEXT
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -19486,7 +19483,7 @@
ac_save_CFLAGS=$CFLAGS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
+if test "${ac_cv_prog_cc_g+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_save_c_werror_flag=$ac_c_werror_flag
@@ -19564,7 +19561,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_cv_prog_cc_c89=no
@@ -19683,7 +19680,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_TOOLS_DIR_CXX+:} false; then :
+if test "${ac_cv_path_TOOLS_DIR_CXX+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $TOOLS_DIR_CXX in
@@ -19735,7 +19732,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_POTENTIAL_CXX+:} false; then :
+if test "${ac_cv_path_POTENTIAL_CXX+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $POTENTIAL_CXX in
@@ -20148,7 +20145,7 @@
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_PROPER_COMPILER_CXX+:} false; then :
+if test "${ac_cv_prog_PROPER_COMPILER_CXX+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$PROPER_COMPILER_CXX"; then
@@ -20192,7 +20189,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_PROPER_COMPILER_CXX+:} false; then :
+if test "${ac_cv_prog_ac_ct_PROPER_COMPILER_CXX+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_PROPER_COMPILER_CXX"; then
@@ -20646,7 +20643,7 @@
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CXX+:} false; then :
+if test "${ac_cv_prog_CXX+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CXX"; then
@@ -20690,7 +20687,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CXX+:} false; then :
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CXX"; then
@@ -20768,7 +20765,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if ${ac_cv_cxx_compiler_gnu+:} false; then :
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -20805,7 +20802,7 @@
ac_save_CXXFLAGS=$CXXFLAGS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if ${ac_cv_prog_cxx_g+:} false; then :
+if test "${ac_cv_prog_cxx_g+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_save_cxx_werror_flag=$ac_cxx_werror_flag
@@ -20903,7 +20900,7 @@
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OBJC+:} false; then :
+if test "${ac_cv_prog_OBJC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$OBJC"; then
@@ -20947,7 +20944,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OBJC+:} false; then :
+if test "${ac_cv_prog_ac_ct_OBJC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJC"; then
@@ -21023,7 +21020,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Objective C compiler" >&5
$as_echo_n "checking whether we are using the GNU Objective C compiler... " >&6; }
-if ${ac_cv_objc_compiler_gnu+:} false; then :
+if test "${ac_cv_objc_compiler_gnu+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -21060,7 +21057,7 @@
ac_save_OBJCFLAGS=$OBJCFLAGS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $OBJC accepts -g" >&5
$as_echo_n "checking whether $OBJC accepts -g... " >&6; }
-if ${ac_cv_prog_objc_g+:} false; then :
+if test "${ac_cv_prog_objc_g+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_save_objc_werror_flag=$ac_objc_werror_flag
@@ -21436,7 +21433,7 @@
set dummy ${ac_tool_prefix}ar; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AR+:} false; then :
+if test "${ac_cv_prog_AR+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
@@ -21476,7 +21473,7 @@
set dummy ar; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_AR+:} false; then :
+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AR"; then
@@ -21818,7 +21815,7 @@
set dummy link; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_WINLD+:} false; then :
+if test "${ac_cv_prog_WINLD+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$WINLD"; then
@@ -22157,7 +22154,7 @@
set dummy mt; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MT+:} false; then :
+if test "${ac_cv_prog_MT+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$MT"; then
@@ -22478,7 +22475,7 @@
set dummy rc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_RC+:} false; then :
+if test "${ac_cv_prog_RC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$RC"; then
@@ -22869,7 +22866,7 @@
set dummy lib; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_WINAR+:} false; then :
+if test "${ac_cv_prog_WINAR+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$WINAR"; then
@@ -23175,7 +23172,7 @@
set dummy dumpbin; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DUMPBIN+:} false; then :
+if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$DUMPBIN"; then
@@ -23494,7 +23491,7 @@
CPP=
fi
if test -z "$CPP"; then
- if ${ac_cv_prog_CPP+:} false; then :
+ if test "${ac_cv_prog_CPP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
@@ -23610,7 +23607,7 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
fi
ac_ext=cpp
@@ -23894,7 +23891,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
if test -z "$CXXCPP"; then
- if ${ac_cv_prog_CXXCPP+:} false; then :
+ if test "${ac_cv_prog_CXXCPP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
# Double quotes because CXXCPP needs to be expanded
@@ -24010,7 +24007,7 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
fi
ac_ext=cpp
@@ -24312,7 +24309,7 @@
set dummy as; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_AS+:} false; then :
+if test "${ac_cv_path_AS+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $AS in
@@ -24626,7 +24623,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_NM+:} false; then :
+if test "${ac_cv_path_NM+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $NM in
@@ -24935,7 +24932,7 @@
set dummy strip; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_STRIP+:} false; then :
+if test "${ac_cv_path_STRIP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $STRIP in
@@ -25241,7 +25238,7 @@
set dummy mcs; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MCS+:} false; then :
+if test "${ac_cv_path_MCS+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $MCS in
@@ -25549,7 +25546,7 @@
set dummy ${ac_tool_prefix}nm; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_NM+:} false; then :
+if test "${ac_cv_prog_NM+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
@@ -25589,7 +25586,7 @@
set dummy nm; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_NM+:} false; then :
+if test "${ac_cv_prog_ac_ct_NM+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NM"; then
@@ -25907,7 +25904,7 @@
set dummy ${ac_tool_prefix}strip; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
+if test "${ac_cv_prog_STRIP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
@@ -25947,7 +25944,7 @@
set dummy strip; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
@@ -26272,7 +26269,7 @@
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OBJCOPY+:} false; then :
+if test "${ac_cv_prog_OBJCOPY+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$OBJCOPY"; then
@@ -26316,7 +26313,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OBJCOPY+:} false; then :
+if test "${ac_cv_prog_ac_ct_OBJCOPY+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJCOPY"; then
@@ -26643,7 +26640,7 @@
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OBJDUMP+:} false; then :
+if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
@@ -26687,7 +26684,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
@@ -27011,7 +27008,7 @@
set dummy lipo; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_LIPO+:} false; then :
+if test "${ac_cv_path_LIPO+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $LIPO in
@@ -27326,7 +27323,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
+if test "${ac_cv_header_stdc+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -27502,7 +27499,7 @@
for ac_header in stdio.h
do :
ac_fn_cxx_check_header_mongrel "$LINENO" "stdio.h" "ac_cv_header_stdio_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdio_h" = xyes; then :
+if test "x$ac_cv_header_stdio_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_STDIO_H 1
_ACEOF
@@ -27531,7 +27528,7 @@
# This bug is HP SR number 8606223364.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int *" >&5
$as_echo_n "checking size of int *... " >&6; }
-if ${ac_cv_sizeof_int_p+:} false; then :
+if test "${ac_cv_sizeof_int_p+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (int *))" "ac_cv_sizeof_int_p" "$ac_includes_default"; then :
@@ -27541,7 +27538,7 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error 77 "cannot compute sizeof (int *)
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
else
ac_cv_sizeof_int_p=0
fi
@@ -27588,7 +27585,7 @@
#
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if ${ac_cv_c_bigendian+:} false; then :
+if test "${ac_cv_c_bigendian+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_cv_c_bigendian=unknown
@@ -28242,10 +28239,17 @@
fi
if test "x$OPENJDK_TARGET_OS" = xmacosx; then
CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMACOSX -D_ALLBSD_SOURCE"
- # Adding these macros will make it an error to link to mac APIs newer than OS version 10.7
- MACOSX_REQUIRED_VERSION=1070
-
- CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(MACOSX_REQUIRED_VERSION) -DMAC_OS_X_VERSION_MIN_REQUIRED=\$(MACOSX_REQUIRED_VERSION)"
+ # Setting these parameters makes it an error to link to macosx APIs that are
+ # newer than the given OS version and makes the linked binaries compatible even
+ # if built on a newer version of the OS.
+ # The expected format is X.Y.Z
+ MACOSX_VERSION_MIN=10.7.0
+
+ # The macro takes the version with no dots, ex: 1070
+ # Let the flags variables get resolved in make for easier override on make
+ # command line.
+ CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MIN)) -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
+ LDFLAGS_JDK="$LDFLAGS_JDK -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
fi
if test "x$OPENJDK_TARGET_OS" = xbsd; then
CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DBSD -D_ALLBSD_SOURCE"
@@ -28592,8 +28596,8 @@
have_x=disabled
else
case $x_includes,$x_libraries in #(
- *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #(
- *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then :
+ *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #(
+ *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
$as_echo_n "(cached) " >&6
else
# One or both of the vars are not set, and there is no cached value.
@@ -28870,7 +28874,7 @@
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
-if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then :
+if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -28904,14 +28908,14 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
-if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then :
+if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then :
X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
fi
if test $ac_cv_lib_dnet_dnet_ntoa = no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5
$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
-if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then :
+if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -28945,7 +28949,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
-if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then :
+if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then :
X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
fi
@@ -28964,14 +28968,14 @@
# The functions gethostbyname, getservbyname, and inet_addr are
# in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
ac_fn_cxx_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
-if test "x$ac_cv_func_gethostbyname" = xyes; then :
+if test "x$ac_cv_func_gethostbyname" = x""yes; then :
fi
if test $ac_cv_func_gethostbyname = no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
-if ${ac_cv_lib_nsl_gethostbyname+:} false; then :
+if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -29005,14 +29009,14 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
-if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then :
+if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
fi
if test $ac_cv_lib_nsl_gethostbyname = no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
$as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
-if ${ac_cv_lib_bsd_gethostbyname+:} false; then :
+if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -29046,7 +29050,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
-if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then :
+if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
fi
@@ -29061,14 +29065,14 @@
# must be given before -lnsl if both are needed. We assume that
# if connect needs -lnsl, so does gethostbyname.
ac_fn_cxx_check_func "$LINENO" "connect" "ac_cv_func_connect"
-if test "x$ac_cv_func_connect" = xyes; then :
+if test "x$ac_cv_func_connect" = x""yes; then :
fi
if test $ac_cv_func_connect = no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
$as_echo_n "checking for connect in -lsocket... " >&6; }
-if ${ac_cv_lib_socket_connect+:} false; then :
+if test "${ac_cv_lib_socket_connect+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -29102,7 +29106,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
$as_echo "$ac_cv_lib_socket_connect" >&6; }
-if test "x$ac_cv_lib_socket_connect" = xyes; then :
+if test "x$ac_cv_lib_socket_connect" = x""yes; then :
X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
fi
@@ -29110,14 +29114,14 @@
# Guillermo Gomez says -lposix is necessary on A/UX.
ac_fn_cxx_check_func "$LINENO" "remove" "ac_cv_func_remove"
-if test "x$ac_cv_func_remove" = xyes; then :
+if test "x$ac_cv_func_remove" = x""yes; then :
fi
if test $ac_cv_func_remove = no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
$as_echo_n "checking for remove in -lposix... " >&6; }
-if ${ac_cv_lib_posix_remove+:} false; then :
+if test "${ac_cv_lib_posix_remove+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -29151,7 +29155,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
$as_echo "$ac_cv_lib_posix_remove" >&6; }
-if test "x$ac_cv_lib_posix_remove" = xyes; then :
+if test "x$ac_cv_lib_posix_remove" = x""yes; then :
X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
fi
@@ -29159,14 +29163,14 @@
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
ac_fn_cxx_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
-if test "x$ac_cv_func_shmat" = xyes; then :
+if test "x$ac_cv_func_shmat" = x""yes; then :
fi
if test $ac_cv_func_shmat = no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
$as_echo_n "checking for shmat in -lipc... " >&6; }
-if ${ac_cv_lib_ipc_shmat+:} false; then :
+if test "${ac_cv_lib_ipc_shmat+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -29200,7 +29204,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5
$as_echo "$ac_cv_lib_ipc_shmat" >&6; }
-if test "x$ac_cv_lib_ipc_shmat" = xyes; then :
+if test "x$ac_cv_lib_ipc_shmat" = x""yes; then :
X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
fi
@@ -29218,7 +29222,7 @@
# John Interrante, Karl Berry
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
-if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then :
+if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -29252,7 +29256,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
-if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then :
+if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then :
X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
fi
@@ -30265,7 +30269,7 @@
LDFLAGS="$FREETYPE2_LIBS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FT_Init_FreeType in -lfreetype" >&5
$as_echo_n "checking for FT_Init_FreeType in -lfreetype... " >&6; }
-if ${ac_cv_lib_freetype_FT_Init_FreeType+:} false; then :
+if test "${ac_cv_lib_freetype_FT_Init_FreeType+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -30299,7 +30303,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_freetype_FT_Init_FreeType" >&5
$as_echo "$ac_cv_lib_freetype_FT_Init_FreeType" >&6; }
-if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = xyes; then :
+if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = x""yes; then :
FREETYPE2_FOUND=true
else
as_fn_error $? "Could not find freetype2! $HELP_MSG " "$LINENO" 5
@@ -30587,7 +30591,7 @@
for ac_header in alsa/asoundlib.h
do :
ac_fn_cxx_check_header_mongrel "$LINENO" "alsa/asoundlib.h" "ac_cv_header_alsa_asoundlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_alsa_asoundlib_h" = xyes; then :
+if test "x$ac_cv_header_alsa_asoundlib_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_ALSA_ASOUNDLIB_H 1
_ACEOF
@@ -30646,7 +30650,7 @@
USE_EXTERNAL_LIBJPEG=true
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ljpeg" >&5
$as_echo_n "checking for main in -ljpeg... " >&6; }
-if ${ac_cv_lib_jpeg_main+:} false; then :
+if test "${ac_cv_lib_jpeg_main+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -30674,7 +30678,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_main" >&5
$as_echo "$ac_cv_lib_jpeg_main" >&6; }
-if test "x$ac_cv_lib_jpeg_main" = xyes; then :
+if test "x$ac_cv_lib_jpeg_main" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBJPEG 1
_ACEOF
@@ -30698,7 +30702,7 @@
USE_EXTERNAL_LIBJPEG=true
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lgif" >&5
$as_echo_n "checking for main in -lgif... " >&6; }
-if ${ac_cv_lib_gif_main+:} false; then :
+if test "${ac_cv_lib_gif_main+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -30726,7 +30730,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gif_main" >&5
$as_echo "$ac_cv_lib_gif_main" >&6; }
-if test "x$ac_cv_lib_gif_main" = xyes; then :
+if test "x$ac_cv_lib_gif_main" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBGIF 1
_ACEOF
@@ -30756,7 +30760,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5
$as_echo_n "checking for compress in -lz... " >&6; }
-if ${ac_cv_lib_z_compress+:} false; then :
+if test "${ac_cv_lib_z_compress+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -30790,7 +30794,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress" >&5
$as_echo "$ac_cv_lib_z_compress" >&6; }
-if test "x$ac_cv_lib_z_compress" = xyes; then :
+if test "x$ac_cv_lib_z_compress" = x""yes; then :
ZLIB_FOUND=yes
else
ZLIB_FOUND=no
@@ -30883,7 +30887,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
$as_echo_n "checking for cos in -lm... " >&6; }
-if ${ac_cv_lib_m_cos+:} false; then :
+if test "${ac_cv_lib_m_cos+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -30917,7 +30921,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
$as_echo "$ac_cv_lib_m_cos" >&6; }
-if test "x$ac_cv_lib_m_cos" = xyes; then :
+if test "x$ac_cv_lib_m_cos" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBM 1
_ACEOF
@@ -30941,7 +30945,7 @@
LIBS=""
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -30975,7 +30979,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBDL 1
_ACEOF
@@ -31226,14 +31230,14 @@
###############################################################################
-# How many cores do we have on this build system?
+ # How many cores do we have on this build system?
# Check whether --with-num-cores was given.
if test "${with_num_cores+set}" = set; then :
withval=$with_num_cores;
fi
-if test "x$with_num_cores" = x; then
+ if test "x$with_num_cores" = x; then
# The number of cores were not specified, try to probe them.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for number of cores" >&5
@@ -31259,10 +31263,6 @@
FOUND_CORES=yes
fi
- # For c/c++ code we run twice as many concurrent build
- # jobs than we have cores, otherwise we will stall on io.
- CONCURRENT_BUILD_JOBS=`expr $NUM_CORES \* 2`
-
if test "x$FOUND_CORES" = xyes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $NUM_CORES" >&5
$as_echo "$NUM_CORES" >&6; }
@@ -31274,22 +31274,20 @@
fi
-else
+ else
NUM_CORES=$with_num_cores
- CONCURRENT_BUILD_JOBS=`expr $NUM_CORES \* 2`
-fi
-
-
-
-
-# How much memory do we have on this build system?
+ fi
+
+
+
+ # How much memory do we have on this build system?
# Check whether --with-memory-size was given.
if test "${with_memory_size+set}" = set; then :
withval=$with_memory_size;
fi
-if test "x$with_memory_size" = x; then
+ if test "x$with_memory_size" = x; then
# The memory size was not specified, try to probe it.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for memory size" >&5
@@ -31329,9 +31327,45 @@
$as_echo "$as_me: WARNING: This might seriously impact build performance!" >&2;}
fi
-else
+ else
MEMORY_SIZE=$with_memory_size
-fi
+ fi
+
+
+
+ # Provide a decent default number of parallel jobs for make depending on
+ # number of cores, amount of memory and machine architecture.
+
+# Check whether --with-jobs was given.
+if test "${with_jobs+set}" = set; then :
+ withval=$with_jobs;
+fi
+
+ if test "x$with_jobs" = x; then
+ # Number of jobs was not specified, calculate.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for appropriate number of jobs to run in parallel" >&5
+$as_echo_n "checking for appropriate number of jobs to run in parallel... " >&6; }
+ # Approximate memory in GB, rounding up a bit.
+ memory_gb=`expr $MEMORY_SIZE / 1100`
+ # Pick the lowest of memory in gb and number of cores.
+ if test "$memory_gb" -lt "$NUM_CORES"; then
+ JOBS="$memory_gb"
+ else
+ JOBS="$NUM_CORES"
+ # On bigger machines, leave some room for other processes to run
+ if test "$JOBS" -gt "4"; then
+ JOBS=`expr $JOBS '*' 90 / 100`
+ fi
+ fi
+ # Cap number of jobs to 16
+ if test "$JOBS" -gt "16"; then
+ JOBS=16
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JOBS" >&5
+$as_echo "$JOBS" >&6; }
+ else
+ JOBS=$with_jobs
+ fi
@@ -31619,7 +31653,7 @@
set dummy ccache; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CCACHE+:} false; then :
+if test "${ac_cv_path_CCACHE+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $CCACHE in
@@ -31880,21 +31914,10 @@
:end' >>confcache
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
- if test "x$cache_file" != "x/dev/null"; then
+ test "x$cache_file" != "x/dev/null" &&
{ $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
$as_echo "$as_me: updating cache $cache_file" >&6;}
- if test ! -f "$cache_file" || test -h "$cache_file"; then
- cat confcache >"$cache_file"
- else
- case $cache_file in #(
- */* | ?:*)
- mv -f confcache "$cache_file"$$ &&
- mv -f "$cache_file"$$ "$cache_file" ;; #(
- *)
- mv -f confcache "$cache_file" ;;
- esac
- fi
- fi
+ cat confcache >$cache_file
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -31926,7 +31949,7 @@
-: "${CONFIG_STATUS=./config.status}"
+: ${CONFIG_STATUS=./config.status}
ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -32027,7 +32050,6 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-as_myself=
case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -32335,7 +32357,7 @@
# values after options handling.
ac_log="
This file was extended by OpenJDK $as_me jdk8, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -32398,7 +32420,7 @@
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
OpenJDK config.status jdk8
-configured by $0, generated by GNU Autoconf 2.68,
+configured by $0, generated by GNU Autoconf 2.67,
with options \\"\$ac_cs_config\\"
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -32527,7 +32549,7 @@
"$OUTPUT_ROOT/spec.sh") CONFIG_FILES="$CONFIG_FILES $OUTPUT_ROOT/spec.sh:$AUTOCONF_DIR/spec.sh.in" ;;
"$OUTPUT_ROOT/Makefile") CONFIG_FILES="$CONFIG_FILES $OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in" ;;
- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
esac
done
@@ -32549,10 +32571,9 @@
# after its creation but before its name has been assigned to `$tmp'.
$debug ||
{
- tmp= ac_tmp=
+ tmp=
trap 'exit_status=$?
- : "${ac_tmp:=$tmp}"
- { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
trap 'as_fn_exit 1' 1 2 13 15
}
@@ -32560,13 +32581,12 @@
{
tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
- test -d "$tmp"
+ test -n "$tmp" && test -d "$tmp"
} ||
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
-ac_tmp=$tmp
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
@@ -32588,7 +32608,7 @@
ac_cs_awk_cr=$ac_cr
fi
-echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
_ACEOF
@@ -32616,7 +32636,7 @@
rm -f conf$$subs.sh
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
_ACEOF
sed -n '
h
@@ -32664,7 +32684,7 @@
rm -f conf$$subs.awk
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
_ACAWK
-cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
for (key in S) S_is_set[key] = 1
FS = ""
@@ -32696,7 +32716,7 @@
sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
else
cat
-fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
|| as_fn_error $? "could not setup config files machinery" "$LINENO" 5
_ACEOF
@@ -32730,7 +32750,7 @@
# No need to generate them if there are no CONFIG_HEADERS.
# This happens for instance with `./config.status Makefile'.
if test -n "$CONFIG_HEADERS"; then
-cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
+cat >"$tmp/defines.awk" <<\_ACAWK ||
BEGIN {
_ACEOF
@@ -32742,8 +32762,8 @@
# handling of long lines.
ac_delim='%!_!# '
for ac_last_try in false false :; do
- ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
- if test -z "$ac_tt"; then
+ ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+ if test -z "$ac_t"; then
break
elif $ac_last_try; then
as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
@@ -32844,7 +32864,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
@@ -32863,7 +32883,7 @@
for ac_f
do
case $ac_f in
- -) ac_f="$ac_tmp/stdin";;
+ -) ac_f="$tmp/stdin";;
*) # Look for the file first in the build tree, then in the source tree
# (if the path is not absolute). The absolute path cannot be DOS-style,
# because $ac_f cannot contain `:'.
@@ -32872,7 +32892,7 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
- as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
esac
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
as_fn_append ac_file_inputs " '$ac_f'"
@@ -32898,8 +32918,8 @@
esac
case $ac_tag in
- *:-:* | *:-) cat >"$ac_tmp/stdin" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+ *:-:* | *:-) cat >"$tmp/stdin" \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
esac
;;
esac
@@ -33024,22 +33044,21 @@
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
$ac_datarootdir_hack
"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
- >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
- { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
- "$ac_tmp/out"`; test -z "$ac_out"; } &&
+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined" >&5
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined" >&2;}
- rm -f "$ac_tmp/stdin"
+ rm -f "$tmp/stdin"
case $ac_file in
- -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
- *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+ -) cat "$tmp/out" && rm -f "$tmp/out";;
+ *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
;;
@@ -33050,20 +33069,20 @@
if test x"$ac_file" != x-; then
{
$as_echo "/* $configure_input */" \
- && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
- } >"$ac_tmp/config.h" \
+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+ } >"$tmp/config.h" \
|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
- if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
+ if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
$as_echo "$as_me: $ac_file is unchanged" >&6;}
else
rm -f "$ac_file"
- mv "$ac_tmp/config.h" "$ac_file" \
+ mv "$tmp/config.h" "$ac_file" \
|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
fi
else
$as_echo "/* $configure_input */" \
- && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
|| as_fn_error $? "could not create -" "$LINENO" 5
fi
;;
@@ -33159,7 +33178,7 @@
printf "\n"
printf "Build performance summary:\n"
-printf "* Cores to use: $NUM_CORES\n"
+printf "* Cores to use: $JOBS\n"
printf "* Memory limit: $MEMORY_SIZE MB\n"
printf "* ccache status: $CCACHE_STATUS\n"
printf "\n"
--- a/common/autoconf/help.m4 Tue Mar 05 09:50:53 2013 -0500
+++ b/common/autoconf/help.m4 Tue Mar 05 11:49:33 2013 -0800
@@ -174,7 +174,7 @@
printf "\n"
printf "Build performance summary:\n"
-printf "* Cores to use: $NUM_CORES\n"
+printf "* Cores to use: $JOBS\n"
printf "* Memory limit: $MEMORY_SIZE MB\n"
printf "* ccache status: $CCACHE_STATUS\n"
printf "\n"
--- a/common/autoconf/hotspot-spec.gmk.in Tue Mar 05 09:50:53 2013 -0500
+++ b/common/autoconf/hotspot-spec.gmk.in Tue Mar 05 11:49:33 2013 -0800
@@ -80,7 +80,7 @@
HOTSPOT_MAKE_ARGS:=@HOTSPOT_MAKE_ARGS@ @STATIC_CXX_SETTING@
# This is used from the libjvm build for C/C++ code.
-HOTSPOT_BUILD_JOBS:=@CONCURRENT_BUILD_JOBS@
+HOTSPOT_BUILD_JOBS:=$(JOBS)
# Control wether Hotspot runs Queens test after building
TEST_IN_BUILD=@TEST_IN_BUILD@
--- a/common/autoconf/spec.gmk.in Tue Mar 05 09:50:53 2013 -0500
+++ b/common/autoconf/spec.gmk.in Tue Mar 05 11:49:33 2013 -0800
@@ -260,6 +260,9 @@
# the sjavac server log files.
SJAVAC_SERVER_DIR:=@SJAVAC_SERVER_DIR@
+# Number of parallel jobs to use for compilation
+JOBS?=@JOBS@
+
# The OpenJDK makefiles should be changed to using the standard
# configure output ..._CFLAGS and ..._LIBS. In the meantime we
# extract the information here.
@@ -283,7 +286,7 @@
OPENWIN_HOME:=@OPENWIN_HOME@
# The lowest required version of macosx to enforce compatiblity for
-MACOSX_REQUIRED_VERSION=@MACOSX_REQUIRED_VERSION@
+MACOSX_VERSION_MIN=@MACOSX_VERSION_MIN@
# There are two types: CC or CL
# CC is gcc and others behaving reasonably similar.
--- a/common/autoconf/toolchain.m4 Tue Mar 05 09:50:53 2013 -0500
+++ b/common/autoconf/toolchain.m4 Tue Mar 05 11:49:33 2013 -0800
@@ -876,10 +876,17 @@
fi
if test "x$OPENJDK_TARGET_OS" = xmacosx; then
CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMACOSX -D_ALLBSD_SOURCE"
- # Adding these macros will make it an error to link to mac APIs newer than OS version 10.7
- MACOSX_REQUIRED_VERSION=1070
- AC_SUBST(MACOSX_REQUIRED_VERSION)
- CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(MACOSX_REQUIRED_VERSION) -DMAC_OS_X_VERSION_MIN_REQUIRED=\$(MACOSX_REQUIRED_VERSION)"
+ # Setting these parameters makes it an error to link to macosx APIs that are
+ # newer than the given OS version and makes the linked binaries compatible even
+ # if built on a newer version of the OS.
+ # The expected format is X.Y.Z
+ MACOSX_VERSION_MIN=10.7.0
+ AC_SUBST(MACOSX_VERSION_MIN)
+ # The macro takes the version with no dots, ex: 1070
+ # Let the flags variables get resolved in make for easier override on make
+ # command line.
+ CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MIN)) -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
+ LDFLAGS_JDK="$LDFLAGS_JDK -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
fi
if test "x$OPENJDK_TARGET_OS" = xbsd; then
CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DBSD -D_ALLBSD_SOURCE"
--- a/common/makefiles/JavaCompilation.gmk Tue Mar 05 09:50:53 2013 -0500
+++ b/common/makefiles/JavaCompilation.gmk Tue Mar 05 11:49:33 2013 -0800
@@ -501,7 +501,7 @@
$(ECHO) Compiling $1
($$($1_JVM) $$($1_SJAVAC) \
$$($1_REMOTE) \
- -j $(NUM_CORES) \
+ -j $(JOBS) \
--permit-unidentified-artifacts \
--permit-sources-without-package \
--compare-found-sources $$($1_BIN)/_the.batch.tmp \
--- a/common/makefiles/Main.gmk Tue Mar 05 09:50:53 2013 -0500
+++ b/common/makefiles/Main.gmk Tue Mar 05 11:49:33 2013 -0800
@@ -58,9 +58,6 @@
# Setup number of jobs to use. -jN is unfortunately not available for us to parse from the command line,
# hence this workaround.
-ifeq ($(JOBS),)
- JOBS=$(NUM_CORES)
-endif
MAKE_ARGS:=$(MAKE_ARGS) -j$(JOBS)
### Main targets
--- a/corba/.hgtags Tue Mar 05 09:50:53 2013 -0500
+++ b/corba/.hgtags Tue Mar 05 11:49:33 2013 -0800
@@ -199,3 +199,5 @@
d4e68ce17795601017ac2f952baad7272942c36e jdk8-b75
58be6ca3c0603882a1ec478724e337aac85e0da0 jdk8-b76
35684a40c5845782324dbcc9ac8969528020ff61 jdk8-b77
+27d6368ae8ba570c31c2f0e696d39c99fa2f4538 jdk8-b78
+e41fb1aa0329767b2737303c994e38bede1baa07 jdk8-b79
--- a/hotspot/.hgtags Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/.hgtags Tue Mar 05 11:49:33 2013 -0800
@@ -316,3 +316,7 @@
412d722168bc23f8e6d98995202728678561417f hs25-b18
cdb46031e7184d37301288f5719121a63c7054b5 jdk8-b77
9f19f4a7d48a4ebe7f616b6068971ea5f8b075fa hs25-b19
+d5e12e7d2f719144d84903d9151455661c47b476 jdk8-b78
+555ec35a250783110aa070dbc8a8603f6cabe41f hs25-b20
+6691814929b606fe0e7954fd6e485dd876505c83 jdk8-b79
+df5396524152118535c36da5801d828b560d19a2 hs25-b21
--- a/hotspot/agent/make/Makefile Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/agent/make/Makefile Tue Mar 05 11:49:33 2013 -0800
@@ -19,7 +19,7 @@
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
# or visit www.oracle.com if you need additional information or have any
# questions.
-#
+#
#
# This guards against adding broken .java files to the directory
@@ -42,8 +42,6 @@
sun.jvm.hotspot \
sun.jvm.hotspot.asm \
sun.jvm.hotspot.asm.sparc \
-sun.jvm.hotspot.bugspot \
-sun.jvm.hotspot.bugspot.tree \
sun.jvm.hotspot.c1 \
sun.jvm.hotspot.ci \
sun.jvm.hotspot.code \
@@ -84,7 +82,6 @@
sun.jvm.hotspot.gc_interface \
sun.jvm.hotspot.interpreter \
sun.jvm.hotspot.jdi \
-sun.jvm.hotspot.livejvm \
sun.jvm.hotspot.memory \
sun.jvm.hotspot.opto \
sun.jvm.hotspot.oops \
@@ -130,8 +127,6 @@
sun/jvm/hotspot/*.java \
sun/jvm/hotspot/asm/*.java \
sun/jvm/hotspot/asm/sparc/*.java \
-sun/jvm/hotspot/bugspot/*.java \
-sun/jvm/hotspot/bugspot/tree/*.java \
sun/jvm/hotspot/c1/*.java \
sun/jvm/hotspot/ci/*.java \
sun/jvm/hotspot/code/*.java \
@@ -168,7 +163,6 @@
sun/jvm/hotspot/gc_implementation/shared/*.java \
sun/jvm/hotspot/interpreter/*.java \
sun/jvm/hotspot/jdi/*.java \
-sun/jvm/hotspot/livejvm/*.java \
sun/jvm/hotspot/memory/*.java \
sun/jvm/hotspot/oops/*.java \
sun/jvm/hotspot/opto/*.java \
@@ -205,7 +199,7 @@
sun/jvm/hotspot/utilities/memo/*.java \
sun/jvm/hotspot/utilities/soql/*.java \
com/sun/java/swing/action/*.java \
-com/sun/java/swing/ui/*.java
+com/sun/java/swing/ui/*.java
#END FILELIST
ifneq "x$(ALT_BOOTDIR)" "x"
@@ -231,7 +225,7 @@
OUTPUT_DIR = $(BUILD_DIR)/classes
DOC_DIR = $(BUILD_DIR)/doc
-# gnumake 3.78.1 does not accept the *s,
+# gnumake 3.78.1 does not accept the *s,
# so use the shell to expand them
ALLFILES := $(patsubst %,$(SRC_DIR)/%,$(FILELIST))
ALLFILES := $(shell /bin/ls $(ALLFILES))
@@ -303,7 +297,7 @@
cscope: $(ALLFILES)
rm -f java.files
echo $(ALLFILES) > java.files
- cscope -b -i java.files -f java.out
+ cscope -b -i java.files -f java.out
rm -f java.files
.PHONY: sa.jar
--- a/hotspot/agent/make/bugspot.bat Tue Mar 05 09:50:53 2013 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-REM
-REM Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
-REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-REM
-REM This code is free software; you can redistribute it and/or modify it
-REM under the terms of the GNU General Public License version 2 only, as
-REM published by the Free Software Foundation.
-REM
-REM This code is distributed in the hope that it will be useful, but WITHOUT
-REM ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-REM FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-REM version 2 for more details (a copy is included in the LICENSE file that
-REM accompanied this code).
-REM
-REM You should have received a copy of the GNU General Public License version
-REM 2 along with this work; if not, write to the Free Software Foundation,
-REM Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-REM
-REM Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-REM or visit www.oracle.com if you need additional information or have any
-REM questions.
-REM
-REM
-
-java -showversion -cp ..\build\classes;..\src\share\lib\js.jar;.\sa.jar;lib\js.jar sun.jvm.hotspot.bugspot.Main
--- a/hotspot/agent/make/marks_notes.html Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/agent/make/marks_notes.html Tue Mar 05 11:49:33 2013 -0800
@@ -26,14 +26,12 @@
<ul>
<li><code>java -cp classes sun.jvm.hotspot.HSDB</code>
- <li><code>java -cp classes sun.jvm.hotspot.bugspot.Main</code>
</ul>
<h2>Feedback</h2>
<p>
Refactoring of package hierarchy. All user interface components should be in
- the ui package. Perhaps: sun.jvm.hotspot.ui.hsdb.Main for the HSDB and
- sun.jvm.hotspot.ui.bugspot.Main for BugSpot.
+ the ui package. Perhaps: sun.jvm.hotspot.ui.hsdb.Main for the HSDB.
<p>
The src\share\vm\agent area seems like a workspace so it should be organized like
one. In particular, I'd like to suggest the following directory layout:<br>
@@ -47,7 +45,7 @@
</ul>
<p>
- Seems like there is a lot of redundant functionality. Between the HSDB and BugSpot. Perhaps
+ Seems like there is a lot of redundant functionality. Perhaps
this can be consolidated with a <code>javax.swing.Actions</code> architecture.
<h2>Tasklist</h2>
@@ -55,11 +53,7 @@
<p>
<b>Stack memory pane</b>:
It's one of the more useful JVM debugging tools in the SA. However, it
- doesn't support any interaction with the text; the Memory Panel in BugSpot
- was written afterward (with help from Shannon) and implements proper
- selection, scrolling, and drag-and-drop, but no annotations. I'm not sure how
- to integrate the annotations with the JTable that's being used for the memory
- view; if you have suggestions here please let me know.
+ doesn't support any interaction with the text.
<p>
<b>Integrations with the NetBeans architecture (plug in).</b> See the
<a href="http://openide.netbeans.org">Netbeans Open APIs homepage</a>
--- a/hotspot/agent/src/os/bsd/MacosxDebuggerLocal.m Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/agent/src/os/bsd/MacosxDebuggerLocal.m Tue Mar 05 11:49:33 2013 -0800
@@ -38,6 +38,8 @@
#import <dlfcn.h>
#import <limits.h>
#import <errno.h>
+#import <sys/types.h>
+#import <sys/ptrace.h>
jboolean debug = JNI_FALSE;
@@ -430,6 +432,73 @@
return (jint) usable_tid;
}
+
+static bool ptrace_continue(pid_t pid, int signal) {
+ // pass the signal to the process so we don't swallow it
+ int res;
+ if ((res = ptrace(PT_CONTINUE, pid, (caddr_t)1, signal)) < 0) {
+ fprintf(stderr, "attach: ptrace(PT_CONTINUE, %d) failed with %d\n", pid, res);
+ return false;
+ }
+ return true;
+}
+
+// waits until the ATTACH has stopped the process
+// by signal SIGSTOP
+static bool ptrace_waitpid(pid_t pid) {
+ int ret;
+ int status;
+ while (true) {
+ // Wait for debuggee to stop.
+ ret = waitpid(pid, &status, 0);
+ if (ret >= 0) {
+ if (WIFSTOPPED(status)) {
+ // Any signal will stop the thread, make sure it is SIGSTOP. Otherwise SIGSTOP
+ // will still be pending and delivered when the process is DETACHED and the process
+ // will go to sleep.
+ if (WSTOPSIG(status) == SIGSTOP) {
+ // Debuggee stopped by SIGSTOP.
+ return true;
+ }
+ if (!ptrace_continue(pid, WSTOPSIG(status))) {
+ fprintf(stderr, "attach: Failed to correctly attach to VM. VM might HANG! [PTRACE_CONT failed, stopped by %d]\n", WSTOPSIG(status));
+ return false;
+ }
+ } else {
+ fprintf(stderr, "attach: waitpid(): Child process exited/terminated (status = 0x%x)\n", status);
+ return false;
+ }
+ } else {
+ switch (errno) {
+ case EINTR:
+ continue;
+ break;
+ case ECHILD:
+ fprintf(stderr, "attach: waitpid() failed. Child process pid (%d) does not exist \n", pid);
+ break;
+ case EINVAL:
+ fprintf(stderr, "attach: waitpid() failed. Invalid options argument.\n");
+ break;
+ default:
+ fprintf(stderr, "attach: waitpid() failed. Unexpected error %d\n",errno);
+ break;
+ }
+ return false;
+ }
+ }
+}
+
+// attach to a process/thread specified by "pid"
+static bool ptrace_attach(pid_t pid) {
+ int res;
+ if ((res = ptrace(PT_ATTACH, pid, 0, 0)) < 0) {
+ fprintf(stderr, "ptrace(PT_ATTACH, %d) failed with %d\n", pid, res);
+ return false;
+ } else {
+ return ptrace_waitpid(pid);
+ }
+}
+
/*
* Class: sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal
* Method: attach0
@@ -445,7 +514,8 @@
else
debug = JNI_FALSE;
if (debug) printf("attach0 called for jpid=%d\n", (int)jpid);
-
+
+ // get the task from the pid
kern_return_t result;
task_t gTask = 0;
result = task_for_pid(mach_task_self(), jpid, &gTask);
@@ -455,6 +525,13 @@
}
putTask(env, this_obj, gTask);
+ // use ptrace to stop the process
+ // on os x, ptrace only needs to be called on the process, not the individual threads
+ if (ptrace_attach(jpid) != true) {
+ mach_port_deallocate(mach_task_self(), gTask);
+ THROW_NEW_DEBUGGER_EXCEPTION("Can't attach to the process");
+ }
+
id symbolicator = nil;
id jrsSymbolicator = objc_lookUpClass("JRSSymbolicator");
if (jrsSymbolicator != nil) {
@@ -486,6 +563,21 @@
if (debug) printf("detach0 called\n");
task_t gTask = getTask(env, this_obj);
+
+ // detach from the ptraced process causing it to resume execution
+ int pid;
+ kern_return_t k_res;
+ k_res = pid_for_task(gTask, &pid);
+ if (k_res != KERN_SUCCESS) {
+ fprintf(stderr, "detach: pid_for_task(%d) failed (%d)\n", pid, k_res);
+ }
+ else {
+ int res = ptrace(PT_DETACH, pid, 0, 0);
+ if (res < 0) {
+ fprintf(stderr, "detach: ptrace(PT_DETACH, %d) failed (%d)\n", pid, res);
+ }
+ }
+
mach_port_deallocate(mach_task_self(), gTask);
id symbolicator = getSymbolicator(env, this_obj);
if (symbolicator != nil) {
--- a/hotspot/agent/src/os/bsd/libproc_impl.c Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/agent/src/os/bsd/libproc_impl.c Tue Mar 05 11:49:33 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, 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
@@ -91,6 +91,14 @@
}
}
+void print_error(const char* format,...) {
+ va_list alist;
+ va_start(alist, format);
+ fputs("ERROR: ", stderr);
+ vfprintf(stderr, format, alist);
+ va_end(alist);
+}
+
bool is_debug() {
return _libsaproc_debug;
}
--- a/hotspot/agent/src/os/bsd/libproc_impl.h Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/agent/src/os/bsd/libproc_impl.h Tue Mar 05 11:49:33 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, 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
@@ -107,6 +107,7 @@
int pathmap_open(const char* name);
void print_debug(const char* format,...);
+void print_error(const char* format,...);
bool is_debug();
typedef bool (*thread_info_callback)(struct ps_prochandle* ph, pthread_t pid, lwpid_t lwpid);
--- a/hotspot/agent/src/os/bsd/ps_proc.c Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/agent/src/os/bsd/ps_proc.c Tue Mar 05 11:49:33 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, 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
@@ -129,42 +129,66 @@
return (errno == 0)? true: false;
}
+static bool ptrace_continue(pid_t pid, int signal) {
+ // pass the signal to the process so we don't swallow it
+ if (ptrace(PTRACE_CONT, pid, NULL, signal) < 0) {
+ print_debug("ptrace(PTRACE_CONT, ..) failed for %d\n", pid);
+ return false;
+ }
+ return true;
+}
+
+// waits until the ATTACH has stopped the process
+// by signal SIGSTOP
+static bool ptrace_waitpid(pid_t pid) {
+ int ret;
+ int status;
+ do {
+ // Wait for debuggee to stop.
+ ret = waitpid(pid, &status, 0);
+ if (ret >= 0) {
+ if (WIFSTOPPED(status)) {
+ // Any signal will stop the thread, make sure it is SIGSTOP. Otherwise SIGSTOP
+ // will still be pending and delivered when the process is DETACHED and the process
+ // will go to sleep.
+ if (WSTOPSIG(status) == SIGSTOP) {
+ // Debuggee stopped by SIGSTOP.
+ return true;
+ }
+ if (!ptrace_continue(pid, WSTOPSIG(status))) {
+ print_error("Failed to correctly attach to VM. VM might HANG! [PTRACE_CONT failed, stopped by %d]\n", WSTOPSIG(status));
+ return false;
+ }
+ } else {
+ print_debug("waitpid(): Child process exited/terminated (status = 0x%x)\n", status);
+ return false;
+ }
+ } else {
+ switch (errno) {
+ case EINTR:
+ continue;
+ break;
+ case ECHILD:
+ print_debug("waitpid() failed. Child process pid (%d) does not exist \n", pid);
+ break;
+ case EINVAL:
+ print_debug("waitpid() failed. Invalid options argument.\n");
+ break;
+ default:
+ print_debug("waitpid() failed. Unexpected error %d\n",errno);
+ }
+ return false;
+ }
+ } while(true);
+}
+
// attach to a process/thread specified by "pid"
static bool ptrace_attach(pid_t pid) {
if (ptrace(PT_ATTACH, pid, NULL, 0) < 0) {
print_debug("ptrace(PTRACE_ATTACH, ..) failed for %d\n", pid);
return false;
} else {
- int ret;
- int status;
- do {
- // Wait for debuggee to stop.
- ret = waitpid(pid, &status, 0);
- if (ret >= 0) {
- if (WIFSTOPPED(status)) {
- // Debuggee stopped.
- return true;
- } else {
- print_debug("waitpid(): Child process exited/terminated (status = 0x%x)\n", status);
- return false;
- }
- } else {
- switch (errno) {
- case EINTR:
- continue;
- break;
- case ECHILD:
- print_debug("waitpid() failed. Child process pid (%d) does not exist \n", pid);
- break;
- case EINVAL:
- print_debug("waitpid() failed. Invalid options argument.\n");
- break;
- default:
- print_debug("waitpid() failed. Unexpected error %d\n",errno);
- }
- return false;
- }
- } while(true);
+ return ptrace_waitpid(pid);
}
}
--- a/hotspot/agent/src/os/linux/libproc_impl.c Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/agent/src/os/linux/libproc_impl.c Tue Mar 05 11:49:33 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, 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
@@ -92,6 +92,14 @@
}
}
+void print_error(const char* format,...) {
+ va_list alist;
+ va_start(alist, format);
+ fputs("ERROR: ", stderr);
+ vfprintf(stderr, format, alist);
+ va_end(alist);
+}
+
bool is_debug() {
return _libsaproc_debug;
}
--- a/hotspot/agent/src/os/linux/libproc_impl.h Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/agent/src/os/linux/libproc_impl.h Tue Mar 05 11:49:33 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, 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
@@ -105,6 +105,7 @@
int pathmap_open(const char* name);
void print_debug(const char* format,...);
+void print_error(const char* format,...);
bool is_debug();
typedef bool (*thread_info_callback)(struct ps_prochandle* ph, pthread_t pid, lwpid_t lwpid);
--- a/hotspot/agent/src/os/linux/ps_proc.c Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/agent/src/os/linux/ps_proc.c Tue Mar 05 11:49:33 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, 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
@@ -25,6 +25,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <signal.h>
#include <errno.h>
#include <sys/ptrace.h>
#include "libproc_impl.h"
@@ -142,46 +143,71 @@
}
+static bool ptrace_continue(pid_t pid, int signal) {
+ // pass the signal to the process so we don't swallow it
+ if (ptrace(PTRACE_CONT, pid, NULL, signal) < 0) {
+ print_debug("ptrace(PTRACE_CONT, ..) failed for %d\n", pid);
+ return false;
+ }
+ return true;
+}
+
+// waits until the ATTACH has stopped the process
+// by signal SIGSTOP
+static bool ptrace_waitpid(pid_t pid) {
+ int ret;
+ int status;
+ while (true) {
+ // Wait for debuggee to stop.
+ ret = waitpid(pid, &status, 0);
+ if (ret == -1 && errno == ECHILD) {
+ // try cloned process.
+ ret = waitpid(pid, &status, __WALL);
+ }
+ if (ret >= 0) {
+ if (WIFSTOPPED(status)) {
+ // Any signal will stop the thread, make sure it is SIGSTOP. Otherwise SIGSTOP
+ // will still be pending and delivered when the process is DETACHED and the process
+ // will go to sleep.
+ if (WSTOPSIG(status) == SIGSTOP) {
+ // Debuggee stopped by SIGSTOP.
+ return true;
+ }
+ if (!ptrace_continue(pid, WSTOPSIG(status))) {
+ print_error("Failed to correctly attach to VM. VM might HANG! [PTRACE_CONT failed, stopped by %d]\n", WSTOPSIG(status));
+ return false;
+ }
+ } else {
+ print_debug("waitpid(): Child process exited/terminated (status = 0x%x)\n", status);
+ return false;
+ }
+ } else {
+ switch (errno) {
+ case EINTR:
+ continue;
+ break;
+ case ECHILD:
+ print_debug("waitpid() failed. Child process pid (%d) does not exist \n", pid);
+ break;
+ case EINVAL:
+ print_debug("waitpid() failed. Invalid options argument.\n");
+ break;
+ default:
+ print_debug("waitpid() failed. Unexpected error %d\n",errno);
+ break;
+ }
+ return false;
+ }
+ }
+}
+
// attach to a process/thread specified by "pid"
static bool ptrace_attach(pid_t pid) {
if (ptrace(PTRACE_ATTACH, pid, NULL, NULL) < 0) {
print_debug("ptrace(PTRACE_ATTACH, ..) failed for %d\n", pid);
return false;
} else {
- int ret;
- int status;
- do {
- // Wait for debuggee to stop.
- ret = waitpid(pid, &status, 0);
- if (ret == -1 && errno == ECHILD) {
- // try cloned process.
- ret = waitpid(pid, &status, __WALL);
- }
- if (ret >= 0) {
- if (WIFSTOPPED(status)) {
- // Debuggee stopped.
- return true;
- } else {
- print_debug("waitpid(): Child process exited/terminated (status = 0x%x)\n", status);
- return false;
- }
- } else {
- switch (errno) {
- case EINTR:
- continue;
- break;
- case ECHILD:
- print_debug("waitpid() failed. Child process pid (%d) does not exist \n", pid);
- break;
- case EINVAL:
- print_debug("waitpid() failed. Invalid options argument.\n");
- break;
- default:
- print_debug("waitpid() failed. Unexpected error %d\n",errno);
- }
- return false;
- }
- } while(true);
+ return ptrace_waitpid(pid);
}
}
--- a/hotspot/agent/src/os/win32/windbg/sawindbg.cpp Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/agent/src/os/win32/windbg/sawindbg.cpp Tue Mar 05 11:49:33 2013 -0800
@@ -372,8 +372,7 @@
We are attaching to a process in 'read-only' mode. i.e., we do not want to
put breakpoints, suspend/resume threads etc. For read-only JDI and HSDB kind of
- usage this should suffice. We are not intending to use this for full-fledged
- ProcessControl implementation to be used with BugSpotAgent.
+ usage this should suffice.
Please refer to DEBUG_ATTACH_NONINVASIVE mode source comments from dbgeng.h.
In this mode, debug engine does not call DebugActiveProrcess. i.e., we are not
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/asm/amd64/AMD64FloatRegister.java Tue Mar 05 09:50:53 2013 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2003, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.asm.amd64;
-
-import sun.jvm.hotspot.asm.Register;
-import sun.jvm.hotspot.utilities.Assert;
-
-public class AMD64FloatRegister extends Register {
-
- public AMD64FloatRegister(int number) {
- super(number);
- }
-
- public int getNumber() {
- return number;
- }
-
- public int getNumberOfRegisters() {
- return AMD64FloatRegisters.getNumRegisters();
- }
-
- public boolean isFloat() {
- return true;
- }
-
- public boolean isFramePointer() {
- return false;
- }
-
- public boolean isStackPointer() {
- return false;
- }
-
- public boolean isValid() {
- return number >= 0 && number < AMD64FloatRegisters.getNumRegisters();
- }
-
- public String toString() {
- return AMD64FloatRegisters.getRegisterName(number);
- }
-
-}
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpot.java Tue Mar 05 09:50:53 2013 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1536 +0,0 @@
-/*
- * Copyright (c) 2001, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.bugspot;
-
-import java.awt.*;
-import java.awt.event.*;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import javax.swing.*;
-import javax.swing.filechooser.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.debugger.cdbg.*;
-import sun.jvm.hotspot.debugger.posix.*;
-import sun.jvm.hotspot.debugger.windbg.*;
-import sun.jvm.hotspot.livejvm.*;
-import sun.jvm.hotspot.memory.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.ui.*;
-import sun.jvm.hotspot.utilities.*;
-
-/** The BugSpot component. This is embeddable in an application by
- virtue of its being a JComponent. It (currently) requires the use
- of a menu bar which can be fetched via getMenuBar(). This is
- intended ultimately to replace HSDB. */
-
-public class BugSpot extends JPanel {
- public BugSpot() {
- super();
- Runtime.getRuntime().addShutdownHook(new java.lang.Thread() {
- public void run() {
- detachDebugger();
- }
- });
- }
-
- /** Turn on or off MDI (Multiple Document Interface) mode. When MDI
- is enabled, the BugSpot component contains a JDesktopPane and all
- windows are JInternalFrames. When disabled, only the menu bar is
- relevant. */
- public void setMDIMode(boolean onOrOff) {
- mdiMode = onOrOff;
- }
-
- /** Indicates whether MDI mode is enabled. */
- public boolean getMDIMode() {
- return mdiMode;
- }
-
- /** Build user interface widgets. This must be called before adding
- the BugSpot component to its parent. */
- public void build() {
- setLayout(new BorderLayout());
-
- menuBar = new JMenuBar();
-
- attachMenuItems = new java.util.ArrayList();
- detachMenuItems = new java.util.ArrayList();
- debugMenuItems = new java.util.ArrayList();
- suspendDebugMenuItems = new java.util.ArrayList();
- resumeDebugMenuItems = new java.util.ArrayList();
-
- //
- // File menu
- //
-
- JMenu menu = createMenu("File", 'F', 0);
- JMenuItem item;
- item = createMenuItem("Open source file...",
- new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- openSourceFile();
- }
- },
- KeyEvent.VK_O, InputEvent.CTRL_MASK,
- 'O', 0);
- menu.add(item);
- detachMenuItems.add(item);
-
- menu.addSeparator();
-
- item = createMenuItem("Attach to process...",
- new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- showAttachDialog();
- }
- },
- 'A', 0);
- menu.add(item);
- attachMenuItems.add(item);
-
- item = createMenuItem("Detach",
- new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- detach();
- }
- },
- 'D', 0);
- menu.add(item);
- detachMenuItems.add(item);
-
- // Disable detach menu items at first
- setMenuItemsEnabled(detachMenuItems, false);
-
- menu.addSeparator();
-
- menu.add(createMenuItem("Exit",
- new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- detach();
- System.exit(0);
- }
- },
- 'x', 1));
-
- menuBar.add(menu);
-
- //
- // Debug menu
- //
-
- debugMenu = createMenu("Debug", 'D', 0);
- item = createMenuItem("Go",
- new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- if (!attached) return;
- if (!isSuspended()) return;
- resume();
- }
- },
- KeyEvent.VK_F5, 0,
- 'G', 0);
- debugMenu.add(item);
- resumeDebugMenuItems.add(item);
-
- item = createMenuItem("Break",
- new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- if (!attached) {
- System.err.println("Not attached");
- return;
- }
- if (isSuspended()) {
- System.err.println("Already suspended");
- return;
- }
- suspend();
- }
- },
- 'B', 0);
- debugMenu.add(item);
- suspendDebugMenuItems.add(item);
-
- debugMenu.addSeparator();
-
- item = createMenuItem("Threads...",
- new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- showThreadsDialog();
- }
- },
- 'T', 0);
- debugMenu.add(item);
- debugMenuItems.add(item);
- // FIXME: belongs under "View -> Debug Windows"
- item = createMenuItem("Memory",
- new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- showMemoryDialog();
- }
- },
- 'M', 0);
- debugMenu.add(item);
- debugMenuItems.add(item);
-
- debugMenu.setEnabled(false);
- menuBar.add(debugMenu);
-
- if (mdiMode) {
- desktop = new JDesktopPane();
- add(desktop, BorderLayout.CENTER);
- }
-
- fixedWidthFont = GraphicsUtilities.lookupFont("Courier");
-
- debugEventTimer = new javax.swing.Timer(100, new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- pollForDebugEvent();
- }
- });
- }
-
- public JMenuBar getMenuBar() {
- return menuBar;
- }
-
- public void showAttachDialog() {
- setMenuItemsEnabled(attachMenuItems, false);
- final FrameWrapper attachDialog = newFrame("Attach to process");
- attachDialog.getContentPane().setLayout(new BorderLayout());
- attachDialog.setClosable(true);
- attachDialog.setResizable(true);
-
- JPanel panel = new JPanel();
- panel.setLayout(new BorderLayout());
- panel.setBorder(GraphicsUtilities.newBorder(5));
- attachDialog.setBackground(panel.getBackground());
-
- JPanel listPanel = new JPanel();
- listPanel.setLayout(new BorderLayout());
- final ProcessListPanel plist = new ProcessListPanel(getLocalDebugger());
- panel.add(plist, BorderLayout.CENTER);
- JCheckBox check = new JCheckBox("Update list continuously");
- check.addItemListener(new ItemListener() {
- public void itemStateChanged(ItemEvent e) {
- if (e.getStateChange() == ItemEvent.SELECTED) {
- plist.start();
- } else {
- plist.stop();
- }
- }
- });
- listPanel.add(plist, BorderLayout.CENTER);
- listPanel.add(check, BorderLayout.SOUTH);
- panel.add(listPanel, BorderLayout.CENTER);
- attachDialog.getContentPane().add(panel, BorderLayout.CENTER);
- attachDialog.setClosingActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- plist.stop();
- setMenuItemsEnabled(attachMenuItems, true);
- }
- });
-
- ActionListener attacher = new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- plist.stop();
- attachDialog.setVisible(false);
- removeFrame(attachDialog);
- ProcessInfo info = plist.getSelectedProcess();
- if (info != null) {
- attach(info.getPid());
- }
- }
- };
-
- Box hbox = Box.createHorizontalBox();
- hbox.add(Box.createGlue());
- JButton button = new JButton("OK");
- button.addActionListener(attacher);
- hbox.add(button);
- hbox.add(Box.createHorizontalStrut(20));
- button = new JButton("Cancel");
- button.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- plist.stop();
- attachDialog.setVisible(false);
- removeFrame(attachDialog);
- setMenuItemsEnabled(attachMenuItems, true);
- }
- });
- hbox.add(button);
- hbox.add(Box.createGlue());
- panel = new JPanel();
- panel.setBorder(GraphicsUtilities.newBorder(5));
- panel.add(hbox);
-
- attachDialog.getContentPane().add(panel, BorderLayout.SOUTH);
-
- addFrame(attachDialog);
- attachDialog.pack();
- attachDialog.setSize(400, 300);
- GraphicsUtilities.centerInContainer(attachDialog.getComponent(),
- getParentDimension(attachDialog.getComponent()));
- attachDialog.setVisible(true);
- }
-
- public void showThreadsDialog() {
- final FrameWrapper threadsDialog = newFrame("Threads");
- threadsDialog.getContentPane().setLayout(new BorderLayout());
- threadsDialog.setClosable(true);
- threadsDialog.setResizable(true);
-
- ThreadListPanel threads = new ThreadListPanel(getCDebugger(), getAgent().isJavaMode());
- threads.addListener(new ThreadListPanel.Listener() {
- public void setFocus(ThreadProxy thread, JavaThread jthread) {
- setCurrentThread(thread);
- // FIXME: print this to GUI, bring some windows to foreground
- System.err.println("Focus changed to thread " + thread);
- }
- });
- threads.setBorder(GraphicsUtilities.newBorder(5));
- threadsDialog.getContentPane().add(threads);
- addFrame(threadsDialog);
- threadsDialog.pack();
- GraphicsUtilities.reshapeToAspectRatio(threadsDialog.getComponent(),
- 3.0f,
- 0.9f,
- getParentDimension(threadsDialog.getComponent()));
- GraphicsUtilities.centerInContainer(threadsDialog.getComponent(),
- getParentDimension(threadsDialog.getComponent()));
- threadsDialog.setVisible(true);
- }
-
- public void showMemoryDialog() {
- final FrameWrapper memoryDialog = newFrame("Memory");
- memoryDialog.getContentPane().setLayout(new BorderLayout());
- memoryDialog.setClosable(true);
- memoryDialog.setResizable(true);
-
- memoryDialog.getContentPane().add(new MemoryViewer(getDebugger(),
- (getDebugger().getMachineDescription().getAddressSize() == 8)),
- BorderLayout.CENTER);
- addFrame(memoryDialog);
- memoryDialog.pack();
- GraphicsUtilities.reshapeToAspectRatio(memoryDialog.getComponent(),
- 1.0f,
- 0.7f,
- getParentDimension(memoryDialog.getComponent()));
- GraphicsUtilities.centerInContainer(memoryDialog.getComponent(),
- getParentDimension(memoryDialog.getComponent()));
- memoryDialog.setVisible(true);
- }
-
- /** Changes the editor factory this debugger uses to display source
- code. Specified factory may be null, in which case the default
- factory is used. */
- public void setEditorFactory(EditorFactory fact) {
- if (fact != null) {
- editorFact = fact;
- } else {
- editorFact = new DefaultEditorFactory();
- }
- }
-
- //----------------------------------------------------------------------
- // Internals only below this point
- //
-
- private WorkerThread workerThread;
- private boolean mdiMode;
- private JVMDebugger localDebugger;
- private BugSpotAgent agent = new BugSpotAgent();
- private JMenuBar menuBar;
- /** List <JMenuItem> */
- private java.util.List attachMenuItems;
- private java.util.List detachMenuItems;
- private java.util.List debugMenuItems;
- private java.util.List suspendDebugMenuItems;
- private java.util.List resumeDebugMenuItems;
- private FrameWrapper stackFrame;
- private VariablePanel localsPanel;
- private StackTracePanel stackTracePanel;
- private FrameWrapper registerFrame;
- private RegisterPanel registerPanel;
- // Used for mixed-language stack traces
- private Map threadToJavaThreadMap;
-
- private JMenu debugMenu;
-
- // MDI mode only: desktop pane
- private JDesktopPane desktop;
-
- // Attach/detach state
- private boolean attached;
-
- // Suspension (combined Java/C++) state
- private boolean suspended;
-
- // Fixed-width font
- private Font fixedWidthFont;
-
- // Breakpoint setting
- // Maps Strings to List/*<LineNumberInfo>*/
- private Map sourceFileToLineNumberInfoMap;
- // Maps Strings (file names) to Sets of Integers (line numbers)
- private Map fileToBreakpointMap;
-
- // Debug events
- private javax.swing.Timer debugEventTimer;
-
- // Java debug events
- private boolean javaEventPending;
-
- static class BreakpointResult {
- private boolean success;
- private boolean set;
- private int lineNo;
- private String why;
-
- /** For positive results */
- BreakpointResult(boolean success, boolean set, int lineNo) {
- this(success, set, lineNo, null);
- }
-
- /** For negative results */
- BreakpointResult(boolean success, boolean set, int lineNo, String why) {
- this.success = success;
- this.set = set;
- this.lineNo = lineNo;
- this.why = why;
- }
-
- public boolean succeeded() {
- return success;
- }
-
- public boolean set() {
- return set;
- }
-
- /** Line at which the breakpoint was actually set; only valid if
- succeeded() returns true */
- public int getLine() {
- return lineNo;
- }
-
- public String getWhy() {
- return why;
- }
- }
-
-
- // Editors for source code. File name-to-Editor mapping.
- private Map editors;
- private EditorFactory editorFact = new DefaultEditorFactory();
- private EditorCommands editorComm = new EditorCommands() {
- public void windowClosed(Editor editor) {
- editors.remove(editor.getSourceFileName());
- }
-
- public void toggleBreakpointAtLine(Editor editor, int lineNumber) {
- // FIXME: handle "lazy" breakpoints where the source file has
- // been opened with some other mechanism (File -> Open) and we
- // don't have debug information pointing to that file yet
- // FIXME: NOT FINISHED
-
- BreakpointResult res =
- handleBreakpointToggle(editor, lineNumber);
- if (res.succeeded()) {
- if (res.set()) {
- editor.showBreakpointAtLine(res.getLine());
- } else {
- editor.clearBreakpointAtLine(res.getLine());
- }
- } else {
- String why = res.getWhy();
- if (why == null) {
- why = "";
- } else {
- why = ": " + why;
- }
- showMessageDialog("Unable to toggle breakpoint" + why,
- "Unable to toggle breakpoint",
- JOptionPane.WARNING_MESSAGE);
- }
- }
- };
-
- private void attach(final int pid) {
- try {
- getAgent().attach(pid);
- setMenuItemsEnabled(detachMenuItems, true);
- setMenuItemsEnabled(suspendDebugMenuItems, false);
- setMenuItemsEnabled(resumeDebugMenuItems, true);
- debugMenu.setEnabled(true);
- attached = true;
- suspended = true;
-
- if (getAgent().isJavaMode()) {
- System.err.println("Java HotSpot(TM) virtual machine detected.");
- } else {
- System.err.println("(No Java(TM) virtual machine detected)");
- }
-
- // Set up editor map
- editors = new HashMap();
-
- // Initialize breakpoints
- fileToBreakpointMap = new HashMap();
-
- // Create combined stack trace and local variable panel
- JPanel framePanel = new JPanel();
- framePanel.setLayout(new BorderLayout());
- framePanel.setBorder(GraphicsUtilities.newBorder(5));
- localsPanel = new VariablePanel();
- JTabbedPane tab = new JTabbedPane();
- tab.addTab("Locals", localsPanel);
- tab.setTabPlacement(JTabbedPane.BOTTOM);
- framePanel.add(tab, BorderLayout.CENTER);
- JPanel stackPanel = new JPanel();
- stackPanel.setLayout(new BoxLayout(stackPanel, BoxLayout.X_AXIS));
- stackPanel.add(new JLabel("Context:"));
- stackPanel.add(Box.createHorizontalStrut(5));
- stackTracePanel = new StackTracePanel();
- stackTracePanel.addListener(new StackTracePanel.Listener() {
- public void frameChanged(CFrame fr, JavaVFrame jfr) {
- setCurrentFrame(fr, jfr);
- }
- });
- stackPanel.add(stackTracePanel);
- framePanel.add(stackPanel, BorderLayout.NORTH);
- stackFrame = newFrame("Stack");
- stackFrame.getContentPane().setLayout(new BorderLayout());
- stackFrame.getContentPane().add(framePanel, BorderLayout.CENTER);
- stackFrame.setResizable(true);
- stackFrame.setClosable(false);
- addFrame(stackFrame);
- stackFrame.setSize(400, 200);
- GraphicsUtilities.moveToInContainer(stackFrame.getComponent(), 0.0f, 1.0f, 0, 20);
- stackFrame.setVisible(true);
-
- // Create register panel
- registerPanel = new RegisterPanel();
- registerPanel.setFont(fixedWidthFont);
- registerFrame = newFrame("Registers");
- registerFrame.getContentPane().setLayout(new BorderLayout());
- registerFrame.getContentPane().add(registerPanel, BorderLayout.CENTER);
- addFrame(registerFrame);
- registerFrame.setResizable(true);
- registerFrame.setClosable(false);
- registerFrame.setSize(225, 200);
- GraphicsUtilities.moveToInContainer(registerFrame.getComponent(),
- 1.0f, 0.0f, 0, 0);
- registerFrame.setVisible(true);
-
- resetCurrentThread();
- } catch (DebuggerException e) {
- final String errMsg = formatMessage(e.getMessage(), 80);
- setMenuItemsEnabled(attachMenuItems, true);
- showMessageDialog("Unable to connect to process ID " + pid + ":\n\n" + errMsg,
- "Unable to Connect",
- JOptionPane.WARNING_MESSAGE);
- getAgent().detach();
- }
- }
-
- private synchronized void detachDebugger() {
- if (!attached) {
- return;
- }
- if (isSuspended()) {
- resume(); // Necessary for JVMDI resumption
- }
- getAgent().detach();
- // FIXME: clear out breakpoints (both Java and C/C++) from target
- // process
- sourceFileToLineNumberInfoMap = null;
- fileToBreakpointMap = null;
- threadToJavaThreadMap = null;
- editors = null;
- attached = false;
- }
-
- private synchronized void detach() {
- detachDebugger();
- setMenuItemsEnabled(attachMenuItems, true);
- setMenuItemsEnabled(detachMenuItems, false);
- debugMenu.setEnabled(false);
- if (mdiMode) {
- // FIXME: is this sufficient, or will I have to do anything else
- // to the components to kill them off? What about WorkerThreads?
- desktop.removeAll();
- desktop.invalidate();
- desktop.validate();
- desktop.repaint();
- }
- // FIXME: keep track of all windows and close them even in non-MDI
- // mode
- debugEventTimer.stop();
- }
-
- // Returns a Debugger for processes on the local machine. This is
- // only used to fetch the process list.
- private Debugger getLocalDebugger() {
- if (localDebugger == null) {
- String os = PlatformInfo.getOS();
- String cpu = PlatformInfo.getCPU();
-
- if (os.equals("win32")) {
- if (!cpu.equals("x86")) {
- throw new DebuggerException("Unsupported CPU \"" + cpu + "\" for Windows");
- }
-
- localDebugger = new WindbgDebuggerLocal(new MachineDescriptionIntelX86(), true);
- } else if (os.equals("linux")) {
- if (!cpu.equals("x86")) {
- throw new DebuggerException("Unsupported CPU \"" + cpu + "\" for Linux");
- }
-
- // FIXME: figure out how to specify path to debugger module
- throw new RuntimeException("FIXME: figure out how to specify path to debugger module");
- // localDebugger = new PosixDebuggerLocal(new MachineDescriptionIntelX86(), true);
- } else {
- // FIXME: port to Solaris
- throw new DebuggerException("Unsupported OS \"" + os + "\"");
- }
-
- // FIXME: we require that the primitive type sizes be configured
- // in order to use basic functionality in class Address such as
- // the fetching of floating-point values. There are a lot of
- // assumptions in the current code that Java floats and doubles
- // are of equivalent size to C values. The configurability of the
- // primitive type sizes hasn't seemed necessary and in this kind
- // of debugging scenario (namely, debugging arbitrary C++
- // processes) it appears difficult to support that kind of
- // flexibility.
- localDebugger.configureJavaPrimitiveTypeSizes(1, 1, 2, 8, 4, 4, 8, 2);
- }
-
- return localDebugger;
- }
-
- private BugSpotAgent getAgent() {
- return agent;
- }
-
- private Debugger getDebugger() {
- return getAgent().getDebugger();
- }
-
- private CDebugger getCDebugger() {
- return getAgent().getCDebugger();
- }
-
- private void resetCurrentThread() {
- setCurrentThread((ThreadProxy) getCDebugger().getThreadList().get(0));
- }
-
- private void setCurrentThread(ThreadProxy t) {
- // Create stack trace
- // FIXME: add ability to intermix C/Java frames
- java.util.List trace = new ArrayList();
- CFrame fr = getCDebugger().topFrameForThread(t);
- while (fr != null) {
- trace.add(new StackTraceEntry(fr, getCDebugger()));
- try {
- fr = fr.sender(t);
- } catch (AddressException e) {
- e.printStackTrace();
- showMessageDialog("Error while walking stack; stack trace will be truncated\n(see console for details)",
- "Error walking stack",
- JOptionPane.WARNING_MESSAGE);
- fr = null;
- }
- }
- JavaThread jthread = javaThreadForProxy(t);
- if (jthread != null) {
- // Java mode, and we have a Java thread.
- // Find all Java frames on the stack. We currently do this in a
- // manner which involves minimal interaction between the Java
- // and C/C++ debugging systems: any C frame which has a PC in an
- // unknown location (i.e., not in any DSO) is assumed to be a
- // Java frame. We merge stack segments of unknown frames with
- // segments of Java frames beginning with native methods.
- java.util.List javaTrace = new ArrayList();
- VFrame vf = jthread.getLastJavaVFrameDbg();
- while (vf != null) {
- if (vf.isJavaFrame()) {
- javaTrace.add(new StackTraceEntry((JavaVFrame) vf));
- vf = vf.sender();
- }
- }
- // Merge stack traces
- java.util.List mergedTrace = new ArrayList();
- int c = 0;
- int j = 0;
- while (c < trace.size()) {
- StackTraceEntry entry = (StackTraceEntry) trace.get(c);
- if (entry.isUnknownCFrame()) {
- boolean gotJavaFrame = false;
- while (j < javaTrace.size()) {
- StackTraceEntry javaEntry = (StackTraceEntry) javaTrace.get(j);
- JavaVFrame jvf = javaEntry.getJavaFrame();
- Method m = jvf.getMethod();
- if (!m.isNative() || !gotJavaFrame) {
- gotJavaFrame = true;
- mergedTrace.add(javaEntry);
- ++j;
- } else {
- break; // Reached native method; have intervening C frames
- }
- }
- if (gotJavaFrame) {
- // Skip this sequence of unknown frames, as we've
- // successfully identified it as Java frames
- while (c < trace.size() && entry.isUnknownCFrame()) {
- ++c;
- if (c < trace.size()) {
- entry = (StackTraceEntry) trace.get(c);
- }
- }
- continue;
- }
- }
- // If we get here, we either have an unknown frame we didn't
- // know how to categorize or we have a known C frame. Add it
- // to the trace.
- mergedTrace.add(entry);
- ++c;
- }
- trace = mergedTrace;
- }
- stackTracePanel.setTrace(trace);
-
- registerPanel.update(t);
- }
-
- private void setCurrentFrame(CFrame fr, JavaVFrame jfr) {
- localsPanel.clear();
-
- if (fr != null) {
- localsPanel.update(fr);
-
- // FIXME: load source file if we can find it, otherwise display disassembly
- LoadObject lo = getCDebugger().loadObjectContainingPC(fr.pc());
- if (lo != null) {
- CDebugInfoDataBase db = lo.getDebugInfoDataBase();
- if (db != null) {
- LineNumberInfo info = db.lineNumberForPC(fr.pc());
- if (info != null) {
- System.err.println("PC " + fr.pc() + ": Source file \"" +
- info.getSourceFileName() +
- "\", line number " +
- info.getLineNumber() +
- ", PC range [" +
- info.getStartPC() +
- ", " +
- info.getEndPC() +
- ")");
- // OK, here we go...
- showLineNumber(null, info.getSourceFileName(), info.getLineNumber());
- } else {
- System.err.println("(No line number information for PC " + fr.pc() + ")");
- // Dump line number information for database
- db.iterate(new LineNumberVisitor() {
- public void doLineNumber(LineNumberInfo info) {
- System.err.println(" Source file \"" +
- info.getSourceFileName() +
- "\", line number " +
- info.getLineNumber() +
- ", PC range [" +
- info.getStartPC() +
- ", " +
- info.getEndPC() +
- ")");
- }
- });
- }
- }
- }
- } else {
- if (Assert.ASSERTS_ENABLED) {
- Assert.that(jfr != null, "Must have either C or Java frame");
- }
- localsPanel.update(jfr);
- // See whether we can locate source file and line number
- // FIXME: infer pathmap entries from user's locating of this
- // source file
- // FIXME: figure out what to do for native methods. Possible to
- // go to line number for the native method declaration?
- Method m = jfr.getMethod();
- Symbol sfn = ((InstanceKlass) m.getMethodHolder()).getSourceFileName();
- if (sfn != null) {
- int bci = jfr.getBCI();
- int lineNo = m.getLineNumberFromBCI(bci);
- if (lineNo >= 0) {
- // FIXME: show disassembly otherwise
- showLineNumber(packageName(m.getMethodHolder().getName().asString()),
- sfn.asString(), lineNo);
- }
- }
- }
- }
-
- private String packageName(String str) {
- int idx = str.lastIndexOf('/');
- if (idx < 0) {
- return "";
- }
- return str.substring(0, idx).replace('/', '.');
- }
-
- private JavaThread javaThreadForProxy(ThreadProxy t) {
- if (!getAgent().isJavaMode()) {
- return null;
- }
- if (threadToJavaThreadMap == null) {
- threadToJavaThreadMap = new HashMap();
- Threads threads = VM.getVM().getThreads();
- for (JavaThread thr = threads.first(); thr != null; thr = thr.next()) {
- threadToJavaThreadMap.put(thr.getThreadProxy(), thr);
- }
- }
- return (JavaThread) threadToJavaThreadMap.get(t);
- }
-
- private static JMenu createMenu(String name, char mnemonic, int mnemonicPos) {
- JMenu menu = new JMenu(name);
- menu.setMnemonic(mnemonic);
- menu.setDisplayedMnemonicIndex(mnemonicPos);
- return menu;
- }
-
- private static JMenuItem createMenuItem(String name, ActionListener l) {
- JMenuItem item = new JMenuItem(name);
- item.addActionListener(l);
- return item;
- }
-
- private static JMenuItem createMenuItemInternal(String name, ActionListener l, int accelerator, int modifiers) {
- JMenuItem item = createMenuItem(name, l);
- item.setAccelerator(KeyStroke.getKeyStroke(accelerator, modifiers));
- return item;
- }
-
- private static JMenuItem createMenuItem(String name, ActionListener l, int accelerator) {
- return createMenuItemInternal(name, l, accelerator, 0);
- }
-
- private static JMenuItem createMenuItem(String name, ActionListener l, char mnemonic, int mnemonicPos) {
- JMenuItem item = createMenuItem(name, l);
- item.setMnemonic(mnemonic);
- item.setDisplayedMnemonicIndex(mnemonicPos);
- return item;
- }
-
- private static JMenuItem createMenuItem(String name,
- ActionListener l,
- int accelerator,
- int acceleratorMods,
- char mnemonic,
- int mnemonicPos) {
- JMenuItem item = createMenuItemInternal(name, l, accelerator, acceleratorMods);
- item.setMnemonic(mnemonic);
- item.setDisplayedMnemonicIndex(mnemonicPos);
- return item;
- }
-
- /** Punctuates the given string with \n's where necessary to not
- exceed the given number of characters per line. Strips
- extraneous whitespace. */
- private static String formatMessage(String message, int charsPerLine) {
- StringBuffer buf = new StringBuffer(message.length());
- StringTokenizer tokenizer = new StringTokenizer(message);
- int curLineLength = 0;
- while (tokenizer.hasMoreTokens()) {
- String tok = tokenizer.nextToken();
- if (curLineLength + tok.length() > charsPerLine) {
- buf.append('\n');
- curLineLength = 0;
- } else {
- if (curLineLength != 0) {
- buf.append(' ');
- ++curLineLength;
- }
- }
- buf.append(tok);
- curLineLength += tok.length();
- }
- return buf.toString();
- }
-
- private void setMenuItemsEnabled(java.util.List items, boolean enabled) {
- for (Iterator iter = items.iterator(); iter.hasNext(); ) {
- ((JMenuItem) iter.next()).setEnabled(enabled);
- }
- }
-
- private void showMessageDialog(final String message, final String title, final int jOptionPaneKind) {
- SwingUtilities.invokeLater(new Runnable() {
- public void run() {
- if (mdiMode) {
- JOptionPane.showInternalMessageDialog(desktop, message, title, jOptionPaneKind);
- } else {
- JOptionPane.showMessageDialog(null, message, title, jOptionPaneKind);
- }
- }
- });
- }
-
- private FrameWrapper newFrame(String title) {
- if (mdiMode) {
- return new JInternalFrameWrapper(new JInternalFrame(title));
- } else {
- return new JFrameWrapper(new JFrame(title));
- }
- }
-
- private void addFrame(FrameWrapper frame) {
- if (mdiMode) {
- desktop.add(frame.getComponent());
- }
- }
-
- private void removeFrame(FrameWrapper frame) {
- if (mdiMode) {
- desktop.remove(frame.getComponent());
- desktop.invalidate();
- desktop.validate();
- desktop.repaint();
- }
- // FIXME: do something when not in MDI mode
- }
-
- private Dimension getParentDimension(Component c) {
- if (mdiMode) {
- return desktop.getSize();
- } else {
- return Toolkit.getDefaultToolkit().getScreenSize();
- }
- }
-
- // Default editor implementation
- class DefaultEditor implements Editor {
- private DefaultEditorFactory factory;
- private FrameWrapper editorFrame;
- private String filename;
- private SourceCodePanel code;
- private boolean shown;
- private Object userData;
-
- public DefaultEditor(DefaultEditorFactory fact, String filename, final EditorCommands comm) {
- this.filename = filename;
- this.factory = fact;
- editorFrame = newFrame(filename);
- code = new SourceCodePanel();
- // FIXME: when font changes, change font in editors as well
- code.setFont(fixedWidthFont);
- editorFrame.getContentPane().add(code);
- editorFrame.setClosable(true);
- editorFrame.setResizable(true);
- editorFrame.setClosingActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- comm.windowClosed(DefaultEditor.this);
- removeFrame(editorFrame);
- editorFrame.dispose();
- factory.editorClosed(DefaultEditor.this);
- }
- });
- editorFrame.setActivatedActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- factory.makeEditorCurrent(DefaultEditor.this);
- code.requestFocus();
- }
- });
- code.setEditorCommands(comm, this);
- }
-
- public boolean openFile() { return code.openFile(filename); }
- public String getSourceFileName() { return filename; }
- public int getCurrentLineNumber() { return code.getCurrentLineNumber(); }
- public void showLineNumber(int lineNo) {
- if (!shown) {
- addFrame(editorFrame);
- GraphicsUtilities.reshapeToAspectRatio(editorFrame.getComponent(),
- 1.0f,
- 0.85f,
- getParentDimension(editorFrame.getComponent()));
- editorFrame.setVisible(true);
- shown = true;
- }
- code.showLineNumber(lineNo);
- editorFrame.toFront();
- }
- public void highlightLineNumber(int lineNo) { code.highlightLineNumber(lineNo); }
- public void showBreakpointAtLine(int lineNo) { code.showBreakpointAtLine(lineNo); }
- public boolean hasBreakpointAtLine(int lineNo) { return code.hasBreakpointAtLine(lineNo); }
- public void clearBreakpointAtLine(int lineNo) { code.clearBreakpointAtLine(lineNo); }
- public void clearBreakpoints() { code.clearBreakpoints(); }
- public void setUserData(Object o) { userData = o; }
- public Object getUserData() { return userData; }
- public void toFront() { editorFrame.toFront();
- factory.makeEditorCurrent(this); }
- }
-
- class DefaultEditorFactory implements EditorFactory {
- private LinkedList/*<Editor>*/ editors = new LinkedList();
-
- public Editor openFile(String filename, EditorCommands commands) {
- DefaultEditor editor = new DefaultEditor(this, filename, editorComm);
- if (!editor.openFile()) {
- return null;
- }
- return editor;
- }
-
- public Editor getCurrentEditor() {
- if (editors.isEmpty()) {
- return null;
- }
- return (Editor) editors.getFirst();
- }
-
- void editorClosed(Editor editor) {
- editors.remove(editor);
- }
-
- void makeEditorCurrent(Editor editor) {
- editors.remove(editor);
- editors.addFirst(editor);
- }
- }
-
- // Helper class for loading .java files; show only those with
- // correct file name which are also in the correct package
- static class JavaFileFilter extends javax.swing.filechooser.FileFilter {
- private String packageName;
- private String fileName;
-
- JavaFileFilter(String packageName, String fileName) {
- this.packageName = packageName;
- this.fileName = fileName;
- }
-
- public boolean accept(File f) {
- if (f.isDirectory()) {
- return true;
- }
- // This rejects most files
- if (!f.getName().equals(fileName)) {
- return false;
- }
- // Ensure selected file is in the correct package
- PackageScanner scanner = new PackageScanner();
- String pkg = scanner.scan(f);
- if (!pkg.equals(packageName)) {
- return false;
- }
- return true;
- }
-
- public String getDescription() { return "Java source files"; }
- }
-
- // Auxiliary information used only for Java source files
- static class JavaUserData {
- private String packageName; // External format
- private String sourceFileName;
-
- /** Source file name is equivalent to that found in the .java
- file; i.e., not a full path */
- JavaUserData(String packageName, String sourceFileName) {
- this.packageName = packageName;
- this.sourceFileName = sourceFileName;
- }
-
- String packageName() { return packageName; }
- String sourceFileName() { return sourceFileName; }
- }
-
- // Opens a source file. This makes it available for the setting of
- // lazy breakpoints.
- private void openSourceFile() {
- JFileChooser chooser = new JFileChooser();
- chooser.setDialogTitle("Open source code file");
- chooser.setMultiSelectionEnabled(false);
- if (chooser.showOpenDialog(null) != JFileChooser.APPROVE_OPTION) {
- return;
- }
- File chosen = chooser.getSelectedFile();
- if (chosen == null) {
- return;
- }
-
- // See whether we have a Java source file. If so, derive a package
- // name for it.
- String path = chosen.getPath();
- String name = null;
- JavaUserData data = null;
- if (path.endsWith(".java")) {
- PackageScanner scanner = new PackageScanner();
- String pkg = scanner.scan(chosen);
- // Now knowing both the package name and file name, we can put
- // this in the editor map and use it for setting breakpoints
- // later
- String fileName = chosen.getName();
- name = pkg + "." + fileName;
- data = new JavaUserData(pkg, fileName);
- } else {
- // FIXME: need pathmap mechanism
- name = path;
- }
- Editor editor = (Editor) editors.get(name);
- if (editor == null) {
- editor = editorFact.openFile(path, editorComm);
- if (editor == null) {
- showMessageDialog("Unable to open file \"" + path + "\" -- unexpected error.",
- "Unable to open file",
- JOptionPane.WARNING_MESSAGE);
- return;
- }
- editors.put(name, editor);
- if (data != null) {
- editor.setUserData(data);
- }
- } else {
- editor.toFront();
- }
- editor.showLineNumber(1);
- // Show breakpoints as well if we have any for this file
- Set set = (Set) fileToBreakpointMap.get(editor.getSourceFileName());
- if (set != null) {
- for (Iterator iter = set.iterator(); iter.hasNext(); ) {
- editor.showBreakpointAtLine(((Integer) iter.next()).intValue());
- }
- }
- }
-
- // Package name may be null, in which case the file is assumed to be
- // a C source file. Otherwise it is assumed to be a Java source file
- // and certain filtering rules will be applied.
- private void showLineNumber(String packageName, String fileName, int lineNumber) {
- String name;
- if (packageName == null) {
- name = fileName;
- } else {
- name = packageName + "." + fileName;
- }
- Editor editor = (Editor) editors.get(name);
- if (editor == null) {
- // See whether file exists
- File file = new File(fileName);
- String realFileName = fileName;
- if (!file.exists()) {
- // User must specify path to file
- JFileChooser chooser = new JFileChooser();
- chooser.setDialogTitle("Please locate " + fileName);
- chooser.setMultiSelectionEnabled(false);
- if (packageName != null) {
- chooser.setFileFilter(new JavaFileFilter(packageName, fileName));
- }
- int res = chooser.showOpenDialog(null);
- if (res != JFileChooser.APPROVE_OPTION) {
- // FIXME: show disassembly instead
- return;
- }
- // FIXME: would like to infer more from the selection; i.e.,
- // a pathmap leading up to this file
- File chosen = chooser.getSelectedFile();
- if (chosen == null) {
- return;
- }
- realFileName = chosen.getPath();
- }
- // Now instruct editor factory to open file
- editor = editorFact.openFile(realFileName, editorComm);
- if (editor == null) {
- showMessageDialog("Unable to open file \"" + realFileName + "\" -- unexpected error.",
- "Unable to open file",
- JOptionPane.WARNING_MESSAGE);
- return;
- }
- // Got an editor; put it in map
- editors.put(name, editor);
- // If Java source file, add additional information for later
- if (packageName != null) {
- editor.setUserData(new JavaUserData(packageName, fileName));
- }
- }
- // Got editor; show line
- editor.showLineNumber(lineNumber);
- editor.highlightLineNumber(lineNumber);
- // Show breakpoints as well if we have any for this file
- Set set = (Set) fileToBreakpointMap.get(editor.getSourceFileName());
- if (set != null) {
- for (Iterator iter = set.iterator(); iter.hasNext(); ) {
- editor.showBreakpointAtLine(((Integer) iter.next()).intValue());
- }
- }
- }
-
- //
- // Suspend/resume
- //
-
- private boolean isSuspended() {
- return suspended;
- }
-
- private synchronized void suspend() {
- setMenuItemsEnabled(resumeDebugMenuItems, true);
- setMenuItemsEnabled(suspendDebugMenuItems, false);
- BugSpotAgent agent = getAgent();
- if (agent.canInteractWithJava() && !agent.isJavaSuspended()) {
- agent.suspendJava();
- }
- agent.suspend();
- // FIXME: call VM.getVM().fireVMSuspended()
- resetCurrentThread();
- debugEventTimer.stop();
- suspended = true;
- }
-
- private synchronized void resume() {
- // Note: we don't wipe out the cached state like the
- // sourceFileToLineNumberInfoMap since it is too expensive to
- // recompute. Instead we recompute it if any DLLs are loaded or
- // unloaded.
- threadToJavaThreadMap = null;
- setMenuItemsEnabled(resumeDebugMenuItems, false);
- setMenuItemsEnabled(suspendDebugMenuItems, true);
- registerPanel.clear();
- // FIXME: call VM.getVM().fireVMResumed()
- BugSpotAgent agent = getAgent();
- agent.resume();
- if (agent.canInteractWithJava()) {
- if (agent.isJavaSuspended()) {
- agent.resumeJava();
- }
- if (javaEventPending) {
- javaEventPending = false;
- // Clear it out before resuming polling for events
- agent.javaEventContinue();
- }
- }
- agent.enableJavaInteraction();
- suspended = false;
- debugEventTimer.start();
- }
-
- //
- // Breakpoints
- //
-
- private synchronized BreakpointResult handleBreakpointToggle(Editor editor, int lineNumber) {
- // Currently we only use user data in editors to indicate Java
- // source files. If this changes then this code will need to
- // change.
- JavaUserData data = (JavaUserData) editor.getUserData();
- String filename = editor.getSourceFileName();
- if (data == null) {
- // C/C++ code
- // FIXME: as noted above in EditorCommands.toggleBreakpointAtLine,
- // this needs more work to handle "lazy" breakpoints in files
- // which we don't know about in the debug information yet
- CDebugger dbg = getCDebugger();
- ProcessControl prctl = dbg.getProcessControl();
- if (prctl == null) {
- return new BreakpointResult(false, false, 0, "Process control not enabled");
- }
- boolean mustSuspendAndResume = (!prctl.isSuspended());
- try {
- if (mustSuspendAndResume) {
- prctl.suspend();
- }
- // Search debug info for all DSOs
- LineNumberInfo info = getLineNumberInfo(filename, lineNumber);
- if (info != null) {
- Set bpset = (Set) fileToBreakpointMap.get(filename);
- if (bpset == null) {
- bpset = new HashSet();
- fileToBreakpointMap.put(filename, bpset);
- }
- Integer key = new Integer(info.getLineNumber());
- if (bpset.contains(key)) {
- // Clear breakpoint at this line's PC
- prctl.clearBreakpoint(info.getStartPC());
- bpset.remove(key);
- return new BreakpointResult(true, false, info.getLineNumber());
- } else {
- // Set breakpoint at this line's PC
- System.err.println("Setting breakpoint at PC " + info.getStartPC());
- prctl.setBreakpoint(info.getStartPC());
- bpset.add(key);
- return new BreakpointResult(true, true, info.getLineNumber());
- }
- } else {
- return new BreakpointResult(false, false, 0, "No debug information for this source file and line");
- }
- } finally {
- if (mustSuspendAndResume) {
- prctl.resume();
- }
- }
- } else {
- BugSpotAgent agent = getAgent();
- if (!agent.canInteractWithJava()) {
- String why;
- if (agent.isJavaInteractionDisabled()) {
- why = "Can not toggle Java breakpoints while stopped because\nof C/C++ debug events (breakpoints, single-stepping)";
- } else {
- why = "Could not talk to SA's JVMDI module to enable Java\nprogramming language breakpoints (run with -Xdebug -Xrunsa)";
- }
- return new BreakpointResult(false, false, 0, why);
- }
- Set bpset = (Set) fileToBreakpointMap.get(filename);
- if (bpset == null) {
- bpset = new HashSet();
- fileToBreakpointMap.put(filename, bpset);
- }
- boolean mustResumeAndSuspend = isSuspended();
- try {
- if (mustResumeAndSuspend) {
- agent.resume();
- }
- ServiceabilityAgentJVMDIModule.BreakpointToggleResult res =
- getAgent().toggleJavaBreakpoint(data.sourceFileName(),
- data.packageName(),
- lineNumber);
- if (res.getSuccess()) {
- Integer key = new Integer(res.getLineNumber());
- boolean addRemRes = false;
- if (res.getWasSet()) {
- addRemRes = bpset.add(key);
- System.err.println("Setting breakpoint at " + res.getMethodName() + res.getMethodSignature() +
- ", bci " + res.getBCI() + ", line " + res.getLineNumber());
- } else {
- addRemRes = bpset.remove(key);
- System.err.println("Clearing breakpoint at " + res.getMethodName() + res.getMethodSignature() +
- ", bci " + res.getBCI() + ", line " + res.getLineNumber());
- }
- if (Assert.ASSERTS_ENABLED) {
- Assert.that(addRemRes, "Inconsistent Java breakpoint state with respect to target process");
- }
- return new BreakpointResult(true, res.getWasSet(), res.getLineNumber());
- } else {
- return new BreakpointResult(false, false, 0, res.getErrMsg());
- }
- } finally {
- if (mustResumeAndSuspend) {
- agent.suspend();
- resetCurrentThread();
- }
- }
- }
- }
-
- // Must call only when suspended
- private LineNumberInfo getLineNumberInfo(String filename, int lineNumber) {
- Map map = getSourceFileToLineNumberInfoMap();
- java.util.List infos = (java.util.List) map.get(filename);
- if (infos == null) {
- return null;
- }
- // Binary search for line number
- return searchLineNumbers(infos, lineNumber, 0, infos.size());
- }
-
- // Must call only when suspended
- private Map getSourceFileToLineNumberInfoMap() {
- if (sourceFileToLineNumberInfoMap == null) {
- // Build from debug info
- java.util.List loadObjects = getCDebugger().getLoadObjectList();
- final Map map = new HashMap();
- for (Iterator iter = loadObjects.iterator(); iter.hasNext(); ) {
- LoadObject lo = (LoadObject) iter.next();
- CDebugInfoDataBase db = lo.getDebugInfoDataBase();
- if (db != null) {
- db.iterate(new LineNumberVisitor() {
- public void doLineNumber(LineNumberInfo info) {
- String name = info.getSourceFileName();
- if (name != null) {
- java.util.List val = (java.util.List) map.get(name);
- if (val == null) {
- val = new ArrayList();
- map.put(name, val);
- }
- val.add(info);
- }
- }
- });
- }
- }
- // Sort all lists
- for (Iterator iter = map.values().iterator(); iter.hasNext(); ) {
- java.util.List list = (java.util.List) iter.next();
- Collections.sort(list, new Comparator() {
- public int compare(Object o1, Object o2) {
- LineNumberInfo l1 = (LineNumberInfo) o1;
- LineNumberInfo l2 = (LineNumberInfo) o2;
- int n1 = l1.getLineNumber();
- int n2 = l2.getLineNumber();
- if (n1 < n2) return -1;
- if (n1 == n2) return 0;
- return 1;
- }
- });
- }
- sourceFileToLineNumberInfoMap = map;
- }
- return sourceFileToLineNumberInfoMap;
- }
-
- private LineNumberInfo searchLineNumbers(java.util.List infoList, int lineNo, int lowIdx, int highIdx) {
- if (highIdx < lowIdx) return null;
- if (lowIdx == highIdx) {
- // Base case: see whether start PC is less than or equal to addr
- if (checkLineNumber(infoList, lineNo, lowIdx)) {
- return (LineNumberInfo) infoList.get(lowIdx);
- } else {
- return null;
- }
- } else if (lowIdx == highIdx - 1) {
- if (checkLineNumber(infoList, lineNo, lowIdx)) {
- return (LineNumberInfo) infoList.get(lowIdx);
- } else if (checkLineNumber(infoList, lineNo, highIdx)) {
- return (LineNumberInfo) infoList.get(highIdx);
- } else {
- return null;
- }
- }
- int midIdx = (lowIdx + highIdx) >> 1;
- LineNumberInfo info = (LineNumberInfo) infoList.get(midIdx);
- if (lineNo < info.getLineNumber()) {
- // Always move search down
- return searchLineNumbers(infoList, lineNo, lowIdx, midIdx);
- } else if (lineNo == info.getLineNumber()) {
- return info;
- } else {
- // Move search up
- return searchLineNumbers(infoList, lineNo, midIdx, highIdx);
- }
- }
-
- private boolean checkLineNumber(java.util.List infoList, int lineNo, int idx) {
- LineNumberInfo info = (LineNumberInfo) infoList.get(idx);
- return (info.getLineNumber() >= lineNo);
- }
-
- //
- // Debug events
- //
-
- private synchronized void pollForDebugEvent() {
- ProcessControl prctl = getCDebugger().getProcessControl();
- if (prctl == null) {
- return;
- }
- DebugEvent ev = prctl.debugEventPoll();
- if (ev != null) {
- DebugEvent.Type t = ev.getType();
- if (t == DebugEvent.Type.LOADOBJECT_LOAD ||
- t == DebugEvent.Type.LOADOBJECT_UNLOAD) {
- // Conservatively clear cached debug info state
- sourceFileToLineNumberInfoMap = null;
- // FIXME: would be very useful to have "stop on load/unload"
- // events
- // FIXME: must do work at these events to implement lazy
- // breakpoints
- prctl.debugEventContinue();
- } else if (t == DebugEvent.Type.BREAKPOINT) {
- // Note: Visual C++ only notifies on breakpoints it doesn't
- // know about
-
- // FIXME: put back test
- // if (!prctl.isBreakpointSet(ev.getPC())) {
- showMessageDialog("Breakpoint reached at PC " + ev.getPC(),
- "Breakpoint reached",
- JOptionPane.INFORMATION_MESSAGE);
- // }
- agent.disableJavaInteraction();
- suspend();
- prctl.debugEventContinue();
- } else if (t == DebugEvent.Type.SINGLE_STEP) {
- agent.disableJavaInteraction();
- suspend();
- prctl.debugEventContinue();
- } else if (t == DebugEvent.Type.ACCESS_VIOLATION) {
- showMessageDialog("Access violation attempting to " +
- (ev.getWasWrite() ? "write" : "read") +
- " address " + ev.getAddress() +
- " at PC " + ev.getPC(),
- "Access Violation",
- JOptionPane.WARNING_MESSAGE);
- agent.disableJavaInteraction();
- suspend();
- prctl.debugEventContinue();
- } else {
- String info = "Unknown debug event encountered";
- if (ev.getUnknownEventDetail() != null) {
- info = info + ": " + ev.getUnknownEventDetail();
- }
- showMessageDialog(info, "Unknown debug event", JOptionPane.INFORMATION_MESSAGE);
- suspend();
- prctl.debugEventContinue();
- }
- return;
- }
-
- // No C++ debug event; poll for Java debug event
- if (getAgent().canInteractWithJava()) {
- if (!javaEventPending) {
- if (getAgent().javaEventPending()) {
- suspend();
- // This does a lot of work and we want to have the page
- // cache available to us as it runs
- sun.jvm.hotspot.livejvm.Event jev = getAgent().javaEventPoll();
- if (jev != null) {
- javaEventPending = true;
- if (jev.getType() == sun.jvm.hotspot.livejvm.Event.Type.BREAKPOINT) {
- BreakpointEvent bpev = (BreakpointEvent) jev;
- showMessageDialog("Breakpoint reached in method\n" +
- bpev.methodID().method().externalNameAndSignature() +
- ",\nbci " + bpev.location(),
- "Breakpoint reached",
- JOptionPane.INFORMATION_MESSAGE);
- } else if (jev.getType() == sun.jvm.hotspot.livejvm.Event.Type.EXCEPTION) {
- ExceptionEvent exev = (ExceptionEvent) jev;
- showMessageDialog(exev.exception().getKlass().getName().asString() +
- "\nthrown in method\n" +
- exev.methodID().method().externalNameAndSignature() +
- "\nat BCI " + exev.location(),
- "Exception thrown",
- JOptionPane.INFORMATION_MESSAGE);
- } else {
- Assert.that(false, "Should not reach here");
- }
- }
- }
- }
- }
- }
-}
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java Tue Mar 05 09:50:53 2013 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,799 +0,0 @@
-/*
- * 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.bugspot;
-
-import java.io.PrintStream;
-import java.net.*;
-import java.rmi.*;
-import sun.jvm.hotspot.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.debugger.bsd.*;
-import sun.jvm.hotspot.debugger.proc.*;
-import sun.jvm.hotspot.debugger.cdbg.*;
-import sun.jvm.hotspot.debugger.windbg.*;
-import sun.jvm.hotspot.debugger.linux.*;
-import sun.jvm.hotspot.debugger.sparc.*;
-import sun.jvm.hotspot.debugger.remote.*;
-import sun.jvm.hotspot.livejvm.*;
-import sun.jvm.hotspot.memory.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.*;
-
-/** <P> This class wraps the basic functionality for connecting to the
- * target process or debug server. It makes it simple to start up the
- * debugging system. </P>
- *
- * <P> This agent (as compared to the HotSpotAgent) can connect to
- * and interact with arbitrary processes. If the target process
- * happens to be a HotSpot JVM, the Java debugging features of the
- * Serviceability Agent are enabled. Further, if the Serviceability
- * Agent's JVMDI module is loaded into the target VM, interaction
- * with the live Java program is possible, specifically the catching
- * of exceptions and setting of breakpoints. </P>
- *
- * <P> The BugSpot debugger requires that the underlying Debugger
- * support C/C++ debugging via the CDebugger interface. </P>
- *
- * <P> FIXME: especially with the addition of remote debugging, this
- * has turned into a mess; needs rethinking. </P> */
-
-public class BugSpotAgent {
-
- private JVMDebugger debugger;
- private MachineDescription machDesc;
- private TypeDataBase db;
-
- private String os;
- private String cpu;
- private String fileSep;
-
- // The system can work in several ways:
- // - Attaching to local process
- // - Attaching to local core file
- // - Connecting to remote debug server
- // - Starting debug server for process
- // - Starting debug server for core file
-
- // These are options for the "client" side of things
- private static final int PROCESS_MODE = 0;
- private static final int CORE_FILE_MODE = 1;
- private static final int REMOTE_MODE = 2;
- private int startupMode;
-
- // This indicates whether we are really starting a server or not
- private boolean isServer;
-
- // All possible required information for connecting
- private int pid;
- private String executableName;
- private String coreFileName;
- private String debugServerID;
-
- // All needed information for server side
- private String serverID;
-
- // Indicates whether we are attached to a HotSpot JVM or not
- private boolean javaMode;
-
- // Indicates whether we have process control over a live HotSpot JVM
- // or not; non-null if so.
- private ServiceabilityAgentJVMDIModule jvmdi;
- // While handling C breakpoints interactivity with the Java program
- // is forbidden. Too many invariants are broken while the target is
- // stopped at a C breakpoint to risk making JVMDI calls.
- private boolean javaInteractionDisabled;
-
- private String[] jvmLibNames;
- private String[] saLibNames;
-
- // FIXME: make these configurable, i.e., via a dotfile; also
- // consider searching within the JDK from which this Java executable
- // comes to find them
- private static final String defaultDbxPathPrefix = "/net/jano.eng/export/disk05/hotspot/sa";
- private static final String defaultDbxSvcAgentDSOPathPrefix = "/net/jano.eng/export/disk05/hotspot/sa";
-
- private static final boolean DEBUG;
- static {
- DEBUG = System.getProperty("sun.jvm.hotspot.bugspot.BugSpotAgent.DEBUG")
- != null;
- }
-
- static void debugPrintln(String str) {
- if (DEBUG) {
- System.err.println(str);
- }
- }
-
- static void showUsage() {
- System.out.println(" You can also pass these -D options to java to specify where to find dbx and the \n" +
- " Serviceability Agent plugin for dbx:");
- System.out.println(" -DdbxPathName=<path-to-dbx-executable>\n" +
- " Default is derived from dbxPathPrefix");
- System.out.println(" or");
- System.out.println(" -DdbxPathPrefix=<xxx>\n" +
- " where xxx is the path name of a dir structure that contains:\n" +
- " <os>/<arch>/bin/dbx\n" +
- " The default is " + defaultDbxPathPrefix);
- System.out.println(" and");
- System.out.println(" -DdbxSvcAgentDSOPathName=<path-to-dbx-serviceability-agent-module>\n" +
- " Default is determined from dbxSvcAgentDSOPathPrefix");
- System.out.println(" or");
- System.out.println(" -DdbxSvcAgentDSOPathPrefix=<xxx>\n" +
- " where xxx is the pathname of a dir structure that contains:\n" +
- " <os>/<arch>/bin/lib/libsvc_agent_dbx.so\n" +
- " The default is " + defaultDbxSvcAgentDSOPathPrefix);
- }
-
- public BugSpotAgent() {
- // for non-server add shutdown hook to clean-up debugger in case
- // of forced exit. For remote server, shutdown hook is added by
- // DebugServer.
- Runtime.getRuntime().addShutdownHook(new java.lang.Thread(
- new Runnable() {
- public void run() {
- synchronized (BugSpotAgent.this) {
- if (!isServer) {
- detach();
- }
- }
- }
- }));
- }
-
- //--------------------------------------------------------------------------------
- // Accessors (once the system is set up)
- //
-
- public synchronized Debugger getDebugger() {
- return debugger;
- }
-
- public synchronized CDebugger getCDebugger() {
- return getDebugger().getCDebugger();
- }
-
- public synchronized ProcessControl getProcessControl() {
- return getCDebugger().getProcessControl();
- }
-
- public synchronized TypeDataBase getTypeDataBase() {
- return db;
- }
-
- /** Indicates whether the target process is suspended
- completely. Equivalent to getProcessControl().isSuspended(). */
- public synchronized boolean isSuspended() throws DebuggerException {
- return getProcessControl().isSuspended();
- }
-
- /** Suspends the target process completely. Equivalent to
- getProcessControl().suspend(). */
- public synchronized void suspend() throws DebuggerException {
- getProcessControl().suspend();
- }
-
- /** Resumes the target process completely. Equivalent to
- getProcessControl().suspend(). */
- public synchronized void resume() throws DebuggerException {
- getProcessControl().resume();
- }
-
- /** Indicates whether we are attached to a Java HotSpot virtual
- machine */
- public synchronized boolean isJavaMode() {
- return javaMode;
- }
-
- /** Temporarily disables interaction with the target process via
- JVMDI. This is done while the target process is stopped at a C
- breakpoint. Can be called even if the JVMDI agent has not been
- initialized. */
- public synchronized void disableJavaInteraction() {
- javaInteractionDisabled = true;
- }
-
- /** Re-enables interaction with the target process via JVMDI. This
- is done while the target process is continued past a C
- braekpoint. Can be called even if the JVMDI agent has not been
- initialized. */
- public synchronized void enableJavaInteraction() {
- javaInteractionDisabled = false;
- }
-
- /** Indicates whether Java interaction has been disabled */
- public synchronized boolean isJavaInteractionDisabled() {
- return javaInteractionDisabled;
- }
-
- /** Indicates whether we can talk to the Serviceability Agent's
- JVMDI module to be able to set breakpoints */
- public synchronized boolean canInteractWithJava() {
- return (jvmdi != null) && !javaInteractionDisabled;
- }
-
- /** Suspends all Java threads in the target process. Can only be
- called if we are attached to a HotSpot JVM and can connect to
- the SA's JVMDI module. Must not be called when the target
- process has been suspended with suspend(). */
- public synchronized void suspendJava() throws DebuggerException {
- if (!canInteractWithJava()) {
- throw new DebuggerException("Could not connect to SA's JVMDI module");
- }
- if (jvmdi.isSuspended()) {
- throw new DebuggerException("Target process already suspended via JVMDI");
- }
- jvmdi.suspend();
- }
-
- /** Resumes all Java threads in the target process. Can only be
- called if we are attached to a HotSpot JVM and can connect to
- the SA's JVMDI module. Must not be called when the target
- process has been suspended with suspend(). */
- public synchronized void resumeJava() throws DebuggerException {
- if (!canInteractWithJava()) {
- throw new DebuggerException("Could not connect to SA's JVMDI module");
- }
- if (!jvmdi.isSuspended()) {
- throw new DebuggerException("Target process already resumed via JVMDI");
- }
- jvmdi.resume();
- }
-
- /** Indicates whether the target process has been suspended at the
- Java language level via the SA's JVMDI module */
- public synchronized boolean isJavaSuspended() throws DebuggerException {
- return jvmdi.isSuspended();
- }
-
- /** Toggle a Java breakpoint at the given location. */
- public synchronized ServiceabilityAgentJVMDIModule.BreakpointToggleResult
- toggleJavaBreakpoint(String srcFileName,
- String pkgName,
- int lineNo) {
- if (!canInteractWithJava()) {
- throw new DebuggerException("Could not connect to SA's JVMDI module; can not toggle Java breakpoints");
- }
- return jvmdi.toggleBreakpoint(srcFileName, pkgName, lineNo);
- }
-
- /** Access to JVMDI module's eventPending */
- public synchronized boolean javaEventPending() throws DebuggerException {
- if (!canInteractWithJava()) {
- throw new DebuggerException("Could not connect to SA's JVMDI module; can not poll for Java debug events");
- }
- return jvmdi.eventPending();
- }
-
- /** Access to JVMDI module's eventPoll */
- public synchronized Event javaEventPoll() throws DebuggerException {
- if (!canInteractWithJava()) {
- throw new DebuggerException("Could not connect to SA's JVMDI module; can not poll for Java debug events");
- }
- return jvmdi.eventPoll();
- }
-
- /** Access to JVMDI module's eventContinue */
- public synchronized void javaEventContinue() throws DebuggerException {
- if (!canInteractWithJava()) {
- throw new DebuggerException("Could not connect to SA's JVMDI module; can not continue past Java debug events");
- }
- jvmdi.eventContinue();
- }
-
-
- // FIXME: add other accessors. For example, suspension and
- // resumption should be done through this interface, as well as
- // interaction with the live Java process such as breakpoint setting.
- // Probably should not expose the ServiceabilityAgentJVMDIModule
- // from this interface.
-
- //--------------------------------------------------------------------------------
- // Client-side operations
- //
-
- /** This attaches to a process running on the local machine. */
- public synchronized void attach(int processID)
- throws DebuggerException {
- if (debugger != null) {
- throw new DebuggerException("Already attached");
- }
- pid = processID;
- startupMode = PROCESS_MODE;
- isServer = false;
- go();
- }
-
- /** This opens a core file on the local machine */
- public synchronized void attach(String executableName, String coreFileName)
- throws DebuggerException {
- if (debugger != null) {
- throw new DebuggerException("Already attached");
- }
- if ((executableName == null) || (coreFileName == null)) {
- throw new DebuggerException("Both the core file name and executable name must be specified");
- }
- this.executableName = executableName;
- this.coreFileName = coreFileName;
- startupMode = CORE_FILE_MODE;
- isServer = false;
- go();
- }
-
- /** This attaches to a "debug server" on a remote machine; this
- remote server has already attached to a process or opened a
- core file and is waiting for RMI calls on the Debugger object to
- come in. */
- public synchronized void attach(String remoteServerID)
- throws DebuggerException {
- if (debugger != null) {
- throw new DebuggerException("Already attached to a process");
- }
- if (remoteServerID == null) {
- throw new DebuggerException("Debug server id must be specified");
- }
-
- debugServerID = remoteServerID;
- startupMode = REMOTE_MODE;
- isServer = false;
- go();
- }
-
- /** This should only be called by the user on the client machine,
- not the server machine */
- public synchronized boolean detach() throws DebuggerException {
- if (isServer) {
- throw new DebuggerException("Should not call detach() for server configuration");
- }
- return detachInternal();
- }
-
- //--------------------------------------------------------------------------------
- // Server-side operations
- //
-
- /** This attaches to a process running on the local machine and
- starts a debug server, allowing remote machines to connect and
- examine this process. uniqueID is used to uniquely identify the
- debuggee */
- public synchronized void startServer(int processID, String uniqueID)
- throws DebuggerException {
- if (debugger != null) {
- throw new DebuggerException("Already attached");
- }
- pid = processID;
- startupMode = PROCESS_MODE;
- isServer = true;
- serverID = uniqueID;
- go();
- }
-
- /** This attaches to a process running on the local machine and
- starts a debug server, allowing remote machines to connect and
- examine this process. */
- public synchronized void startServer(int processID)
- throws DebuggerException {
- startServer(processID, null);
- }
-
- /** This opens a core file on the local machine and starts a debug
- server, allowing remote machines to connect and examine this
- core file. uniqueID is used to uniquely identify the
- debuggee */
- public synchronized void startServer(String executableName, String coreFileName,
- String uniqueID)
- throws DebuggerException {
- if (debugger != null) {
- throw new DebuggerException("Already attached");
- }
- if ((executableName == null) || (coreFileName == null)) {
- throw new DebuggerException("Both the core file name and Java executable name must be specified");
- }
- this.executableName = executableName;
- this.coreFileName = coreFileName;
- startupMode = CORE_FILE_MODE;
- isServer = true;
- serverID = uniqueID;
- go();
- }
-
- /** This opens a core file on the local machine and starts a debug
- server, allowing remote machines to connect and examine this
- core file.*/
- public synchronized void startServer(String executableName, String coreFileName)
- throws DebuggerException {
- startServer(executableName, coreFileName, null);
- }
-
- /** This may only be called on the server side after startServer()
- has been called */
- public synchronized boolean shutdownServer() throws DebuggerException {
- if (!isServer) {
- throw new DebuggerException("Should not call shutdownServer() for client configuration");
- }
- return detachInternal();
- }
-
-
- //--------------------------------------------------------------------------------
- // Internals only below this point
- //
-
- private boolean detachInternal() {
- if (debugger == null) {
- return false;
- }
- if (canInteractWithJava()) {
- jvmdi.detach();
- jvmdi = null;
- }
- boolean retval = true;
- if (!isServer) {
- VM.shutdown();
- }
- // We must not call detach() if we are a client and are connected
- // to a remote debugger
- Debugger dbg = null;
- DebuggerException ex = null;
- if (isServer) {
- try {
- RMIHelper.unbind(serverID);
- }
- catch (DebuggerException de) {
- ex = de;
- }
- dbg = debugger;
- } else {
- if (startupMode != REMOTE_MODE) {
- dbg = debugger;
- }
- }
- if (dbg != null) {
- retval = dbg.detach();
- }
-
- debugger = null;
- machDesc = null;
- db = null;
- if (ex != null) {
- throw(ex);
- }
- return retval;
- }
-
- private void go() {
- setupDebugger();
- javaMode = setupVM();
- }
-
- private void setupDebugger() {
- if (startupMode != REMOTE_MODE) {
- //
- // Local mode (client attaching to local process or setting up
- // server, but not client attaching to server)
- //
-
- try {
- os = PlatformInfo.getOS();
- cpu = PlatformInfo.getCPU();
- }
- catch (UnsupportedPlatformException e) {
- throw new DebuggerException(e);
- }
- fileSep = System.getProperty("file.separator");
-
- if (os.equals("solaris")) {
- setupDebuggerSolaris();
- } else if (os.equals("win32")) {
- setupDebuggerWin32();
- } else if (os.equals("linux")) {
- setupDebuggerLinux();
- } else if (os.equals("bsd")) {
- setupDebuggerBsd();
- } else {
- // Add support for more operating systems here
- throw new DebuggerException("Operating system " + os + " not yet supported");
- }
- if (isServer) {
- RemoteDebuggerServer remote = null;
- try {
- remote = new RemoteDebuggerServer(debugger);
- }
- catch (RemoteException rem) {
- throw new DebuggerException(rem);
- }
- RMIHelper.rebind(serverID, remote);
- }
- } else {
- //
- // Remote mode (client attaching to server)
- //
-
- // Create and install a security manager
-
- // FIXME: currently commented out because we were having
- // security problems since we're "in the sun.* hierarchy" here.
- // Perhaps a permissive policy file would work around this. In
- // the long run, will probably have to move into com.sun.*.
-
- // if (System.getSecurityManager() == null) {
- // System.setSecurityManager(new RMISecurityManager());
- // }
-
- connectRemoteDebugger();
- }
- }
-
- private boolean setupVM() {
- // We need to instantiate a HotSpotTypeDataBase on both the client
- // and server machine. On the server it is only currently used to
- // configure the Java primitive type sizes (which we should
- // consider making constant). On the client it is used to
- // configure the VM.
-
- try {
- if (os.equals("solaris")) {
- db = new HotSpotTypeDataBase(machDesc, new HotSpotSolarisVtblAccess(debugger, jvmLibNames),
- debugger, jvmLibNames);
- } else if (os.equals("win32")) {
- db = new HotSpotTypeDataBase(machDesc, new Win32VtblAccess(debugger, jvmLibNames),
- debugger, jvmLibNames);
- } else if (os.equals("linux")) {
- db = new HotSpotTypeDataBase(machDesc, new LinuxVtblAccess(debugger, jvmLibNames),
- debugger, jvmLibNames);
- } else if (os.equals("bsd")) {
- db = new HotSpotTypeDataBase(machDesc, new BsdVtblAccess(debugger, jvmLibNames),
- debugger, jvmLibNames);
- } else {
- throw new DebuggerException("OS \"" + os + "\" not yet supported (no VtblAccess implemented yet)");
- }
- }
- catch (NoSuchSymbolException e) {
- e.printStackTrace();
- return false;
- }
-
- if (startupMode != REMOTE_MODE) {
- // Configure the debugger with the primitive type sizes just obtained from the VM
- debugger.configureJavaPrimitiveTypeSizes(db.getJBooleanType().getSize(),
- db.getJByteType().getSize(),
- db.getJCharType().getSize(),
- db.getJDoubleType().getSize(),
- db.getJFloatType().getSize(),
- db.getJIntType().getSize(),
- db.getJLongType().getSize(),
- db.getJShortType().getSize());
- }
-
- if (!isServer) {
- // Do not initialize the VM on the server (unnecessary, since it's
- // instantiated on the client)
- VM.initialize(db, debugger);
- }
-
- try {
- jvmdi = new ServiceabilityAgentJVMDIModule(debugger, saLibNames);
- if (jvmdi.canAttach()) {
- jvmdi.attach();
- jvmdi.setCommandTimeout(6000);
- debugPrintln("Attached to Serviceability Agent's JVMDI module.");
- // Jog VM to suspended point with JVMDI module
- resume();
- suspendJava();
- suspend();
- debugPrintln("Suspended all Java threads.");
- } else {
- debugPrintln("Could not locate SA's JVMDI module; skipping attachment");
- jvmdi = null;
- }
- } catch (Exception e) {
- e.printStackTrace();
- jvmdi = null;
- }
-
- return true;
- }
-
- //--------------------------------------------------------------------------------
- // OS-specific debugger setup/connect routines
- //
-
- //
- // Solaris
- //
-
- private void setupDebuggerSolaris() {
- setupJVMLibNamesSolaris();
- ProcDebuggerLocal dbg = new ProcDebuggerLocal(null, true);
- debugger = dbg;
- attachDebugger();
-
- // Set up CPU-dependent stuff
- if (cpu.equals("x86")) {
- machDesc = new MachineDescriptionIntelX86();
- } else if (cpu.equals("sparc")) {
- int addressSize = dbg.getRemoteProcessAddressSize();
- if (addressSize == -1) {
- throw new DebuggerException("Error occurred while trying to determine the remote process's address size");
- }
-
- if (addressSize == 32) {
- machDesc = new MachineDescriptionSPARC32Bit();
- } else if (addressSize == 64) {
- machDesc = new MachineDescriptionSPARC64Bit();
- } else {
- throw new DebuggerException("Address size " + addressSize + " is not supported on SPARC");
- }
- } else if (cpu.equals("amd64")) {
- machDesc = new MachineDescriptionAMD64();
- } else {
- throw new DebuggerException("Solaris only supported on sparc/sparcv9/x86/amd64");
- }
-
- dbg.setMachineDescription(machDesc);
- }
-
- private void connectRemoteDebugger() throws DebuggerException {
- RemoteDebugger remote =
- (RemoteDebugger) RMIHelper.lookup(debugServerID);
- debugger = new RemoteDebuggerClient(remote);
- machDesc = ((RemoteDebuggerClient) debugger).getMachineDescription();
- os = debugger.getOS();
- if (os.equals("solaris")) {
- setupJVMLibNamesSolaris();
- } else if (os.equals("win32")) {
- setupJVMLibNamesWin32();
- } else if (os.equals("linux")) {
- setupJVMLibNamesLinux();
- } else if (os.equals("bsd")) {
- setupJVMLibNamesBsd();
- } else {
- throw new RuntimeException("Unknown OS type");
- }
-
- cpu = debugger.getCPU();
- }
-
- private void setupJVMLibNamesSolaris() {
- jvmLibNames = new String[] { "libjvm.so", "libjvm_g.so", "gamma_g" };
- saLibNames = new String[] { "libsa.so", "libsa_g.so" };
- }
-
- //
- // Win32
- //
-
- private void setupDebuggerWin32() {
- setupJVMLibNamesWin32();
-
- if (cpu.equals("x86")) {
- machDesc = new MachineDescriptionIntelX86();
- } else if (cpu.equals("amd64")) {
- machDesc = new MachineDescriptionAMD64();
- } else if (cpu.equals("ia64")) {
- machDesc = new MachineDescriptionIA64();
- } else {
- throw new DebuggerException("Win32 supported under x86, amd64 and ia64 only");
- }
-
- // Note we do not use a cache for the local debugger in server
- // mode; it will be taken care of on the client side (once remote
- // debugging is implemented).
-
- debugger = new WindbgDebuggerLocal(machDesc, !isServer);
-
- attachDebugger();
- }
-
- private void setupJVMLibNamesWin32() {
- jvmLibNames = new String[] { "jvm.dll", "jvm_g.dll" };
- saLibNames = new String[] { "sa.dll", "sa_g.dll" };
- }
-
- //
- // Linux
- //
-
- private void setupDebuggerLinux() {
- setupJVMLibNamesLinux();
-
- if (cpu.equals("x86")) {
- machDesc = new MachineDescriptionIntelX86();
- } else if (cpu.equals("ia64")) {
- machDesc = new MachineDescriptionIA64();
- } else if (cpu.equals("amd64")) {
- machDesc = new MachineDescriptionAMD64();
- } else if (cpu.equals("sparc")) {
- if (LinuxDebuggerLocal.getAddressSize()==8) {
- machDesc = new MachineDescriptionSPARC64Bit();
- } else {
- machDesc = new MachineDescriptionSPARC32Bit();
- }
- } else {
- try {
- machDesc = (MachineDescription)
- Class.forName("sun.jvm.hotspot.debugger.MachineDescription" +
- cpu.toUpperCase()).newInstance();
- } catch (Exception e) {
- throw new DebuggerException("unsupported machine type");
- }
- }
-
-
- // Note we do not use a cache for the local debugger in server
- // mode; it will be taken care of on the client side (once remote
- // debugging is implemented).
-
- debugger = new LinuxDebuggerLocal(machDesc, !isServer);
- attachDebugger();
- }
-
- private void setupJVMLibNamesLinux() {
- // same as solaris
- setupJVMLibNamesSolaris();
- }
-
- //
- // BSD
- //
-
- private void setupDebuggerBsd() {
- setupJVMLibNamesBsd();
-
- if (cpu.equals("x86")) {
- machDesc = new MachineDescriptionIntelX86();
- } else if (cpu.equals("amd64") || (cpu.equals("x86_64"))) {
- machDesc = new MachineDescriptionAMD64();
- } else {
- throw new DebuggerException("Bsd only supported on x86/x86_64. Current arch: " + cpu);
- }
-
- // Note we do not use a cache for the local debugger in server
- // mode; it will be taken care of on the client side (once remote
- // debugging is implemented).
-
- debugger = new BsdDebuggerLocal(machDesc, !isServer);
- attachDebugger();
- }
-
- private void setupJVMLibNamesBsd() {
- // same as solaris
- setupJVMLibNamesSolaris();
- }
-
- /** Convenience routine which should be called by per-platform
- debugger setup. Should not be called when startupMode is
- REMOTE_MODE. */
- private void attachDebugger() {
- if (startupMode == PROCESS_MODE) {
- debugger.attach(pid);
- } else if (startupMode == CORE_FILE_MODE) {
- debugger.attach(executableName, coreFileName);
- } else {
- throw new DebuggerException("Should not call attach() for startupMode == " + startupMode);
- }
- }
-}
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/JavaLineNumberInfo.java Tue Mar 05 09:50:53 2013 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2002, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.bugspot;
-
-import sun.jvm.hotspot.oops.*;
-
-/** Wrapper class which describes line number information for Java
- class files. The line number table is converted into this
- representation on demand. These objects are then sorted by line
- number for fast lookup when setting breakpoints in a particular
- source file. */
-
-public class JavaLineNumberInfo {
- private InstanceKlass klass;
- private Method method;
- private int startBCI;
- private int lineNumber;
-
- public JavaLineNumberInfo(InstanceKlass klass,
- Method method,
- int startBCI,
- int lineNumber) {
- this.klass = klass;
- this.method = method;
- this.startBCI = startBCI;
- this.lineNumber = lineNumber;
- }
-
- public InstanceKlass getKlass() { return klass; }
- public Method getMethod() { return method; }
- public int getStartBCI() { return startBCI; }
- public int getLineNumber() { return lineNumber; }
-}
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/Main.java Tue Mar 05 09:50:53 2013 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2001, 2008, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.bugspot;
-
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import sun.jvm.hotspot.ui.*;
-
-/** The main class for the BugSpot debugger. */
-
-public class Main {
- public static void main(String[] args) {
- JFrame frame = new JFrame("BugSpot");
- frame.setSize(800, 600);
- BugSpot db = new BugSpot();
- db.setMDIMode(true);
- db.build();
- frame.setJMenuBar(db.getMenuBar());
- frame.getContentPane().add(db);
- frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
-
- GraphicsUtilities.reshapeToAspectRatio(frame,
- 4.0f/3.0f, 0.85f, Toolkit.getDefaultToolkit().getScreenSize());
- GraphicsUtilities.centerInContainer(frame,
- Toolkit.getDefaultToolkit().getScreenSize());
- frame.setVisible(true);
- }
-}
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/PCFinder.java Tue Mar 05 09:50:53 2013 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 2001, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.bugspot;
-
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.debugger.cdbg.*;
-
-/** Helper class for locating a program counter. Indicates the
- confidence of the find. */
-
-public class PCFinder {
- public static final int LOW_CONFIDENCE = 1;
- public static final int HIGH_CONFIDENCE = 2;
-
- public static class Info {
- private String name;
- private long offset;
- private int confidence;
-
- public Info(String name, long offset, int confidence) {
- this.name = name;
- this.offset = offset;
- this.confidence = confidence;
- }
-
- /** May be null */
- public String getName() { return name; }
-
- /** If this is -1, a symbol could not be found, and the offset
- should not be shown */
- public long getOffset() { return offset; }
-
- /** PCFinder.LOW_CONFIDENCE or PCFinder.HIGH_CONFIDENCE */
- public int getConfidence() { return confidence; }
- }
-
- /** Passed loadobject may be null in which case the returned Info
- object has low confidence */
- public static Info findPC(Address pc, LoadObject lo, CDebugger dbg) {
- if (lo == null) {
- return new Info(null, -1, LOW_CONFIDENCE);
- }
-
- // First try debug info
- BlockSym sym = lo.debugInfoForPC(pc);
- while (sym != null) {
- if (sym.isFunction()) {
- // Highest confidence
- return new Info(sym.toString(), pc.minus(sym.getAddress()), HIGH_CONFIDENCE);
- }
- }
-
- // Now try looking up symbol in loadobject
-
- // FIXME: must add support for mapfiles on Win32 and try looking
- // up there first if possible. Should we hide that behind
- // LoadObject.closestSymbolToPC and have the ClosestSymbol return
- // confidence? I think so. On Solaris there is no notion of a
- // mapfile, and the confidence for closestSymbolToPC will be high
- // instead of low.
-
- int confidence = HIGH_CONFIDENCE;
-
- ClosestSymbol cs = lo.closestSymbolToPC(pc);
- if (cs != null) {
- // FIXME: currently low confidence (only on Win32)
- return new Info(cs.getName() + "()", cs.getOffset(), LOW_CONFIDENCE);
- }
-
- // Unknown location
- return new Info(dbg.getNameOfFile(lo.getName()).toUpperCase() +
- "! " + pc + "()", -1, HIGH_CONFIDENCE);
- }
-}
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/PackageScanner.java Tue Mar 05 09:50:53 2013 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 2002, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.bugspot;
-
-import java.io.*;
-
-/** Scans a .java file for the package that it is in. */
-
-public class PackageScanner {
-
- public PackageScanner() {
- }
-
- public String scan(String filename) {
- return scan(new File(filename));
- }
-
- /** Returns the String comprising the package name of the classes in
- this .java file. Returns the (non-null) empty string if any
- error occurs or if the classes are in the unnamed package. */
- public String scan(File file) {
- BufferedReader buf = null;
- String res = "";
- try {
- buf = new BufferedReader(new FileReader(file));
- StreamTokenizer tok = new StreamTokenizer(buf);
- tok.slashStarComments(true);
- tok.slashSlashComments(true);
- if (tok.nextToken() != StreamTokenizer.TT_WORD) {
- return res;
- }
- if (!tok.sval.equals("package")) {
- return res;
- }
- if (tok.nextToken() != StreamTokenizer.TT_WORD) {
- return res;
- }
- res = tok.sval;
- return res;
- } catch (FileNotFoundException e) {
- return res;
- } catch (IOException e) {
- return res;
- } finally {
- try {
- if (buf != null) {
- buf.close();
- }
- } catch (IOException e) {
- }
- }
- }
-
- public static void main(String[] args) {
- if (args.length != 1) {
- usage();
- }
-
- System.out.println(new PackageScanner().scan(args[0]));
- }
-
- private static void usage() {
- System.err.println("Usage: java PackageScanner <.java file name>");
- System.err.println("Prints package the .java file is in to stdout.");
- System.exit(1);
- }
-}
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/RegisterPanel.java Tue Mar 05 09:50:53 2013 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,173 +0,0 @@
-/*
- * Copyright (c) 2001, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.bugspot;
-
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-import javax.swing.table.*;
-
-import sun.jvm.hotspot.debugger.*;
-
-/** Displays registers in a window. FIXME: this will need more work to
- understand and handle register windows. */
-
-public class RegisterPanel extends JPanel {
- private java.util.List/*<RegisterInfo>*/ registers;
- private AbstractTableModel dataModel;
- private boolean valid;
- private boolean editable;
- private String nullAddressString;
- private ThreadProxy curThread;
- private JTable table;
-
- static class RegisterInfo {
- private String name;
- private Address value;
-
- RegisterInfo(String name, Address value) {
- this.name = name;
- this.value = value;
- }
-
- String getName() { return name; }
- Address getValue() { return value; }
- }
-
- public RegisterPanel() {
- super();
-
- registers = new ArrayList();
-
- dataModel = new AbstractTableModel() {
- public int getColumnCount() { return 2; }
- public int getRowCount() { return registers.size(); }
- public String getColumnName(int col) {
- switch (col) {
- case 0:
- return "Register Name";
- case 1:
- return "Register Value";
- default:
- throw new RuntimeException("Index " + col + " out of bounds");
- }
- }
- public Object getValueAt(int row, int col) {
- RegisterInfo info = (RegisterInfo) registers.get(row);
-
- switch (col) {
- case 0:
- return info.getName();
- case 1:
- if (valid) {
- Address val = info.getValue();
- if (val != null) {
- return val;
- } else {
- return nullAddressString;
- }
- } else {
- return "-";
- }
- default:
- throw new RuntimeException("Index (" + col + ", " + row + ") out of bounds");
- }
- }
- public boolean isCellEditable(int row, int col) {
- if (col == 0) return false;
- if (!valid) return false;
- if (curThread == null) return false;
- if (!curThread.canSetContext()) return false;
-
- // FIXME: add listener to watch for register changes
- // return true;
- return false;
- }
- };
-
- // Build user interface
- setLayout(new BorderLayout());
- table = new JTable(dataModel);
- table.setCellSelectionEnabled(true);
- table.setSelectionMode(ListSelectionModel.SINGLE_INTERVAL_SELECTION);
- table.setDragEnabled(true);
- JTableHeader header = table.getTableHeader();
- header.setReorderingAllowed(false);
- JScrollPane scrollPane = new JScrollPane(table);
- add(scrollPane, BorderLayout.CENTER);
- }
-
-
- /** Updates the register panel with the register set from the
- specified thread. Call this when the process has been suspended
- and the current thread has been set. FIXME: this interface will
- need to change to support register windows. */
- public void update(ThreadProxy curThread) {
- this.curThread = curThread;
- ThreadContext context = curThread.getContext();
- editable = curThread.canSetContext();
- registers.clear();
- for (int i = 0; i < context.getNumRegisters(); i++) {
- String name = context.getRegisterName(i);
- Address addr = context.getRegisterAsAddress(i);
- if ((nullAddressString == null) && (addr != null)) {
- String addrStr = addr.toString();
- StringBuffer buf = new StringBuffer();
- buf.append("0x");
- int len = addrStr.length() - 2;
- for (int j = 0; j < len; j++) {
- buf.append("0");
- }
- nullAddressString = buf.toString();
- }
- registers.add(new RegisterInfo(name, addr));
- }
- valid = true;
- SwingUtilities.invokeLater(new Runnable() {
- public void run() {
- dataModel.fireTableDataChanged();
- }
- });
- }
-
- /** Clears the registers' values. Call this when the processs has
- been resumed. */
- public void clear() {
- valid = false;
- nullAddressString = null;
- SwingUtilities.invokeLater(new Runnable() {
- public void run() {
- dataModel.fireTableDataChanged();
- }
- });
- }
-
- public void setFont(Font font) {
- super.setFont(font);
- if (table != null) {
- table.setFont(font);
- }
- }
-}
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/StackTraceEntry.java Tue Mar 05 09:50:53 2013 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 2001, 2002, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.bugspot;
-
-import sun.jvm.hotspot.debugger.cdbg.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.runtime.*;
-
-/** This class describes a frame in a stack trace. It abstracts over
- C/C++ and Java frames. */
-
-public class StackTraceEntry {
- private CFrame cFrame;
- private CDebugger dbg;
- private JavaVFrame javaFrame;
- private String value; // What is displayed in a stack trace
- // For merging C and Java stack traces.
- // For more precise stack traces, should probably have a way to
- // convert a CFrame to a sun.jvm.hotspot.runtime.Frame. For now,
- // doing similar algorithm to jdbx (which does not have intimate
- // knowledge of the VM).
- private boolean isUnknownCFrame;
-
- public StackTraceEntry(CFrame cFrame, CDebugger dbg) {
- this.cFrame = cFrame;
- this.dbg = dbg;
- computeValue();
- }
-
- public StackTraceEntry(JavaVFrame javaFrame) {
- this.javaFrame = javaFrame;
- computeValue();
- }
-
- public boolean isCFrame() { return (cFrame != null); }
- public boolean isJavaFrame() { return (javaFrame != null); }
- public CFrame getCFrame() { return cFrame; }
- public JavaVFrame getJavaFrame() { return javaFrame; }
- public boolean isUnknownCFrame() { return isUnknownCFrame; }
- public String toString() {
- return value;
- }
-
- private void computeValue() {
- isUnknownCFrame = true;
- value = "<unknown>";
- if (cFrame != null) {
- PCFinder.Info info = PCFinder.findPC(cFrame.pc(), cFrame.loadObjectForPC(), dbg);
- if (info.getName() != null) {
- value = "(C) " + info.getName();
- isUnknownCFrame = false;
- if (info.getConfidence() == PCFinder.LOW_CONFIDENCE) {
- value = value + " (?)";
- }
- if (info.getOffset() >= 0) {
- value = value + " + 0x" + Long.toHexString(info.getOffset());
- }
- }
- } else if (javaFrame != null) {
- isUnknownCFrame = false;
- Method m = javaFrame.getMethod();
- value = "(J) " + m.externalNameAndSignature();
- }
- }
-}
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/StackTracePanel.java Tue Mar 05 09:50:53 2013 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,115 +0,0 @@
-/*
- * Copyright (c) 2001, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.bugspot;
-
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
-import javax.swing.*;
-import sun.jvm.hotspot.debugger.cdbg.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.ui.*;
-
-/** This panel contains a ListBox with all of the stack frames in a
- given thread. When a given entry is selected, an event is
- fired. */
-
-public class StackTracePanel extends JPanel {
- public interface Listener {
- public void frameChanged(CFrame fr, JavaVFrame jfr);
- }
-
- class Model extends AbstractListModel implements ComboBoxModel {
- private Object selectedItem;
- public Object getElementAt(int index) {
- if (trace == null) return null;
- return trace.get(index);
- }
- public int getSize() {
- if (trace == null) return 0;
- return trace.size();
- }
- public Object getSelectedItem() {
- return selectedItem;
- }
- public void setSelectedItem(Object item) {
- selectedItem = item;
- }
- public void dataChanged() {
- fireContentsChanged(this, 0, trace.size());
- }
- }
-
- private java.util.List trace;
- private Model model;
- private JComboBox list;
- private java.util.List listeners;
-
- public StackTracePanel() {
- super();
-
- model = new Model();
-
- // Build user interface
- setLayout(new BorderLayout());
- setBorder(GraphicsUtilities.newBorder(5));
- list = new JComboBox(model);
- list.setPrototypeDisplayValue("ZZZZZZZZZZZZZZZZZZZZZZZZZZZZ");
- add(list, BorderLayout.CENTER);
-
- // Add selection listener
- list.addItemListener(new ItemListener() {
- public void itemStateChanged(ItemEvent e) {
- if (e.getStateChange() == ItemEvent.SELECTED) {
- fireFrameChanged();
- }
- }
- });
- }
-
- /** Takes a List of StackTraceEntry objects */
- public void setTrace(java.util.List trace) {
- this.trace = trace;
- model.dataChanged();
- list.setSelectedIndex(0);
- fireFrameChanged();
- }
-
- public void addListener(Listener listener) {
- if (listeners == null) {
- listeners = new ArrayList();
- }
- listeners.add(listener);
- }
-
- protected void fireFrameChanged() {
- if (listeners != null) {
- StackTraceEntry entry = (StackTraceEntry) trace.get(list.getSelectedIndex());
- for (Iterator iter = listeners.iterator(); iter.hasNext(); ) {
- ((Listener) iter.next()).frameChanged(entry.getCFrame(), entry.getJavaFrame());
- }
- }
- }
-}
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/ThreadListPanel.java Tue Mar 05 09:50:53 2013 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,237 +0,0 @@
-/*
- * Copyright (c) 2001, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.bugspot;
-
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
-import javax.swing.*;
-import javax.swing.table.*;
-
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.debugger.cdbg.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.ui.*;
-
-// NOTE: this class was not placed in sun.jvm.hotspot.ui to prevent
-// mixing components designed for C and C++ debugging with the ones
-// that work with the core serviceability agent functionality (which
-// does not require that the CDebugger interface be implemented).
-
-/** The ThreadListPanel is used for C and C++ debugging and can
- visualize all threads in the target process. The caller passes in
- a CDebugger attached to the target process and can request that
- JavaThreads' associations with these underlying threads be
- displayed; this option is only valid when attached to a HotSpot
- JVM and when the {@link sun.jvm.hotspot.runtime.VM} has been
- initialized. */
-
-public class ThreadListPanel extends JPanel {
- /** Listener which can be added to receive "Set Focus" events */
- public static interface Listener {
- /** ThreadProxy will always be provided; JavaThread will only be
- present if displayJavaThreads was specified in the constructor
- for the panel and the thread was a JavaThread. */
- public void setFocus(ThreadProxy thread, JavaThread jthread);
- }
-
- static class ThreadInfo {
- private ThreadProxy thread;
- // Distinguish between PC == null and no top frame
- private boolean gotPC;
- private Address pc;
- private String location;
- private JavaThread javaThread;
- private String javaThreadName;
-
- public ThreadInfo(ThreadProxy thread, CDebugger dbg, JavaThread jthread) {
- this.thread = thread;
- this.location = "<unknown>";
- CFrame fr = dbg.topFrameForThread(thread);
- if (fr != null) {
- gotPC = true;
- pc = fr.pc();
- PCFinder.Info info = PCFinder.findPC(pc, fr.loadObjectForPC(), dbg);
- if (info.getName() != null) {
- location = info.getName();
- if (info.getConfidence() == PCFinder.LOW_CONFIDENCE) {
- location = location + " (?)";
- }
- if (info.getOffset() < 0) {
- location = location + " + 0x" + Long.toHexString(info.getOffset());
- }
- }
- }
- if (jthread != null) {
- javaThread = jthread;
- javaThreadName = jthread.getThreadName();
- }
- }
-
- public ThreadProxy getThread() { return thread; }
- public boolean hasPC() { return gotPC; }
- public Address getPC() { return pc; }
- public String getLocation() { return location; }
- public boolean isJavaThread() { return (javaThread != null); }
- public JavaThread getJavaThread() { return javaThread; }
- public String getJavaThreadName() { return javaThreadName; }
- }
-
- // List<ThreadInfo>
- private java.util.List threadList;
- private JTable table;
- private AbstractTableModel dataModel;
- // List<Listener>
- private java.util.List listeners;
-
- /** Takes a CDebugger from which the thread list is queried.
- displayJavaThreads must only be set to true if the debugger is
- attached to a HotSpot JVM and if the VM has already been
- initialized. */
- public ThreadListPanel(CDebugger dbg, final boolean displayJavaThreads) {
- super();
-
- Map threadToJavaThreadMap = null;
- if (displayJavaThreads) {
- // Collect Java threads from virtual machine and insert them in
- // table for later querying
- threadToJavaThreadMap = new HashMap();
- Threads threads = VM.getVM().getThreads();
- for (JavaThread thr = threads.first(); thr != null; thr = thr.next()) {
- threadToJavaThreadMap.put(thr.getThreadProxy(), thr);
- }
- }
-
- java.util.List/*<ThreadProxy>*/ threads = dbg.getThreadList();
- threadList = new ArrayList(threads.size());
- for (Iterator iter = threads.iterator(); iter.hasNext(); ) {
- ThreadProxy thr = (ThreadProxy) iter.next();
- JavaThread jthr = null;
- if (displayJavaThreads) {
- jthr = (JavaThread) threadToJavaThreadMap.get(thr);
- }
- threadList.add(new ThreadInfo(thr, dbg, jthr));
- }
-
- // Thread ID, current PC, current symbol, Java Thread, [Java thread name]
- dataModel = new AbstractTableModel() {
- public int getColumnCount() { return (displayJavaThreads ? 5 : 3); }
- public int getRowCount() { return threadList.size(); }
- public String getColumnName(int col) {
- switch (col) {
- case 0:
- return "Thread ID";
- case 1:
- return "PC";
- case 2:
- return "Location";
- case 3:
- return "Java?";
- case 4:
- return "Java Thread Name";
- default:
- throw new RuntimeException("Index " + col + " out of bounds");
- }
- }
- public Object getValueAt(int row, int col) {
- ThreadInfo info = (ThreadInfo) threadList.get(row);
-
- switch (col) {
- case 0:
- return info.getThread();
- case 1:
- {
- if (info.hasPC()) {
- return info.getPC();
- }
- return "<no frames on stack>";
- }
- case 2:
- return info.getLocation();
- case 3:
- if (info.isJavaThread()) {
- return "Yes";
- } else {
- return "";
- }
- case 4:
- if (info.isJavaThread()) {
- return info.getJavaThreadName();
- } else {
- return "";
- }
- default:
- throw new RuntimeException("Index (" + col + ", " + row + ") out of bounds");
- }
- }
- };
-
- // Build user interface
- setLayout(new BorderLayout());
- table = new JTable(dataModel);
- table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
- JTableHeader header = table.getTableHeader();
- header.setReorderingAllowed(false);
- table.setRowSelectionAllowed(true);
- table.setColumnSelectionAllowed(false);
- JScrollPane scrollPane = new JScrollPane(table);
- add(scrollPane, BorderLayout.CENTER);
- if (threadList.size() > 0) {
- table.setRowSelectionInterval(0, 0);
- }
-
- JButton button = new JButton("Set Focus");
- button.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- int i = table.getSelectedRow();
- if (i < 0) {
- return;
- }
- ThreadInfo info = (ThreadInfo) threadList.get(i);
- for (Iterator iter = listeners.iterator(); iter.hasNext(); ) {
- ((Listener) iter.next()).setFocus(info.getThread(), info.getJavaThread());
- }
- }
- });
- JPanel focusPanel = new JPanel();
- focusPanel.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0));
- focusPanel.setLayout(new BoxLayout(focusPanel, BoxLayout.Y_AXIS));
- focusPanel.add(Box.createGlue());
- focusPanel.add(button);
- focusPanel.add(Box.createGlue());
- add(focusPanel, BorderLayout.EAST);
-
- // FIXME: make listener model for the debugger so if the user
- // specifies a mapfile for or path to a given DSO later we can
- // update our state
- }
-
- public void addListener(Listener l) {
- if (listeners == null) {
- listeners = new ArrayList();
- }
- listeners.add(l);
- }
-}
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/VariablePanel.java Tue Mar 05 09:50:53 2013 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,252 +0,0 @@
-/*
- * Copyright (c) 2001, 2002, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.bugspot;
-
-import java.awt.*;
-import javax.swing.*;
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.debugger.cdbg.*;
-import sun.jvm.hotspot.bugspot.tree.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.ui.tree.*;
-import sun.jvm.hotspot.ui.treetable.*;
-
-/** Manages display of a set of local variables in a frame, or the
- contents of the "this" pointer */
-
-public class VariablePanel extends JPanel {
- private JTreeTable treeTable;
- private SimpleTreeTableModel model;
- private SimpleTreeGroupNode root;
-
- public VariablePanel() {
- super();
-
- model = new SimpleTreeTableModel();
- model.setValuesEditable(false);
- root = new SimpleTreeGroupNode();
- model.setRoot(root);
- treeTable = new JTreeTable(model);
- treeTable.setRootVisible(false);
- treeTable.setShowsRootHandles(true);
- treeTable.setShowsIcons(false);
- treeTable.setTreeEditable(false);
- treeTable.getTableHeader().setReorderingAllowed(false);
- treeTable.setCellSelectionEnabled(true);
- treeTable.setSelectionMode(ListSelectionModel.SINGLE_INTERVAL_SELECTION);
- treeTable.setDragEnabled(true);
- JScrollPane sp = new JScrollPane(treeTable);
- sp.getViewport().setBackground(Color.white);
-
- setLayout(new BorderLayout());
- add(sp, BorderLayout.CENTER);
- }
-
- /** Clear the contents of this VariablePanel */
- public void clear() {
- root.removeAllChildren();
- model.fireTreeStructureChanged();
- }
-
- /** Update the contents of this VariablePanel from the given CFrame */
- public void update(CFrame fr) {
- // Collect locals
- CCollector coll = new CCollector();
- fr.iterateLocals(coll);
- update(coll);
- }
-
- /** Update the contents of this VariablePanel from the given JavaVFrame */
- public void update(JavaVFrame jfr) {
- Method m = jfr.getMethod();
- if (!m.hasLocalVariableTable()) {
- return;
- }
- int bci = jfr.getBCI();
- // Get local variable table
- LocalVariableTableElement[] locals = m.getLocalVariableTable();
- // Get locals as StackValueCollection
- StackValueCollection coll = jfr.getLocals();
- root.removeAllChildren();
- // See which locals are live
- for (int i = 0; i < locals.length; i++) {
- LocalVariableTableElement local = locals[i];
- if (local.getStartBCI() <= bci && bci < local.getStartBCI() + local.getLength()) {
- // Valid; add it
- SimpleTreeNode node = null;
- Symbol name = null;
- try {
- name = m.getConstants().getSymbolAt(local.getNameCPIndex());
- if (name == null) {
- System.err.println("Null name at slot " +
- local.getNameCPIndex() +
- " for local variable at slot " +
- local.getSlot());
- continue;
- }
- } catch (Exception e) {
- System.err.println("Unable to fetch name at slot " +
- local.getNameCPIndex() +
- " for local variable at slot " +
- local.getSlot());
- e.printStackTrace();
- continue;
- }
- sun.jvm.hotspot.oops.NamedFieldIdentifier f =
- new sun.jvm.hotspot.oops.NamedFieldIdentifier(name.asString());
- Symbol descriptor = null;
- try {
- descriptor = m.getConstants().getSymbolAt(local.getDescriptorCPIndex());
- } catch (Exception e) {
- System.err.println("Unable to fetch descriptor at slot " +
- local.getDescriptorCPIndex() +
- " for local variable " + f.getName() +
- " at slot " + local.getSlot());
- e.printStackTrace();
- continue;
- }
-
- if (descriptor != null) {
- switch (descriptor.getByteAt(0)) {
- case 'F': {
- node = new sun.jvm.hotspot.ui.tree.FloatTreeNodeAdapter(coll.floatAt(local.getSlot()), f, true);
- break;
- }
- case 'D': {
- node = new sun.jvm.hotspot.ui.tree.DoubleTreeNodeAdapter(coll.doubleAt(local.getSlot()), f, true);
- break;
- }
- case 'C': {
- node = new sun.jvm.hotspot.ui.tree.CharTreeNodeAdapter((char) coll.intAt(local.getSlot()), f, true);
- break;
- }
- case 'B':
- case 'S':
- case 'I': {
- node = new sun.jvm.hotspot.ui.tree.LongTreeNodeAdapter(coll.intAt(local.getSlot()), f, true);
- break;
- }
- case 'Z': {
- node = new sun.jvm.hotspot.ui.tree.BooleanTreeNodeAdapter(
- ((coll.intAt(local.getSlot()) != 0) ? true : false), f, true
- );
- break;
- }
- case 'J': {
- node = new sun.jvm.hotspot.ui.tree.LongTreeNodeAdapter(coll.longAt(local.getSlot()), f, true);
- break;
- }
- default: {
- try {
- node = new sun.jvm.hotspot.ui.tree.OopTreeNodeAdapter(
- VM.getVM().getObjectHeap().newOop(coll.oopHandleAt(local.getSlot())), f, true
- );
- } catch (AddressException e) {
- node = new sun.jvm.hotspot.ui.tree.FieldTreeNodeAdapter(f, true) {
- public int getChildCount() { return 0; }
- public SimpleTreeNode getChild(int i) { return null; }
- public boolean isLeaf() { return false; }
- public int getIndexOfChild(SimpleTreeNode child) { return 0; }
- public String getValue() {
- return "<Bad oop>";
- }
- };
- }
- break;
- }
- }
- if (node != null) {
- root.addChild(node);
- }
- }
- }
- }
-
- model.fireTreeStructureChanged();
- }
-
- /** Update the contents of this VariablePanel from the given "this"
- pointer of the given type */
- public void update(Address thisAddr, Type type) {
- // Collect fields
- CCollector coll = new CCollector();
- type.iterateObject(thisAddr, coll);
- update(coll);
- }
-
- private void update(CCollector coll) {
- root.removeAllChildren();
- for (int i = 0; i < coll.getNumChildren(); i++) {
- root.addChild(coll.getChild(i));
- }
- model.fireTreeStructureChanged();
- }
-
- static class CCollector extends DefaultObjectVisitor {
- private java.util.List children;
-
- public CCollector() {
- children = new ArrayList();
- }
-
- public int getNumChildren() {
- return children.size();
- }
-
- public SimpleTreeNode getChild(int i) {
- return (SimpleTreeNode) children.get(i);
- }
-
- public void doBit(sun.jvm.hotspot.debugger.cdbg.FieldIdentifier f, long val) {
- children.add(new sun.jvm.hotspot.bugspot.tree.LongTreeNodeAdapter(val, f, true));
- }
- public void doInt(sun.jvm.hotspot.debugger.cdbg.FieldIdentifier f, long val) {
- children.add(new sun.jvm.hotspot.bugspot.tree.LongTreeNodeAdapter(val, f, true));
- }
- public void doEnum(sun.jvm.hotspot.debugger.cdbg.FieldIdentifier f, long val, String enumName) {
- children.add(new sun.jvm.hotspot.bugspot.tree.EnumTreeNodeAdapter(enumName, val, f, true));
- }
- public void doFloat(sun.jvm.hotspot.debugger.cdbg.FieldIdentifier f, float val) {
- children.add(new sun.jvm.hotspot.bugspot.tree.FloatTreeNodeAdapter(val, f, true));
- }
- public void doDouble(sun.jvm.hotspot.debugger.cdbg.FieldIdentifier f, double val) {
- children.add(new sun.jvm.hotspot.bugspot.tree.DoubleTreeNodeAdapter(val, f, true));
- }
- public void doPointer(sun.jvm.hotspot.debugger.cdbg.FieldIdentifier f, Address val) {
- children.add(new sun.jvm.hotspot.bugspot.tree.AddressTreeNodeAdapter(val, f, true));
- }
- public void doArray(sun.jvm.hotspot.debugger.cdbg.FieldIdentifier f, Address val) {
- children.add(new sun.jvm.hotspot.bugspot.tree.AddressTreeNodeAdapter(val, f, true));
- }
- public void doRef(sun.jvm.hotspot.debugger.cdbg.FieldIdentifier f, Address val) {
- children.add(new sun.jvm.hotspot.bugspot.tree.AddressTreeNodeAdapter(val, f, true));
- }
- public void doCompound(sun.jvm.hotspot.debugger.cdbg.FieldIdentifier f, Address val) {
- children.add(new sun.jvm.hotspot.bugspot.tree.ObjectTreeNodeAdapter(val, f, true));
- }
- }
-}
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/tree/AddressTreeNodeAdapter.java Tue Mar 05 09:50:53 2013 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2001, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.bugspot.tree;
-
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.debugger.cdbg.*;
-import sun.jvm.hotspot.ui.tree.SimpleTreeNode;
-
-/** Encapsulates a float value in a tree handled by SimpleTreeModel */
-
-public class AddressTreeNodeAdapter extends FieldTreeNodeAdapter {
- private Address val;
-
- public AddressTreeNodeAdapter(Address val, FieldIdentifier id) {
- this(val, id, false);
- }
-
- public AddressTreeNodeAdapter(Address val, FieldIdentifier id, boolean treeTableMode) {
- super(id, treeTableMode);
- this.val = val;
- }
-
- public int getChildCount() {
- return 0;
- }
-
- public SimpleTreeNode getChild(int index) {
- return null;
- }
-
- public boolean isLeaf() {
- return true;
- }
-
- public int getIndexOfChild(SimpleTreeNode child) {
- return 0;
- }
-
- public String getValue() {
- if (val != null) {
- return val.toString();
- }
- return "NULL";
- }
-}
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/tree/DoubleTreeNodeAdapter.java Tue Mar 05 09:50:53 2013 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2001, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.bugspot.tree;
-
-import sun.jvm.hotspot.debugger.cdbg.*;
-import sun.jvm.hotspot.ui.tree.SimpleTreeNode;
-
-/** Encapsulates a double value in a tree handled by SimpleTreeModel */
-
-public class DoubleTreeNodeAdapter extends FieldTreeNodeAdapter {
- private double val;
-
- public DoubleTreeNodeAdapter(double val, FieldIdentifier id) {
- this(val, id, false);
- }
-
- public DoubleTreeNodeAdapter(double val, FieldIdentifier id, boolean treeTableMode) {
- super(id, treeTableMode);
- this.val = val;
- }
-
- public int getChildCount() {
- return 0;
- }
-
- public SimpleTreeNode getChild(int index) {
- return null;
- }
-
- public boolean isLeaf() {
- return true;
- }
-
- public int getIndexOfChild(SimpleTreeNode child) {
- return 0;
- }
-
- public String getValue() {
- return Double.toString(val);
- }
-}
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/tree/EnumTreeNodeAdapter.java Tue Mar 05 09:50:53 2013 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2001, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.bugspot.tree;
-
-import sun.jvm.hotspot.debugger.cdbg.*;
-import sun.jvm.hotspot.ui.tree.SimpleTreeNode;
-
-/** Encapsulates an enumerated value in a tree handled by SimpleTreeModel */
-
-public class EnumTreeNodeAdapter extends FieldTreeNodeAdapter {
- private long val;
- private String enumName;
-
- public EnumTreeNodeAdapter(String enumName, long val, FieldIdentifier id) {
- this(enumName, val, id, false);
- }
-
- public EnumTreeNodeAdapter(String enumName, long val, FieldIdentifier id, boolean treeTableMode) {
- super(id, treeTableMode);
- this.enumName = enumName;
- this.val = val;
- }
-
- public int getChildCount() {
- return 0;
- }
-
- public SimpleTreeNode getChild(int index) {
- return null;
- }
-
- public boolean isLeaf() {
- return true;
- }
-
- public int getIndexOfChild(SimpleTreeNode child) {
- return 0;
- }
-
- public String getValue() {
- if (enumName != null) {
- return enumName;
- } else {
- return Long.toString(val);
- }
- }
-}
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/tree/FieldTreeNodeAdapter.java Tue Mar 05 09:50:53 2013 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2001, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.bugspot.tree;
-
-import sun.jvm.hotspot.debugger.cdbg.*;
-import sun.jvm.hotspot.ui.tree.SimpleTreeNode;
-
-/** Abstract base class for all adapters for fields of C/C++ objects */
-
-public abstract class FieldTreeNodeAdapter implements SimpleTreeNode {
- private FieldIdentifier id;
- private boolean treeTableMode;
-
- /** The identifier may be null, i.e., for the root of the tree */
- public FieldTreeNodeAdapter(FieldIdentifier id, boolean treeTableMode) {
- this.id = id;
- this.treeTableMode = treeTableMode;
- }
-
- public FieldIdentifier getID() {
- return id;
- }
-
- /** Defaults to false in subclasses */
- public boolean getTreeTableMode() {
- return treeTableMode;
- }
-
- public Type getType() {
- return getID().getType();
- }
-
- public String getName() {
- if (getID() != null) {
- return getID().toString();
- }
- return "";
- }
-
- public String toString() {
- if (treeTableMode) {
- return getName();
- } else {
- if (getID() != null) {
- return getName() + ": " + getValue();
- } else {
- return getValue();
- }
- }
- }
-}
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/tree/FloatTreeNodeAdapter.java Tue Mar 05 09:50:53 2013 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2001, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.bugspot.tree;
-
-import sun.jvm.hotspot.debugger.cdbg.*;
-import sun.jvm.hotspot.ui.tree.SimpleTreeNode;
-
-/** Encapsulates a float value in a tree handled by SimpleTreeModel */
-
-public class FloatTreeNodeAdapter extends FieldTreeNodeAdapter {
- private float val;
-
- public FloatTreeNodeAdapter(float val, FieldIdentifier id) {
- this(val, id, false);
- }
-
- public FloatTreeNodeAdapter(float val, FieldIdentifier id, boolean treeTableMode) {
- super(id, treeTableMode);
- this.val = val;
- }
-
- public int getChildCount() {
- return 0;
- }
-
- public SimpleTreeNode getChild(int index) {
- return null;
- }
-
- public boolean isLeaf() {
- return true;
- }
-
- public int getIndexOfChild(SimpleTreeNode child) {
- return 0;
- }
-
- public String getValue() {
- return Float.toString(val);
- }
-}
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/tree/LongTreeNodeAdapter.java Tue Mar 05 09:50:53 2013 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2001, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.bugspot.tree;
-
-import sun.jvm.hotspot.debugger.cdbg.*;
-import sun.jvm.hotspot.ui.tree.SimpleTreeNode;
-
-/** Encapsulates a long value in a tree handled by SimpleTreeModel */
-
-public class LongTreeNodeAdapter extends FieldTreeNodeAdapter {
- private long val;
-
- public LongTreeNodeAdapter(long val, FieldIdentifier id) {
- this(val, id, false);
- }
-
- public LongTreeNodeAdapter(long val, FieldIdentifier id, boolean treeTableMode) {
- super(id, treeTableMode);
- this.val = val;
- }
-
- public int getChildCount() {
- return 0;
- }
-
- public SimpleTreeNode getChild(int index) {
- return null;
- }
-
- public boolean isLeaf() {
- return true;
- }
-
- public int getIndexOfChild(SimpleTreeNode child) {
- return 0;
- }
-
- public String getValue() {
- return Long.toString(val);
- }
-}
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/tree/ObjectTreeNodeAdapter.java Tue Mar 05 09:50:53 2013 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,216 +0,0 @@
-/*
- * Copyright (c) 2001, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.bugspot.tree;
-
-import java.io.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.debugger.cdbg.*;
-import sun.jvm.hotspot.ui.tree.SimpleTreeNode;
-
-/** An adapter class which allows C/C++ objects to be displayed in a
- tree via the SimpleTreeNode interface. */
-
-public class ObjectTreeNodeAdapter extends FieldTreeNodeAdapter {
- // Address of object
- private Address addr;
-
- /** The address may be null (for object fields of objcets which are
- null). The FieldIdentifier should not be null. treeTableMode
- defaults to false. */
- public ObjectTreeNodeAdapter(Address addr, FieldIdentifier id) {
- this(addr, id, false);
- }
-
- /** The address may be null (for object fields of objcets which are
- null). The FieldIdentifier should not be null. */
- public ObjectTreeNodeAdapter(Address addr, FieldIdentifier id, boolean treeTableMode) {
- super(id, treeTableMode);
- this.addr = addr;
- }
-
- public int getChildCount() {
- if (addr == null) {
- return 0;
- }
-
- Counter c = new Counter();
- getType().iterateObject(addr, c);
- return c.getNumFields();
- }
-
- public SimpleTreeNode getChild(int index) {
- if (addr == null) {
- return null;
- }
-
- Fetcher f = new Fetcher(index);
- getType().iterateObject(addr, f);
- return f.getChild();
- }
-
- public boolean isLeaf() {
- return (addr == null);
- }
-
- public int getIndexOfChild(SimpleTreeNode child) {
- FieldIdentifier id = ((FieldTreeNodeAdapter) child).getID();
- Finder f = new Finder(id);
- getType().iterateObject(addr, f);
- return f.getIndex();
- }
-
- public String getValue() {
- if (addr != null) {
- return addr.toString();
- }
- return "NULL";
- }
-
- /** Should be used only once, then have the number of fields
- fetched. */
- static class Counter extends DefaultObjectVisitor {
- private int numFields;
-
- public int getNumFields() {
- return numFields;
- }
-
- public void doBit(FieldIdentifier f, long val) { ++numFields; }
- public void doInt(FieldIdentifier f, long val) { ++numFields; }
- public void doEnum(FieldIdentifier f, long val, String enumName) { ++numFields; }
- public void doFloat(FieldIdentifier f, float val) { ++numFields; }
- public void doDouble(FieldIdentifier f, double val) { ++numFields; }
- public void doPointer(FieldIdentifier f, Address val) { ++numFields; }
- public void doArray(FieldIdentifier f, Address val) { ++numFields; }
- public void doRef(FieldIdentifier f, Address val) { ++numFields; }
- public void doCompound(FieldIdentifier f, Address addr) { ++numFields; }
- }
-
- /** Creates a new SimpleTreeNode for the given field. */
- class Fetcher extends DefaultObjectVisitor {
- private int index;
- private int curField;
- private SimpleTreeNode child;
-
- public Fetcher(int index) {
- this.index = index;
- }
-
- public SimpleTreeNode getChild() {
- return child;
- }
-
- public void doBit(FieldIdentifier f, long val) {
- if (curField == index) {
- child = new LongTreeNodeAdapter(val, f, getTreeTableMode());
- }
- ++curField;
- }
-
- public void doInt(FieldIdentifier f, long val) {
- if (curField == index) {
- child = new LongTreeNodeAdapter(val, f, getTreeTableMode());
- }
- ++curField;
- }
-
- public void doEnum(FieldIdentifier f, long val, String enumName) {
- if (curField == index) {
- child = new EnumTreeNodeAdapter(enumName, val, f, getTreeTableMode());
- }
- ++curField;
- }
-
- public void doFloat(FieldIdentifier f, float val) {
- if (curField == index) {
- child = new FloatTreeNodeAdapter(val, f, getTreeTableMode());
- }
- ++curField;
- }
-
- public void doDouble(FieldIdentifier f, double val) {
- if (curField == index) {
- child = new DoubleTreeNodeAdapter(val, f, getTreeTableMode());
- }
- ++curField;
- }
-
- public void doPointer(FieldIdentifier f, Address val) {
- if (curField == index) {
- child = new AddressTreeNodeAdapter(val, f, getTreeTableMode());
- }
- ++curField;
- }
-
- public void doArray(FieldIdentifier f, Address val) {
- if (curField == index) {
- child = new AddressTreeNodeAdapter(val, f, getTreeTableMode());
- }
- ++curField;
- }
-
- public void doRef(FieldIdentifier f, Address val) {
- if (curField == index) {
- child = new AddressTreeNodeAdapter(val, f, getTreeTableMode());
- }
- ++curField;
- }
-
- public void doCompound(FieldIdentifier f, Address val) {
- if (curField == index) {
- child = new ObjectTreeNodeAdapter(val, f, getTreeTableMode());
- }
- ++curField;
- }
- }
-
- /** Finds the index of the given FieldIdentifier. */
- static class Finder extends DefaultObjectVisitor {
- private FieldIdentifier id;
- private int curField;
- private int index = -1;
-
- public Finder(FieldIdentifier id) {
- this.id = id;
- }
-
- /** Returns -1 if not found */
- public int getIndex() {
- return index;
- }
-
- public void doBit(FieldIdentifier f, long val) { if (f.equals(id)) { index = curField; } ++curField; }
- public void doInt(FieldIdentifier f, long val) { if (f.equals(id)) { index = curField; } ++curField; }
- public void doEnum(FieldIdentifier f, long val,
- String enumName) { if (f.equals(id)) { index = curField; } ++curField; }
- public void doFloat(FieldIdentifier f, float val) { if (f.equals(id)) { index = curField; } ++curField; }
- public void doDouble(FieldIdentifier f, double val) { if (f.equals(id)) { index = curField; } ++curField; }
- public void doPointer(FieldIdentifier f, Address val) { if (f.equals(id)) { index = curField; } ++curField; }
- public void doArray(FieldIdentifier f, Address val) { if (f.equals(id)) { index = curField; } ++curField; }
- public void doRef(FieldIdentifier f, Address val) { if (f.equals(id)) { index = curField; } ++curField; }
- public void doCompound(FieldIdentifier f,
- Address val) { if (f.equals(id)) { index = curField; } ++curField; }
- }
-}
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/livejvm/BreakpointEvent.java Tue Mar 05 09:50:53 2013 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2002, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.livejvm;
-
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.runtime.*;
-
-public class BreakpointEvent extends Event {
- private Oop thread;
- private Oop clazz;
- private JNIid method;
- private int location;
-
- public BreakpointEvent(Oop thread,
- Oop clazz,
- JNIid method,
- int location) {
- super(Event.Type.BREAKPOINT);
- this.thread = thread;
- this.clazz = clazz;
- this.method = method;
- this.location = location;
- }
-
- public Oop thread() { return thread; }
- public Oop clazz() { return clazz; }
- public JNIid methodID() { return method; }
- public int location() { return location; }
-}
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/livejvm/CIntegerAccessor.java Tue Mar 05 09:50:53 2013 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2002, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.livejvm;
-
-import sun.jvm.hotspot.debugger.*;
-
-class CIntegerAccessor {
- private Address addr;
- private long numBytes;
- private boolean isUnsigned;
-
- CIntegerAccessor(Address addr, long numBytes, boolean isUnsigned) {
- this.addr = addr;
- this.numBytes = numBytes;
- this.isUnsigned = isUnsigned;
- }
-
- long getValue() {
- return addr.getCIntegerAt(0, numBytes, isUnsigned);
- }
-
- void setValue(long value) {
- addr.setCIntegerAt(0, numBytes, value);
- }
-}
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/livejvm/CStringAccessor.java Tue Mar 05 09:50:53 2013 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2002, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.livejvm;
-
-import java.io.UnsupportedEncodingException;
-import sun.jvm.hotspot.debugger.*;
-
-class CStringAccessor {
- private Address addr;
- private int bufLen;
-
- CStringAccessor(Address addr, int bufLen) {
- this.addr = addr;
- this.bufLen = bufLen;
- }
-
- String getValue() throws DebuggerException {
- int len = 0;
- while ((addr.getCIntegerAt(len, 1, true) != 0) && (len < bufLen)) {
- ++len;
- }
- byte[] res = new byte[len];
- for (int i = 0; i < len; i++) {
- res[i] = (byte) addr.getCIntegerAt(i, 1, true);
- }
- try {
- return new String(res, "US-ASCII");
- } catch (UnsupportedEncodingException e) {
- throw new DebuggerException("Unable to use US-ASCII encoding");
- }
- }
-
- void setValue(String value) throws DebuggerException {
- try {
- byte[] data = value.getBytes("US-ASCII");
- if (data.length >= bufLen) {
- throw new DebuggerException("String too long");
- }
- for (int i = 0; i < data.length; i++) {
- addr.setCIntegerAt(i, 1, data[i]);
- }
- addr.setCIntegerAt(data.length, 1, 0);
- } catch (UnsupportedEncodingException e) {
- throw new DebuggerException("Unable to use US-ASCII encoding");
- }
- }
-}
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/livejvm/Event.java Tue Mar 05 09:50:53 2013 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2002, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.livejvm;
-
-public class Event {
- public static class Type {
- private Type() {}
- public static final Type BREAKPOINT = new Type();
- public static final Type EXCEPTION = new Type();
- }
-
- private Type type;
-
- public Event(Type type) {
- this.type = type;
- }
-
- public Type getType() { return type; }
-}
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/livejvm/ExceptionEvent.java Tue Mar 05 09:50:53 2013 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2002, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.livejvm;
-
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.runtime.*;
-
-public class ExceptionEvent extends Event {
- private Oop thread;
- private Oop clazz;
- private JNIid method;
- private int location;
- private Oop exception;
- private Oop catchClass;
- private JNIid catchMethod;
- private int catchLocation;
-
- public ExceptionEvent(Oop thread,
- Oop clazz,
- JNIid method,
- int location,
- Oop exception,
- Oop catchClass,
- JNIid catchMethod,
- int catchLocation) {
- super(Event.Type.EXCEPTION);
- this.thread = thread;
- this.clazz = clazz;
- this.method = method;
- this.location = location;
- this.exception = exception;
- this.catchClass = catchClass;
- this.catchMethod = catchMethod;
- this.catchLocation = catchLocation;
- }
-
- public Oop thread() { return thread; }
- public Oop clazz() { return clazz; }
- public JNIid methodID() { return method; }
- public int location() { return location; }
- public Oop exception() { return exception; }
- public Oop catchClass() { return catchClass; }
- public JNIid catchMethodID() { return catchMethod; }
- public int catchLocation() { return catchLocation; }
-}
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/livejvm/JNIHandleAccessor.java Tue Mar 05 09:50:53 2013 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2002, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.livejvm;
-
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.utilities.*;
-
-class JNIHandleAccessor {
- private Address addr;
- private ObjectHeap heap;
-
- JNIHandleAccessor(Address addr, ObjectHeap heap) {
- this.addr = addr;
- this.heap = heap;
- }
-
- Oop getValue() {
- // Accessing the contents of the JNIHandle is a double dereference
- Address handle = addr.getAddressAt(0);
- if (handle == null) return null;
- return heap.newOop(handle.getOopHandleAt(0));
- }
-
- void setValue(Oop value) {
- Address handle = addr.getAddressAt(0);
- if (Assert.ASSERTS_ENABLED) {
- Assert.that(handle != null, "Must have valid global JNI handle for setting");
- }
- handle.setOopHandleAt(0, value.getHandle());
- }
-}
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/livejvm/ServiceabilityAgentJVMDIModule.java Tue Mar 05 09:50:53 2013 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,415 +0,0 @@
-/*
- * Copyright (c) 2002, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.livejvm;
-
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.runtime.*;
-
-/** Provides Java programming language-level interaction with a live
- Java HotSpot VM via the use of the SA's JVMDI module. This is an
- experimental mechanism. The BugSpot debugger should be converted
- to use the JVMDI/JDWP-based JDI implementation for live process
- interaction once the JDI binding for the SA is complete. */
-
-public class ServiceabilityAgentJVMDIModule {
- private Debugger dbg;
- private String[] saLibNames;
- private String saLibName;
- private boolean attached;
-
- private boolean suspended;
-
- private static final int JVMDI_EVENT_BREAKPOINT = 2;
- private static final int JVMDI_EVENT_EXCEPTION = 4;
-
- private static long timeoutMillis = 3000;
-
- // Values in target process
- // Events sent from VM to SA
- private CIntegerAccessor saAttached;
- private CIntegerAccessor saEventPending;
- private CIntegerAccessor saEventKind;
- // Exception events
- private JNIHandleAccessor saExceptionThread;
- private JNIHandleAccessor saExceptionClass;
- private JNIid saExceptionMethod;
- private CIntegerAccessor saExceptionLocation;
- private JNIHandleAccessor saExceptionException;
- private JNIHandleAccessor saExceptionCatchClass;
- private JNIid saExceptionCatchMethod;
- private CIntegerAccessor saExceptionCatchLocation;
- // Breakpoint events
- private JNIHandleAccessor saBreakpointThread;
- private JNIHandleAccessor saBreakpointClass;
- private JNIid saBreakpointMethod;
- private CIntegerAccessor saBreakpointLocation;
- // Commands sent by the SA to the VM
- private int SA_CMD_SUSPEND_ALL;
- private int SA_CMD_RESUME_ALL;
- private int SA_CMD_TOGGLE_BREAKPOINT;
- private int SA_CMD_BUF_SIZE;
- private CIntegerAccessor saCmdPending;
- private CIntegerAccessor saCmdType;
- private CIntegerAccessor saCmdResult;
- private CStringAccessor saCmdResultErrMsg;
- // Toggle breakpoint command arguments
- private CStringAccessor saCmdBkptSrcFileName;
- private CStringAccessor saCmdBkptPkgName;
- private CIntegerAccessor saCmdBkptLineNumber;
- private CIntegerAccessor saCmdBkptResWasError;
- private CIntegerAccessor saCmdBkptResLineNumber;
- private CIntegerAccessor saCmdBkptResBCI;
- private CIntegerAccessor saCmdBkptResWasSet;
- private CStringAccessor saCmdBkptResMethodName;
- private CStringAccessor saCmdBkptResMethodSig;
-
- public ServiceabilityAgentJVMDIModule(Debugger dbg, String[] saLibNames) {
- this.dbg = dbg;
- this.saLibNames = saLibNames;
- }
-
- /** Indicates whether a call to attach() should complete without an
- exception. */
- public boolean canAttach() {
- return setupLookup("SA_CMD_SUSPEND_ALL");
- }
-
- /** Attempt to initiate a connection with the JVMDI module in the
- target VM. */
- public void attach() throws DebuggerException {
- if (!canAttach()) {
- throw new DebuggerException("Unable to initiate symbol lookup in SA's JVMDI module");
- }
-
- if (attached) {
- throw new DebuggerException("Already attached");
- }
-
- // Attempt to look up well-known symbols in the target VM.
- SA_CMD_SUSPEND_ALL = lookupConstInt("SA_CMD_SUSPEND_ALL");
- SA_CMD_RESUME_ALL = lookupConstInt("SA_CMD_RESUME_ALL");
- SA_CMD_TOGGLE_BREAKPOINT = lookupConstInt("SA_CMD_TOGGLE_BREAKPOINT");
- SA_CMD_BUF_SIZE = lookupConstInt("SA_CMD_BUF_SIZE");
-
- saAttached = lookupCInt("saAttached");
- saEventPending = lookupCInt("saEventPending");
- saEventKind = lookupCInt("saEventKind");
- saCmdPending = lookupCInt("saCmdPending");
- saCmdType = lookupCInt("saCmdType");
- saCmdResult = lookupCInt("saCmdResult");
- saCmdResultErrMsg = lookupCString("saCmdResultErrMsg", SA_CMD_BUF_SIZE);
- // Toggling of breakpoints
- saCmdBkptSrcFileName = lookupCString("saCmdBkptSrcFileName", SA_CMD_BUF_SIZE);
- saCmdBkptPkgName = lookupCString("saCmdBkptPkgName", SA_CMD_BUF_SIZE);
- saCmdBkptLineNumber = lookupCInt("saCmdBkptLineNumber");
- saCmdBkptResWasError = lookupCInt("saCmdBkptResWasError");
- saCmdBkptResLineNumber = lookupCInt("saCmdBkptResLineNumber");
- saCmdBkptResBCI = lookupCInt("saCmdBkptResBCI");
- saCmdBkptResWasSet = lookupCInt("saCmdBkptResWasSet");
- saCmdBkptResMethodName = lookupCString("saCmdBkptResMethodName", SA_CMD_BUF_SIZE);
- saCmdBkptResMethodSig = lookupCString("saCmdBkptResMethodSig", SA_CMD_BUF_SIZE);
-
- // Check for existence of symbols needed later
- // FIXME: should probably cache these since we can't support the
- // -Xrun module or the VM getting unloaded anyway
- lookup("saExceptionThread");
- lookup("saExceptionClass");
- lookup("saExceptionMethod");
- lookup("saExceptionLocation");
- lookup("saExceptionException");
- lookup("saExceptionCatchClass");
- lookup("saExceptionCatchMethod");
- lookup("saExceptionCatchLocation");
- lookup("saBreakpointThread");
- lookup("saBreakpointClass");
- lookup("saBreakpointMethod");
- lookup("saBreakpointLocation");
-
- saAttached.setValue(1);
- attached = true;
- }
-
- public void detach() {
- saAttached.setValue(0);
- attached = false;
- saLibName = null;
- }
-
- /** Set the timeout value (in milliseconds) for the VM to reply to
- commands. Once this timeout has elapsed, the VM is assumed to
- have disconnected. Defaults to 3000 milliseconds (3 seconds). */
- public void setCommandTimeout(long millis) {
- timeoutMillis = millis;
- }
-
- /** Get the timeout value (in milliseconds) for the VM to reply to
- commands. Once this timeout has elapsed, the VM is assumed to
- have disconnected. Defaults to 3000 milliseconds (3 seconds). */
- public long getCommandTimeout() {
- return timeoutMillis;
- }
-
- /** Indicates whether a Java debug event is pending */
- public boolean eventPending() {
- return (saEventPending.getValue() != 0);
- }
-
- /** Poll for event; returns null if none pending. */
- public Event eventPoll() {
- if (saEventPending.getValue() == 0) {
- return null;
- }
-
- int kind = (int) saEventKind.getValue();
- switch (kind) {
- case JVMDI_EVENT_EXCEPTION: {
- JNIHandleAccessor thread = lookupJNIHandle("saExceptionThread");
- JNIHandleAccessor clazz = lookupJNIHandle("saExceptionClass");
- JNIid method = lookupJNIid("saExceptionMethod");
- CIntegerAccessor location = lookupCInt("saExceptionLocation");
- JNIHandleAccessor exception = lookupJNIHandle("saExceptionException");
- JNIHandleAccessor catchClass = lookupJNIHandle("saExceptionCatchClass");
- JNIid catchMethod = lookupJNIid("saExceptionCatchMethod");
- CIntegerAccessor catchLocation = lookupCInt("saExceptionCatchLocation");
- return new ExceptionEvent(thread.getValue(), clazz.getValue(), method,
- (int) location.getValue(), exception.getValue(),
- catchClass.getValue(), catchMethod, (int) catchLocation.getValue());
- }
-
- case JVMDI_EVENT_BREAKPOINT: {
- JNIHandleAccessor thread = lookupJNIHandle("saBreakpointThread");
- JNIHandleAccessor clazz = lookupJNIHandle("saBreakpointClass");
- JNIid method = lookupJNIid("saBreakpointMethod");
- CIntegerAccessor location = lookupCInt("saBreakpointLocation");
- return new BreakpointEvent(thread.getValue(), clazz.getValue(),
- method, (int) location.getValue());
- }
-
- default:
- throw new DebuggerException("Unsupported event type " + kind);
- }
- }
-
- /** Continue past current event */
- public void eventContinue() {
- saEventPending.setValue(0);
- }
-
- /** Suspend all Java threads in the target VM. Throws
- DebuggerException if the VM disconnected. */
- public void suspend() {
- saCmdType.setValue(SA_CMD_SUSPEND_ALL);
- saCmdPending.setValue(1);
- waitForCommandCompletion();
- suspended = true;
- }
-
- /** Resume all Java threads in the target VM. Throws
- DebuggerException if the VM disconnected. */
- public void resume() {
- saCmdType.setValue(SA_CMD_RESUME_ALL);
- saCmdPending.setValue(1);
- waitForCommandCompletion();
- suspended = false;
- }
-
- /** Indicates whether all Java threads have been suspended via this
- interface. */
- public boolean isSuspended() {
- return suspended;
- }
-
- /** Information about toggling of breakpoints */
- public static class BreakpointToggleResult {
- private boolean success;
- private String errMsg;
- private int lineNumber;
- private int bci;
- private boolean wasSet;
- private String methodName;
- private String methodSig;
-
- /** Success constructor */
- public BreakpointToggleResult(int lineNumber, int bci, boolean wasSet,
- String methodName, String methodSig) {
- this.lineNumber = lineNumber;
- this.bci = bci;
- this.wasSet = wasSet;
- this.methodName = methodName;
- this.methodSig = methodSig;
- success = true;
- }
-
- /** Failure constructor */
- public BreakpointToggleResult(String errMsg) {
- this.errMsg = errMsg;
- success = false;
- }
-
- /** Indicates whether this represents a successful return or not */
- public boolean getSuccess() { return success; }
-
- /** Valid only if getSuccess() returns false */
- public String getErrMsg() { return errMsg; }
-
- /** Line number at which breakpoint toggle occurred; valid only if
- getSuccess() returns true. */
- public int getLineNumber() { return lineNumber; }
-
- /** BCI at which breakpoint toggle occurred; valid only if
- getSuccess() returns true. */
- public int getBCI() { return bci; }
-
- /** Indicates whether the breakpoint toggle was the set of a
- breakpoint or not; valid only if getSuccess() returns true. */
- public boolean getWasSet() { return wasSet; }
-
- /** Method name in which the breakpoint toggle occurred; valid
- only if getSuccess() returns true. */
- public String getMethodName() { return methodName; }
-
- /** Method signature in which the breakpoint toggle occurred;
- valid only if getSuccess() returns true. */
- public String getMethodSignature() { return methodSig; }
- }
-
- /** Toggle a breakpoint. Throws DebuggerException if a real error
- occurred; otherwise returns non-null BreakpointToggleResult. The
- work of scanning the loaded classes is done in the target VM
- because it turns out to be significantly faster than scanning
- through the system dictionary from the SA, and interactivity
- when setting breakpoints is important. */
- public BreakpointToggleResult toggleBreakpoint(String srcFileName,
- String pkgName,
- int lineNo) {
- saCmdBkptSrcFileName.setValue(srcFileName);
- saCmdBkptPkgName.setValue(pkgName);
- saCmdBkptLineNumber.setValue(lineNo);
- saCmdType.setValue(SA_CMD_TOGGLE_BREAKPOINT);
- saCmdPending.setValue(1);
- if (waitForCommandCompletion(true)) {
- return new BreakpointToggleResult((int) saCmdBkptResLineNumber.getValue(),
- (int) saCmdBkptResBCI.getValue(),
- (saCmdBkptResWasSet.getValue() != 0),
- saCmdBkptResMethodName.getValue(),
- saCmdBkptResMethodSig.getValue());
- } else {
- return new BreakpointToggleResult(saCmdResultErrMsg.getValue());
- }
- }
-
-
- //----------------------------------------------------------------------
- // Internals only below this point
- //
-
- private CIntegerAccessor lookupCInt(String symbolName) {
- return new CIntegerAccessor(lookup(symbolName), 4, false);
- }
-
- private CStringAccessor lookupCString(String symbolName, int bufLen) {
- return new CStringAccessor(lookup(symbolName), bufLen);
- }
-
- private JNIHandleAccessor lookupJNIHandle(String symbolName) {
- return new JNIHandleAccessor(lookup(symbolName), VM.getVM().getObjectHeap());
- }
-
- private JNIid lookupJNIid(String symbolName) {
- Address idAddr = lookup(symbolName).getAddressAt(0);
- if (idAddr == null) {
- return null;
- }
- return new JNIid(idAddr, VM.getVM().getObjectHeap());
- }
-
- private int lookupConstInt(String symbolName) {
- Address addr = lookup(symbolName);
- return (int) addr.getCIntegerAt(0, 4, false);
- }
-
- private boolean setupLookup(String symbolName) {
- if (saLibName == null) {
- for (int i = 0; i < saLibNames.length; i++) {
- Address addr = dbg.lookup(saLibNames[i], symbolName);
- if (addr != null) {
- saLibName = saLibNames[i];
- return true;
- }
- }
- return false;
- }
- return true;
- }
-
- private Address lookup(String symbolName) {
- if (saLibName == null) {
- for (int i = 0; i < saLibNames.length; i++) {
- Address addr = dbg.lookup(saLibNames[i], symbolName);
- if (addr != null) {
- saLibName = saLibNames[i];
- return addr;
- }
- }
- throw new DebuggerException("Unable to find symbol " + symbolName + " in any of the known names for the SA");
- }
-
- Address addr = dbg.lookup(saLibName, symbolName);
- if (addr == null) {
- throw new DebuggerException("Unable to find symbol " + symbolName + " in " + saLibName);
- }
- return addr;
- }
-
- private void waitForCommandCompletion() {
- waitForCommandCompletion(false);
- }
-
- /** Returns true if command succeeded, false if not */
- private boolean waitForCommandCompletion(boolean forBreakpoint) {
- long start = System.currentTimeMillis();
- long cur = start;
- while ((saCmdPending.getValue() != 0) &&
- (cur - start < timeoutMillis)) {
- try {
- java.lang.Thread.currentThread().sleep(10);
- } catch (InterruptedException e) {
- }
- cur = System.currentTimeMillis();
- }
- if (saCmdPending.getValue() != 0) {
- detach();
- throw new DebuggerException("VM appears to have died");
- }
- boolean succeeded = saCmdResult.getValue() == 0;
- if (!succeeded &&
- (!forBreakpoint || saCmdBkptResWasError.getValue() != 0)) {
- String err = saCmdResultErrMsg.getValue();
- throw new DebuggerException("Error executing JVMDI command: " + err);
- }
- return succeeded;
- }
-}
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/CMSCollector.java Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/CMSCollector.java Tue Mar 05 11:49:33 2013 -0800
@@ -61,15 +61,13 @@
CMSBitMap markBitMap = markBitMap();
long addressSize = VM.getVM().getAddressSize();
if ( markBitMap.isMarked(addr) && markBitMap.isMarked(addr.addOffsetTo(1*addressSize)) ) {
- System.err.println("Printezis bits are set...");
Address nextOneAddr = markBitMap.getNextMarkedWordAddress(addr.addOffsetTo(2*addressSize));
//return size in bytes
long size = (nextOneAddr.addOffsetTo(1*addressSize)).minus(addr);
return size;
} else {
- //missing Printezis marks
- System.err.println("Missing Printszis marks...");
- return -1;
+ //missing Printezis marks
+ return -1;
}
}
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/CompactibleFreeListSpace.java Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/CompactibleFreeListSpace.java Tue Mar 05 11:49:33 2013 -0800
@@ -191,7 +191,6 @@
//Find the object size using Printezis bits and skip over
long size = collector().blockSizeUsingPrintezisBits(cur);
if (size == -1) {
- System.err.println("Printezis bits not set...");
break;
}
cur = cur.addOffsetTo(adjustObjectSizeInBytes(size));
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPool.java Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPool.java Tue Mar 05 11:49:33 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, 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
@@ -469,7 +469,6 @@
case JVM_CONSTANT_UnresolvedClassInError: return "JVM_CONSTANT_UnresolvedClassInError";
case JVM_CONSTANT_MethodHandleInError:return "JVM_CONSTANT_MethodHandleInError";
case JVM_CONSTANT_MethodTypeInError: return "JVM_CONSTANT_MethodTypeInError";
- case JVM_CONSTANT_Object: return "JVM_CONSTANT_Object";
}
throw new InternalError("Unknown tag: " + tag);
}
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/MethodData.java Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/MethodData.java Tue Mar 05 11:49:33 2013 -0800
@@ -184,7 +184,6 @@
if (trapReasonName[index] == null) {
throw new InternalError("missing reason for " + index);
}
- System.out.println(trapReasonName[index]);
}
}
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java Tue Mar 05 11:49:33 2013 -0800
@@ -335,7 +335,6 @@
}
if (obj == null) {
//Find the object size using Printezis bits and skip over
- System.err.println("Finding object size using Printezis bits and skipping over...");
long size = 0;
if ( (cmsSpaceOld != null) && cmsSpaceOld.contains(handle) ){
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ClassConstants.java Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ClassConstants.java Tue Mar 05 11:49:33 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2013, 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
@@ -67,7 +67,6 @@
public static final int JVM_CONSTANT_UnresolvedClassInError = 103; // Error tag due to resolution error
public static final int JVM_CONSTANT_MethodHandleInError = 104; // Error tag due to resolution error
public static final int JVM_CONSTANT_MethodTypeInError = 105; // Error tag due to resolution error
- public static final int JVM_CONSTANT_Object = 106; // Required for BoundMethodHandle arguments.
// 1.5 major/minor version numbers from JVM spec. 3rd edition
public static final short MAJOR_VERSION = 49;
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java Tue Mar 05 11:49:33 2013 -0800
@@ -90,10 +90,6 @@
/** Flags indicating whether we are attached to a core, C1, or C2 build */
private boolean usingClientCompiler;
private boolean usingServerCompiler;
- /** Flag indicating whether UseTLAB is turned on */
- private boolean useTLAB;
- /** Flag indicating whether invokedynamic support is on */
- private boolean enableInvokeDynamic;
/** alignment constants */
private boolean isLP64;
private int bytesPerLong;
@@ -326,9 +322,6 @@
}
}
- useTLAB = (db.lookupIntConstant("UseTLAB").intValue() != 0);
- enableInvokeDynamic = (db.lookupIntConstant("EnableInvokeDynamic").intValue() != 0);
-
if (debugger != null) {
isLP64 = debugger.getMachineDescription().isLP64();
}
@@ -579,15 +572,6 @@
}
}
- /** Indicates whether Thread-Local Allocation Buffers are used */
- public boolean getUseTLAB() {
- return useTLAB;
- }
-
- public boolean getEnableInvokeDynamic() {
- return enableInvokeDynamic;
- }
-
public TypeDataBase getTypeDataBase() {
return db;
}
@@ -822,6 +806,12 @@
return objectAlignmentInBytes;
}
+ /** Indicates whether Thread-Local Allocation Buffers are used */
+ public boolean getUseTLAB() {
+ Flag flag = getCommandLineFlag("UseTLAB");
+ return (flag == null) ? false: flag.getBool();
+ }
+
// returns null, if not available.
public Flag[] getCommandLineFlags() {
if (commandLineFlags == null) {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/ClassLoaderStats.java Tue Mar 05 11:49:33 2013 -0800
@@ -0,0 +1,277 @@
+/*
+ * Copyright (c) 2003, 2013, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package sun.jvm.hotspot.tools;
+
+import java.io.*;
+import java.util.*;
+
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.memory.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.tools.*;
+import sun.jvm.hotspot.utilities.*;
+
+/**
+ A command line tool to print class loader statistics.
+*/
+
+public class ClassLoaderStats extends Tool {
+ boolean verbose = true;
+
+ public static void main(String[] args) {
+ ClassLoaderStats cls = new ClassLoaderStats();
+ cls.start(args);
+ cls.stop();
+ }
+
+ private static class ClassData {
+ Klass klass;
+ long size;
+
+ ClassData(Klass klass, long size) {
+ this.klass = klass; this.size = size;
+ }
+ }
+
+ private static class LoaderData {
+ long numClasses;
+ long classSize;
+ List classDetail = new ArrayList(); // List<ClassData>
+ }
+
+ public void run() {
+ printClassLoaderStatistics();
+ }
+
+ private void printClassLoaderStatistics() {
+ final PrintStream out = System.out;
+ final PrintStream err = System.err;
+ final Map loaderMap = new HashMap();
+ // loader data for bootstrap class loader
+ final LoaderData bootstrapLoaderData = new LoaderData();
+ if (verbose) {
+ err.print("finding class loader instances ..");
+ }
+
+ VM vm = VM.getVM();
+ ObjectHeap heap = vm.getObjectHeap();
+ Klass classLoaderKlass = vm.getSystemDictionary().getClassLoaderKlass();
+ try {
+ heap.iterateObjectsOfKlass(new DefaultHeapVisitor() {
+ public boolean doObj(Oop oop) {
+ loaderMap.put(oop, new LoaderData());
+ return false;
+ }
+ }, classLoaderKlass);
+ } catch (Exception se) {
+ se.printStackTrace();
+ }
+
+ if (verbose) {
+ err.println("done.");
+ err.print("computing per loader stat ..");
+ }
+
+ SystemDictionary dict = VM.getVM().getSystemDictionary();
+ dict.classesDo(new SystemDictionary.ClassAndLoaderVisitor() {
+ public void visit(Klass k, Oop loader) {
+ if (! (k instanceof InstanceKlass)) {
+ return;
+ }
+ LoaderData ld = (loader != null) ? (LoaderData)loaderMap.get(loader)
+ : bootstrapLoaderData;
+ if (ld != null) {
+ ld.numClasses++;
+ long size = computeSize((InstanceKlass)k);
+ ld.classDetail.add(new ClassData(k, size));
+ ld.classSize += size;
+ }
+ }
+ });
+
+ if (verbose) {
+ err.println("done.");
+ err.print("please wait.. computing liveness");
+ }
+
+ // compute reverse pointer analysis (takes long time for larger app)
+ ReversePtrsAnalysis analysis = new ReversePtrsAnalysis();
+
+ if (verbose) {
+ analysis.setHeapProgressThunk(new HeapProgressThunk() {
+ public void heapIterationFractionUpdate(double fractionOfHeapVisited) {
+ err.print('.');
+ }
+ // This will be called after the iteration is complete
+ public void heapIterationComplete() {
+ err.println("done.");
+ }
+ });
+ }
+
+ try {
+ analysis.run();
+ } catch (Exception e) {
+ // e.printStackTrace();
+ if (verbose)
+ err.println("liveness analysis may be inaccurate ...");
+ }
+ ReversePtrs liveness = VM.getVM().getRevPtrs();
+
+ out.println("class_loader\tclasses\tbytes\tparent_loader\talive?\ttype");
+ out.println();
+
+ long numClassLoaders = 1L;
+ long totalNumClasses = bootstrapLoaderData.numClasses;
+ long totalClassSize = bootstrapLoaderData.classSize;
+ long numAliveLoaders = 1L;
+ long numDeadLoaders = 0L;
+
+ // print bootstrap loader details
+ out.print("<bootstrap>");
+ out.print('\t');
+ out.print(bootstrapLoaderData.numClasses);
+ out.print('\t');
+ out.print(bootstrapLoaderData.classSize);
+ out.print('\t');
+ out.print(" null ");
+ out.print('\t');
+ // bootstrap loader is always alive
+ out.print("live");
+ out.print('\t');
+ out.println("<internal>");
+
+ for (Iterator keyItr = loaderMap.keySet().iterator(); keyItr.hasNext();) {
+ Oop loader = (Oop) keyItr.next();
+ LoaderData data = (LoaderData) loaderMap.get(loader);
+ numClassLoaders ++;
+ totalNumClasses += data.numClasses;
+ totalClassSize += data.classSize;
+
+ out.print(loader.getHandle());
+ out.print('\t');
+ out.print(data.numClasses);
+ out.print('\t');
+ out.print(data.classSize);
+ out.print('\t');
+
+ class ParentFinder extends DefaultOopVisitor {
+ public void doOop(OopField field, boolean isVMField) {
+ if (field.getID().getName().equals("parent")) {
+ parent = field.getValue(getObj());
+ }
+ }
+ private Oop parent = null;
+ public Oop getParent() { return parent; }
+ }
+
+ ParentFinder parentFinder = new ParentFinder();
+ loader.iterate(parentFinder, false);
+ Oop parent = parentFinder.getParent();
+ out.print((parent != null)? parent.getHandle().toString() : " null ");
+ out.print('\t');
+ boolean alive = (liveness != null) ? (liveness.get(loader) != null) : true;
+ out.print(alive? "live" : "dead");
+ if (alive) numAliveLoaders++; else numDeadLoaders++;
+ out.print('\t');
+ Klass loaderKlass = loader.getKlass();
+ if (loaderKlass != null) {
+ out.print(loaderKlass.getName().asString());
+ out.print('@');
+ out.print(loader.getKlass().getAddress());
+ } else {
+ out.print(" null! ");
+ }
+ out.println();
+ }
+
+ out.println();
+ // summary line
+ out.print("total = ");
+ out.print(numClassLoaders);
+ out.print('\t');
+ out.print(totalNumClasses);
+ out.print('\t');
+ out.print(totalClassSize);
+ out.print('\t');
+ out.print(" N/A ");
+ out.print('\t');
+ out.print("alive=");
+ out.print(numAliveLoaders);
+ out.print(", dead=");
+ out.print(numDeadLoaders);
+ out.print('\t');
+ out.print(" N/A ");
+ out.println();
+ }
+
+ private static long objectSize(Oop oop) {
+ return oop == null ? 0L : oop.getObjectSize();
+ }
+
+ // Don't count the shared empty arrays
+ private static long arraySize(GenericArray arr) {
+ return arr.getLength() != 0L ? arr.getSize() : 0L;
+ }
+
+ private long computeSize(InstanceKlass k) {
+ long size = 0L;
+ // the InstanceKlass object itself
+ size += k.getSize();
+
+ // Constant pool
+ ConstantPool cp = k.getConstants();
+ size += cp.getSize();
+ if (cp.getCache() != null) {
+ size += cp.getCache().getSize();
+ }
+ size += arraySize(cp.getTags());
+
+ // Interfaces
+ size += arraySize(k.getLocalInterfaces());
+ size += arraySize(k.getTransitiveInterfaces());
+
+ // Inner classes
+ size += arraySize(k.getInnerClasses());
+
+ // Fields
+ size += arraySize(k.getFields());
+
+ // Methods
+ MethodArray methods = k.getMethods();
+ int nmethods = (int) methods.getLength();
+ if (nmethods != 0L) {
+ size += methods.getSize();
+ for (int i = 0; i < nmethods; ++i) {
+ Method m = methods.at(i);
+ size += m.getSize();
+ size += m.getConstMethod().getSize();
+ }
+ }
+
+ return size;
+ }
+}
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/HeapSummary.java Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/HeapSummary.java Tue Mar 05 11:49:33 2013 -0800
@@ -57,17 +57,18 @@
printGCAlgorithm(flagMap);
System.out.println();
System.out.println("Heap Configuration:");
- printValue("MinHeapFreeRatio = ", getFlagValue("MinHeapFreeRatio", flagMap));
- printValue("MaxHeapFreeRatio = ", getFlagValue("MaxHeapFreeRatio", flagMap));
- printValMB("MaxHeapSize = ", getFlagValue("MaxHeapSize", flagMap));
- printValMB("NewSize = ", getFlagValue("NewSize", flagMap));
- printValMB("MaxNewSize = ", getFlagValue("MaxNewSize", flagMap));
- printValMB("OldSize = ", getFlagValue("OldSize", flagMap));
- printValue("NewRatio = ", getFlagValue("NewRatio", flagMap));
- printValue("SurvivorRatio = ", getFlagValue("SurvivorRatio", flagMap));
- printValMB("MetaspaceSize = ", getFlagValue("MetaspaceSize", flagMap));
- printValMB("MaxMetaspaceSize = ", getFlagValue("MaxMetaspaceSize", flagMap));
- printValMB("G1HeapRegionSize = ", HeapRegion.grainBytes());
+ printValue("MinHeapFreeRatio = ", getFlagValue("MinHeapFreeRatio", flagMap));
+ printValue("MaxHeapFreeRatio = ", getFlagValue("MaxHeapFreeRatio", flagMap));
+ printValMB("MaxHeapSize = ", getFlagValue("MaxHeapSize", flagMap));
+ printValMB("NewSize = ", getFlagValue("NewSize", flagMap));
+ printValMB("MaxNewSize = ", getFlagValue("MaxNewSize", flagMap));
+ printValMB("OldSize = ", getFlagValue("OldSize", flagMap));
+ printValue("NewRatio = ", getFlagValue("NewRatio", flagMap));
+ printValue("SurvivorRatio = ", getFlagValue("SurvivorRatio", flagMap));
+ printValMB("MetaspaceSize = ", getFlagValue("MetaspaceSize", flagMap));
+ printValMB("ClassMetaspaceSize = ", getFlagValue("ClassMetaspaceSize", flagMap));
+ printValMB("MaxMetaspaceSize = ", getFlagValue("MaxMetaspaceSize", flagMap));
+ printValMB("G1HeapRegionSize = ", HeapRegion.grainBytes());
System.out.println();
System.out.println("Heap Usage:");
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/JMap.java Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/JMap.java Tue Mar 05 11:49:33 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2013, 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
@@ -45,7 +45,7 @@
}
protected String getCommandFlags() {
- return "-heap|-heap:format=b|-histo|-permstat|-finalizerinfo";
+ return "-heap|-heap:format=b|-histo|-clstats|-finalizerinfo";
}
protected void printFlagsUsage() {
@@ -53,14 +53,14 @@
System.out.println(" -heap\tto print java heap summary");
System.out.println(" -heap:format=b\tto dump java heap in hprof binary format");
System.out.println(" -histo\tto print histogram of java object heap");
- System.out.println(" -permstat\tto print permanent generation statistics");
+ System.out.println(" -clstats\tto print class loader statistics");
System.out.println(" -finalizerinfo\tto print information on objects awaiting finalization");
super.printFlagsUsage();
}
public static final int MODE_HEAP_SUMMARY = 0;
public static final int MODE_HISTOGRAM = 1;
- public static final int MODE_PERMSTAT = 2;
+ public static final int MODE_CLSTATS = 2;
public static final int MODE_PMAP = 3;
public static final int MODE_HEAP_GRAPH_HPROF_BIN = 4;
public static final int MODE_HEAP_GRAPH_GXL = 5;
@@ -78,8 +78,8 @@
tool = new ObjectHistogram();
break;
- case MODE_PERMSTAT:
- tool = new PermStat();
+ case MODE_CLSTATS:
+ tool = new ClassLoaderStats();
break;
case MODE_PMAP:
@@ -118,7 +118,9 @@
} else if (modeFlag.equals("-histo")) {
mode = MODE_HISTOGRAM;
} else if (modeFlag.equals("-permstat")) {
- mode = MODE_PERMSTAT;
+ mode = MODE_CLSTATS;
+ } else if (modeFlag.equals("-clstats")) {
+ mode = MODE_CLSTATS;
} else if (modeFlag.equals("-finalizerinfo")) {
mode = MODE_FINALIZERINFO;
} else {
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/PMap.java Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/PMap.java Tue Mar 05 11:49:33 2013 -0800
@@ -58,10 +58,6 @@
}
}
- protected boolean requiresVM() {
- return false;
- }
-
public static void main(String[] args) throws Exception {
PMap t = new PMap();
t.start(args);
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/PStack.java Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/PStack.java Tue Mar 05 11:49:33 2013 -0800
@@ -50,29 +50,23 @@
public void run(PrintStream out) {
Debugger dbg = getAgent().getDebugger();
- run(out, dbg, getAgent().isJavaMode());
+ run(out, dbg);
}
public void run(PrintStream out, Debugger dbg) {
- run(out, dbg, true);
- }
-
- private void run(PrintStream out, Debugger dbg, final boolean isJava) {
CDebugger cdbg = dbg.getCDebugger();
if (cdbg != null) {
ConcurrentLocksPrinter concLocksPrinter = null;
- if (isJava) {
- // compute and cache java Vframes.
- initJFrameCache();
- if (concurrentLocks) {
- concLocksPrinter = new ConcurrentLocksPrinter();
- }
- // print Java level deadlocks
- try {
- DeadlockDetector.print(out);
- } catch (Exception exp) {
- out.println("can't print deadlock information: " + exp.getMessage());
- }
+ // compute and cache java Vframes.
+ initJFrameCache();
+ if (concurrentLocks) {
+ concLocksPrinter = new ConcurrentLocksPrinter();
+ }
+ // print Java level deadlocks
+ try {
+ DeadlockDetector.print(out);
+ } catch (Exception exp) {
+ out.println("can't print deadlock information: " + exp.getMessage());
}
List l = cdbg.getThreadList();
@@ -100,63 +94,59 @@
}
out.println();
} else {
- if (isJava) {
- // look for one or more java frames
- String[] names = null;
- // check interpreter frame
- Interpreter interp = VM.getVM().getInterpreter();
- if (interp.contains(pc)) {
- names = getJavaNames(th, f.localVariableBase());
- // print codelet name if we can't determine method
- if (names == null || names.length == 0) {
- out.print("<interpreter> ");
- InterpreterCodelet ic = interp.getCodeletContaining(pc);
- if (ic != null) {
- String desc = ic.getDescription();
- if (desc != null) out.print(desc);
- }
- out.println();
- }
- } else {
- // look for known code blobs
- CodeCache c = VM.getVM().getCodeCache();
- if (c.contains(pc)) {
- CodeBlob cb = c.findBlobUnsafe(pc);
- if (cb.isNMethod()) {
- names = getJavaNames(th, f.localVariableBase());
- // just print compiled code, if can't determine method
- if (names == null || names.length == 0) {
- out.println("<Unknown compiled code>");
- }
- } else if (cb.isBufferBlob()) {
- out.println("<StubRoutines>");
- } else if (cb.isRuntimeStub()) {
- out.println("<RuntimeStub>");
- } else if (cb.isDeoptimizationStub()) {
- out.println("<DeoptimizationStub>");
- } else if (cb.isUncommonTrapStub()) {
- out.println("<UncommonTrap>");
- } else if (cb.isExceptionStub()) {
- out.println("<ExceptionStub>");
- } else if (cb.isSafepointStub()) {
- out.println("<SafepointStub>");
- } else {
- out.println("<Unknown code blob>");
- }
- } else {
- printUnknown(out);
- }
- }
- // print java frames, if any
- if (names != null && names.length != 0) {
- // print java frame(s)
- for (int i = 0; i < names.length; i++) {
- out.println(names[i]);
- }
- }
- } else {
- printUnknown(out);
- }
+ // look for one or more java frames
+ String[] names = null;
+ // check interpreter frame
+ Interpreter interp = VM.getVM().getInterpreter();
+ if (interp.contains(pc)) {
+ names = getJavaNames(th, f.localVariableBase());
+ // print codelet name if we can't determine method
+ if (names == null || names.length == 0) {
+ out.print("<interpreter> ");
+ InterpreterCodelet ic = interp.getCodeletContaining(pc);
+ if (ic != null) {
+ String desc = ic.getDescription();
+ if (desc != null) out.print(desc);
+ }
+ out.println();
+ }
+ } else {
+ // look for known code blobs
+ CodeCache c = VM.getVM().getCodeCache();
+ if (c.contains(pc)) {
+ CodeBlob cb = c.findBlobUnsafe(pc);
+ if (cb.isNMethod()) {
+ names = getJavaNames(th, f.localVariableBase());
+ // just print compiled code, if can't determine method
+ if (names == null || names.length == 0) {
+ out.println("<Unknown compiled code>");
+ }
+ } else if (cb.isBufferBlob()) {
+ out.println("<StubRoutines>");
+ } else if (cb.isRuntimeStub()) {
+ out.println("<RuntimeStub>");
+ } else if (cb.isDeoptimizationStub()) {
+ out.println("<DeoptimizationStub>");
+ } else if (cb.isUncommonTrapStub()) {
+ out.println("<UncommonTrap>");
+ } else if (cb.isExceptionStub()) {
+ out.println("<ExceptionStub>");
+ } else if (cb.isSafepointStub()) {
+ out.println("<SafepointStub>");
+ } else {
+ out.println("<Unknown code blob>");
+ }
+ } else {
+ printUnknown(out);
+ }
+ }
+ // print java frames, if any
+ if (names != null && names.length != 0) {
+ // print java frame(s)
+ for (int i = 0; i < names.length; i++) {
+ out.println(names[i]);
+ }
+ }
}
f = f.sender(th);
}
@@ -164,7 +154,7 @@
exp.printStackTrace();
// continue, may be we can do a better job for other threads
}
- if (isJava && concurrentLocks) {
+ if (concurrentLocks) {
JavaThread jthread = (JavaThread) proxyToThread.get(th);
if (jthread != null) {
concLocksPrinter.print(jthread, out);
@@ -180,10 +170,6 @@
}
}
- protected boolean requiresVM() {
- return false;
- }
-
public static void main(String[] args) throws Exception {
PStack t = new PStack();
t.start(args);
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/PermStat.java Tue Mar 05 09:50:53 2013 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,277 +0,0 @@
-/*
- * Copyright (c) 2003, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.tools;
-
-import java.io.*;
-import java.util.*;
-
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.memory.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.tools.*;
-import sun.jvm.hotspot.utilities.*;
-
-/**
- A command line tool to print perm. generation statistics.
-*/
-
-public class PermStat extends Tool {
- boolean verbose = true;
-
- public static void main(String[] args) {
- PermStat ps = new PermStat();
- ps.start(args);
- ps.stop();
- }
-
- private static class ClassData {
- Klass klass;
- long size;
-
- ClassData(Klass klass, long size) {
- this.klass = klass; this.size = size;
- }
- }
-
- private static class LoaderData {
- long numClasses;
- long classSize;
- List classDetail = new ArrayList(); // List<ClassData>
- }
-
- public void run() {
- printClassLoaderStatistics();
- }
-
- private void printClassLoaderStatistics() {
- final PrintStream out = System.out;
- final PrintStream err = System.err;
- final Map loaderMap = new HashMap();
- // loader data for bootstrap class loader
- final LoaderData bootstrapLoaderData = new LoaderData();
- if (verbose) {
- err.print("finding class loader instances ..");
- }
-
- VM vm = VM.getVM();
- ObjectHeap heap = vm.getObjectHeap();
- Klass classLoaderKlass = vm.getSystemDictionary().getClassLoaderKlass();
- try {
- heap.iterateObjectsOfKlass(new DefaultHeapVisitor() {
- public boolean doObj(Oop oop) {
- loaderMap.put(oop, new LoaderData());
- return false;
- }
- }, classLoaderKlass);
- } catch (Exception se) {
- se.printStackTrace();
- }
-
- if (verbose) {
- err.println("done.");
- err.print("computing per loader stat ..");
- }
-
- SystemDictionary dict = VM.getVM().getSystemDictionary();
- dict.classesDo(new SystemDictionary.ClassAndLoaderVisitor() {
- public void visit(Klass k, Oop loader) {
- if (! (k instanceof InstanceKlass)) {
- return;
- }
- LoaderData ld = (loader != null) ? (LoaderData)loaderMap.get(loader)
- : bootstrapLoaderData;
- if (ld != null) {
- ld.numClasses++;
- long size = computeSize((InstanceKlass)k);
- ld.classDetail.add(new ClassData(k, size));
- ld.classSize += size;
- }
- }
- });
-
- if (verbose) {
- err.println("done.");
- err.print("please wait.. computing liveness");
- }
-
- // compute reverse pointer analysis (takes long time for larger app)
- ReversePtrsAnalysis analysis = new ReversePtrsAnalysis();
-
- if (verbose) {
- analysis.setHeapProgressThunk(new HeapProgressThunk() {
- public void heapIterationFractionUpdate(double fractionOfHeapVisited) {
- err.print('.');
- }
- // This will be called after the iteration is complete
- public void heapIterationComplete() {
- err.println("done.");
- }
- });
- }
-
- try {
- analysis.run();
- } catch (Exception e) {
- // e.printStackTrace();
- if (verbose)
- err.println("liveness analysis may be inaccurate ...");
- }
- ReversePtrs liveness = VM.getVM().getRevPtrs();
-
- out.println("class_loader\tclasses\tbytes\tparent_loader\talive?\ttype");
- out.println();
-
- long numClassLoaders = 1L;
- long totalNumClasses = bootstrapLoaderData.numClasses;
- long totalClassSize = bootstrapLoaderData.classSize;
- long numAliveLoaders = 1L;
- long numDeadLoaders = 0L;
-
- // print bootstrap loader details
- out.print("<bootstrap>");
- out.print('\t');
- out.print(bootstrapLoaderData.numClasses);
- out.print('\t');
- out.print(bootstrapLoaderData.classSize);
- out.print('\t');
- out.print(" null ");
- out.print('\t');
- // bootstrap loader is always alive
- out.print("live");
- out.print('\t');
- out.println("<internal>");
-
- for (Iterator keyItr = loaderMap.keySet().iterator(); keyItr.hasNext();) {
- Oop loader = (Oop) keyItr.next();
- LoaderData data = (LoaderData) loaderMap.get(loader);
- numClassLoaders ++;
- totalNumClasses += data.numClasses;
- totalClassSize += data.classSize;
-
- out.print(loader.getHandle());
- out.print('\t');
- out.print(data.numClasses);
- out.print('\t');
- out.print(data.classSize);
- out.print('\t');
-
- class ParentFinder extends DefaultOopVisitor {
- public void doOop(OopField field, boolean isVMField) {
- if (field.getID().getName().equals("parent")) {
- parent = field.getValue(getObj());
- }
- }
- private Oop parent = null;
- public Oop getParent() { return parent; }
- }
-
- ParentFinder parentFinder = new ParentFinder();
- loader.iterate(parentFinder, false);
- Oop parent = parentFinder.getParent();
- out.print((parent != null)? parent.getHandle().toString() : " null ");
- out.print('\t');
- boolean alive = (liveness != null) ? (liveness.get(loader) != null) : true;
- out.print(alive? "live" : "dead");
- if (alive) numAliveLoaders++; else numDeadLoaders++;
- out.print('\t');
- Klass loaderKlass = loader.getKlass();
- if (loaderKlass != null) {
- out.print(loaderKlass.getName().asString());
- out.print('@');
- out.print(loader.getKlass().getAddress());
- } else {
- out.print(" null! ");
- }
- out.println();
- }
-
- out.println();
- // summary line
- out.print("total = ");
- out.print(numClassLoaders);
- out.print('\t');
- out.print(totalNumClasses);
- out.print('\t');
- out.print(totalClassSize);
- out.print('\t');
- out.print(" N/A ");
- out.print('\t');
- out.print("alive=");
- out.print(numAliveLoaders);
- out.print(", dead=");
- out.print(numDeadLoaders);
- out.print('\t');
- out.print(" N/A ");
- out.println();
- }
-
- private static long objectSize(Oop oop) {
- return oop == null ? 0L : oop.getObjectSize();
- }
-
- // Don't count the shared empty arrays
- private static long arraySize(GenericArray arr) {
- return arr.getLength() != 0L ? arr.getSize() : 0L;
- }
-
- private long computeSize(InstanceKlass k) {
- long size = 0L;
- // the InstanceKlass object itself
- size += k.getSize();
-
- // Constant pool
- ConstantPool cp = k.getConstants();
- size += cp.getSize();
- if (cp.getCache() != null) {
- size += cp.getCache().getSize();
- }
- size += arraySize(cp.getTags());
-
- // Interfaces
- size += arraySize(k.getLocalInterfaces());
- size += arraySize(k.getTransitiveInterfaces());
-
- // Inner classes
- size += arraySize(k.getInnerClasses());
-
- // Fields
- size += arraySize(k.getFields());
-
- // Methods
- MethodArray methods = k.getMethods();
- int nmethods = (int) methods.getLength();
- if (nmethods != 0L) {
- size += methods.getSize();
- for (int i = 0; i < nmethods; ++i) {
- Method m = methods.at(i);
- size += m.getSize();
- size += m.getConstMethod().getSize();
- }
- }
-
- return size;
- }
-}
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/Tool.java Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/Tool.java Tue Mar 05 11:49:33 2013 -0800
@@ -27,7 +27,6 @@
import java.io.PrintStream;
import java.util.Hashtable;
import sun.jvm.hotspot.*;
-import sun.jvm.hotspot.bugspot.*;
import sun.jvm.hotspot.runtime.*;
import sun.jvm.hotspot.debugger.*;
@@ -35,7 +34,7 @@
// override run & code main as shown below.
public abstract class Tool implements Runnable {
- private BugSpotAgent agent;
+ private HotSpotAgent agent;
private int debugeeType;
// debugeeType is one of constants below
@@ -51,12 +50,7 @@
return true;
}
- // whether this tool requires debuggee to be java process or core?
- protected boolean requiresVM() {
- return true;
- }
-
- protected void setAgent(BugSpotAgent a) {
+ protected void setAgent(HotSpotAgent a) {
agent = a;
}
@@ -64,7 +58,7 @@
debugeeType = dt;
}
- protected BugSpotAgent getAgent() {
+ protected HotSpotAgent getAgent() {
return agent;
}
@@ -155,7 +149,7 @@
usage();
}
- agent = new BugSpotAgent();
+ agent = new HotSpotAgent();
try {
switch (debugeeType) {
case DEBUGEE_PID:
@@ -198,33 +192,24 @@
err.println("Debugger attached successfully.");
- boolean isJava = agent.isJavaMode();
- if (isJava) {
- VM vm = VM.getVM();
- if (vm.isCore()) {
- err.println("Core build detected.");
- } else if (vm.isClientCompiler()) {
- err.println("Client compiler detected.");
- } else if (vm.isServerCompiler()) {
- err.println("Server compiler detected.");
- } else {
- throw new RuntimeException("Fatal error: " +
- "should have been able to detect core/C1/C2 build");
- }
+ VM vm = VM.getVM();
+ if (vm.isCore()) {
+ err.println("Core build detected.");
+ } else if (vm.isClientCompiler()) {
+ err.println("Client compiler detected.");
+ } else if (vm.isServerCompiler()) {
+ err.println("Server compiler detected.");
+ } else {
+ throw new RuntimeException("Fatal error: "
+ + "should have been able to detect core/C1/C2 build");
+ }
- String version = vm.getVMRelease();
- if (version != null) {
- err.print("JVM version is ");
- err.println(version);
- }
+ String version = vm.getVMRelease();
+ if (version != null) {
+ err.print("JVM version is ");
+ err.println(version);
+ }
- run();
- } else { // not a java process or core
- if (requiresVM()) {
- err.println(getName() + " requires a java VM process/core!");
- } else {
- run();
- }
- }
+ run();
}
}
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/ui/SAPanel.java Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ui/SAPanel.java Tue Mar 05 11:49:33 2013 -0800
@@ -50,7 +50,7 @@
/**
* This base class encapsulates many of the events that are fired from
* the various panels in this directory so they can easily be plugged
- * in to different containing frameworks (HSDB, BugSpot).
+ * in to different containing frameworks (HSDB).
*/
public class SAPanel extends JPanel {
protected List listeners = new ArrayList();
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/ConstantTag.java Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/ConstantTag.java Tue Mar 05 11:49:33 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2013, 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
@@ -51,7 +51,6 @@
private static final int JVM_CONSTANT_UnresolvedClassInError = 103; // Resolution failed
private static final int JVM_CONSTANT_MethodHandleInError = 104; // Error tag due to resolution error
private static final int JVM_CONSTANT_MethodTypeInError = 105; // Error tag due to resolution error
- private static final int JVM_CONSTANT_Object = 106; // Required for BoundMethodHandle arguments.
// JVM_CONSTANT_MethodHandle subtypes //FIXME: connect these to data structure
private static int JVM_REF_getField = 1;
@@ -96,8 +95,6 @@
public boolean isKlassIndex() { return tag == JVM_CONSTANT_ClassIndex; }
public boolean isStringIndex() { return tag == JVM_CONSTANT_StringIndex; }
- public boolean isObject() { return tag == JVM_CONSTANT_Object; }
-
public boolean isKlassReference() { return isKlassIndex() || isUnresolvedKlass(); }
public boolean isFieldOrMethod() { return isField() || isMethod() || isInterfaceMethod(); }
public boolean isSymbol() { return isUtf8(); }
@@ -123,7 +120,6 @@
case JVM_CONSTANT_StringIndex :
case JVM_CONSTANT_MethodHandle :
case JVM_CONSTANT_MethodType :
- case JVM_CONSTANT_Object :
return BasicType.T_OBJECT;
default:
throw new InternalError("unexpected tag: " + tag);
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/sa.js Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/sa.js Tue Mar 05 11:49:33 2013 -0800
@@ -31,7 +31,6 @@
sapkg.hotspot = Packages.sun.jvm.hotspot;
sapkg.asm = sapkg.hotspot.asm;
-sapkg.bugspot = sapkg.hotspot.bugspot;
sapkg.c1 = sapkg.hotspot.c1;
sapkg.code = sapkg.hotspot.code;
sapkg.compiler = sapkg.hotspot.compiler;
@@ -40,7 +39,6 @@
// sapkg.debugger = sapkg.hotspot.debugger;
sapkg.interpreter = sapkg.hotspot.interpreter;
-sapkg.livejvm = sapkg.hotspot.livejvm;
sapkg.jdi = sapkg.hotspot.jdi;
sapkg.memory = sapkg.hotspot.memory;
sapkg.oops = sapkg.hotspot.oops;
--- a/hotspot/agent/src/share/native/jvmdi/sa.cpp Tue Mar 05 09:50:53 2013 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,601 +0,0 @@
-/*
- * Copyright (c) 2002, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#include <stdio.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <vector>
-#include "sa.hpp"
-#include "jni.h"
-#include "jvmdi.h"
-
-#ifndef WIN32
- #include <inttypes.h>
-#else
- typedef int int32_t;
-#endif
-
-#ifdef WIN32
- #include <windows.h>
- #define YIELD() Sleep(0)
- #define SLEEP() Sleep(10)
- #define vsnprintf _vsnprintf
-#else
- Error: please port YIELD() and SLEEP() macros to your platform
-#endif
-
-using namespace std;
-
-//////////////////////////////////////////////////////////////////////
-// //
-// Exported "interface" for Java language-level interaction between //
-// the SA and the VM. Note that the SA knows about the layout of //
-// certain VM data structures and that knowledge is taken advantage //
-// of in this code, although this interfaces with the VM via JVMDI. //
-// //
-//////////////////////////////////////////////////////////////////////
-
-extern "C" {
- /////////////////////////////////////
- // //
- // Events sent by the VM to the SA //
- // //
- /////////////////////////////////////
-
- // Set by the SA when it attaches. Indicates that events should be
- // posted via these exported variables, and that the VM should wait
- // for those events to be acknowledged by the SA (via its setting
- // saEventPending to 0).
- JNIEXPORT volatile int32_t saAttached = 0;
-
- // Set to nonzero value by the VM when an event has been posted; set
- // back to 0 by the SA when it has processed that event.
- JNIEXPORT volatile int32_t saEventPending = 0;
-
- // Kind of the event (from jvmdi.h)
- JNIEXPORT volatile int32_t saEventKind = 0;
-
- //
- // Exception events
- //
- JNIEXPORT jthread saExceptionThread;
- JNIEXPORT jclass saExceptionClass;
- JNIEXPORT jmethodID saExceptionMethod;
- JNIEXPORT int32_t saExceptionLocation;
- JNIEXPORT jobject saExceptionException;
- JNIEXPORT jclass saExceptionCatchClass;
- JNIEXPORT jmethodID saExceptionCatchMethod;
- JNIEXPORT int32_t saExceptionCatchLocation;
-
- //
- // Breakpoint events
- //
- JNIEXPORT jthread saBreakpointThread;
- JNIEXPORT jclass saBreakpointClass;
- JNIEXPORT jmethodID saBreakpointMethod;
- JNIEXPORT jlocation saBreakpointLocation;
-
- ///////////////////////////////////////
- // //
- // Commands sent by the SA to the VM //
- // //
- ///////////////////////////////////////
-
- extern JNIEXPORT const int32_t SA_CMD_SUSPEND_ALL = 0;
- extern JNIEXPORT const int32_t SA_CMD_RESUME_ALL = 1;
- extern JNIEXPORT const int32_t SA_CMD_TOGGLE_BREAKPOINT = 2;
- extern JNIEXPORT const int32_t SA_CMD_BUF_SIZE = 1024;
-
- // SA sets this to a nonzero value when it is requesting a command
- // to be processed; VM sets it back to 0 when the command has been
- // executed
- JNIEXPORT volatile int32_t saCmdPending = 0;
-
- // SA sets this to one of the manifest constants above to indicate
- // the kind of command to be executed
- JNIEXPORT volatile int32_t saCmdType = 0;
-
- // VM sets this to 0 if the last command succeeded or a nonzero
- // value if it failed
- JNIEXPORT volatile int32_t saCmdResult = 0;
-
- // If last command failed, this buffer will contain a descriptive
- // error message
- JNIEXPORT char saCmdResultErrMsg[SA_CMD_BUF_SIZE];
-
- //
- // Toggling of breakpoint command arguments.
- //
- // Originally there were separate set/clear breakpoint commands
- // taking a class name, method name and signature, and the iteration
- // through the debug information was done in the SA. It turns out
- // that doing this work in the target VM is significantly faster,
- // and since interactivity when setting and clearing breakpoints is
- // important, the solution which resulted in more C/C++ code was used.
- //
-
- // Source file name
- JNIEXPORT char saCmdBkptSrcFileName[SA_CMD_BUF_SIZE];
-
- // Package name ('/' as separator instead of '.')
- JNIEXPORT char saCmdBkptPkgName[SA_CMD_BUF_SIZE];
-
- // Line number
- JNIEXPORT int32_t saCmdBkptLineNumber;
-
- // Output back to SA: indicator whether the last failure of a
- // breakpoint toggle command was really an error or just a lack of
- // debug information covering the requested line. 0 if not error.
- // Valid only if saCmdResult != 0.
- JNIEXPORT int32_t saCmdBkptResWasError;
-
- // Output back to SA: resulting line number at which the breakpoint
- // was set or cleared (valid only if saCmdResult == 0)
- JNIEXPORT int32_t saCmdBkptResLineNumber;
-
- // Output back to SA: resulting byte code index at which the
- // breakpoint was set or cleared (valid only if saCmdResult == 0)
- JNIEXPORT int32_t saCmdBkptResBCI;
-
- // Output back to SA: indicator whether the breakpoint operation
- // resulted in a set or cleared breakpoint; nonzero if set, zero if
- // cleared (valid only if saCmdResult == 0)
- JNIEXPORT int32_t saCmdBkptResWasSet;
-
- // Output back to SA: method name the breakpoint was set in (valid
- // only if saCmdResult == 0)
- JNIEXPORT char saCmdBkptResMethodName[SA_CMD_BUF_SIZE];
-
- // Output back to SA: method signature (JNI style) the breakpoint
- // was set in (valid only if saCmdResult == 0)
- JNIEXPORT char saCmdBkptResMethodSig[SA_CMD_BUF_SIZE];
-}
-
-// Internal state
-static JavaVM* jvm = NULL;
-static JVMDI_Interface_1* jvmdi = NULL;
-static jthread debugThreadObj = NULL;
-static bool suspended = false;
-static vector<jthread> suspendedThreads;
-static JVMDI_RawMonitor eventLock = NULL;
-
-class MonitorLocker {
-private:
- JVMDI_RawMonitor lock;
-public:
- MonitorLocker(JVMDI_RawMonitor lock) {
- this->lock = lock;
- if (lock != NULL) {
- jvmdi->RawMonitorEnter(lock);
- }
- }
- ~MonitorLocker() {
- if (lock != NULL) {
- jvmdi->RawMonitorExit(lock);
- }
- }
-};
-
-class JvmdiDeallocator {
-private:
- void* ptr;
-public:
- JvmdiDeallocator(void* ptr) {
- this->ptr = ptr;
- }
- ~JvmdiDeallocator() {
- jvmdi->Deallocate((jbyte*) ptr);
- }
-};
-
-class JvmdiRefListDeallocator {
-private:
- JNIEnv* env;
- jobject* refList;
- jint refCount;
-public:
- JvmdiRefListDeallocator(JNIEnv* env, jobject* refList, jint refCount) {
- this->env = env;
- this->refList = refList;
- this->refCount = refCount;
- }
- ~JvmdiRefListDeallocator() {
- for (int i = 0; i < refCount; i++) {
- env->DeleteGlobalRef(refList[i]);
- }
- jvmdi->Deallocate((jbyte*) refList);
- }
-};
-
-static void
-stop(char* msg) {
- fprintf(stderr, "%s", msg);
- fprintf(stderr, "\n");
- exit(1);
-}
-
-// This fills in the command result error message, sets the command
-// result to -1, and clears the pending command flag
-static void
-reportErrorToSA(const char* str, ...) {
- va_list varargs;
- va_start(varargs, str);
- vsnprintf(saCmdResultErrMsg, sizeof(saCmdResultErrMsg), str, varargs);
- va_end(varargs);
- saCmdResult = -1;
- saCmdPending = 0;
-}
-
-static bool
-packageNameMatches(char* clazzName, char* pkg) {
- int pkgLen = strlen(pkg);
- int clazzNameLen = strlen(clazzName);
-
- if (pkgLen >= clazzNameLen + 1) {
- return false;
- }
-
- if (strncmp(clazzName, pkg, pkgLen)) {
- return false;
- }
-
- // Ensure that '/' is the next character if non-empty package name
- int l = pkgLen;
- if (l > 0) {
- if (clazzName[l] != '/') {
- return false;
- }
- l++;
- }
- // Ensure that there are no more trailing slashes
- while (l < clazzNameLen) {
- if (clazzName[l++] == '/') {
- return false;
- }
- }
- return true;
-}
-
-static void
-executeOneCommand(JNIEnv* env) {
- switch (saCmdType) {
- case SA_CMD_SUSPEND_ALL: {
- if (suspended) {
- reportErrorToSA("Target process already suspended");
- return;
- }
-
- // We implement this by getting all of the threads and calling
- // SuspendThread on each one, except for the thread object
- // corresponding to this thread. Each thread for which the call
- // succeeded (i.e., did not return JVMDI_ERROR_INVALID_THREAD)
- // is added to a list which is remembered for later resumption.
- // Note that this currently has race conditions since a thread
- // might be started after we call GetAllThreads and since a
- // thread for which we got an error earlier might be resumed by
- // the VM while we are busy suspending other threads. We could
- // solve this by looping until there are no more threads we can
- // suspend, but a more robust and scalable solution is to add
- // this functionality to the JVMDI interface (i.e.,
- // "suspendAll"). Probably need to provide an exclude list for
- // such a routine.
- jint threadCount;
- jthread* threads;
- if (jvmdi->GetAllThreads(&threadCount, &threads) != JVMDI_ERROR_NONE) {
- reportErrorToSA("Error while getting thread list");
- return;
- }
-
-
- for (int i = 0; i < threadCount; i++) {
- jthread thr = threads[i];
- if (!env->IsSameObject(thr, debugThreadObj)) {
- jvmdiError err = jvmdi->SuspendThread(thr);
- if (err == JVMDI_ERROR_NONE) {
- // Remember this thread and do not free it
- suspendedThreads.push_back(thr);
- continue;
- } else {
- fprintf(stderr, " SA: Error %d while suspending thread\n", err);
- // FIXME: stop, resume all threads, report error
- }
- }
- env->DeleteGlobalRef(thr);
- }
-
- // Free up threads
- jvmdi->Deallocate((jbyte*) threads);
-
- // Suspension is complete
- suspended = true;
- break;
- }
-
- case SA_CMD_RESUME_ALL: {
- if (!suspended) {
- reportErrorToSA("Target process already suspended");
- return;
- }
-
- saCmdResult = 0;
- bool errorOccurred = false;
- jvmdiError firstError;
- for (int i = 0; i < suspendedThreads.size(); i++) {
- jthread thr = suspendedThreads[i];
- jvmdiError err = jvmdi->ResumeThread(thr);
- env->DeleteGlobalRef(thr);
- if (err != JVMDI_ERROR_NONE) {
- if (!errorOccurred) {
- errorOccurred = true;
- firstError = err;
- }
- }
- }
- suspendedThreads.clear();
- suspended = false;
- if (errorOccurred) {
- reportErrorToSA("Error %d while resuming threads", firstError);
- return;
- }
- break;
- }
-
- case SA_CMD_TOGGLE_BREAKPOINT: {
- saCmdBkptResWasError = 1;
-
- // Search line number info for all loaded classes
- jint classCount;
- jclass* classes;
-
- jvmdiError glcRes = jvmdi->GetLoadedClasses(&classCount, &classes);
- if (glcRes != JVMDI_ERROR_NONE) {
- reportErrorToSA("Error %d while getting loaded classes", glcRes);
- return;
- }
- JvmdiRefListDeallocator rld(env, (jobject*) classes, classCount);
-
- bool done = false;
- bool gotOne = false;
- jclass targetClass;
- jmethodID targetMethod;
- jlocation targetLocation;
- jint targetLineNumber;
-
- for (int i = 0; i < classCount && !done; i++) {
- fflush(stderr);
- jclass clazz = classes[i];
- char* srcName;
- jvmdiError sfnRes = jvmdi->GetSourceFileName(clazz, &srcName);
- if (sfnRes == JVMDI_ERROR_NONE) {
- JvmdiDeallocator de1(srcName);
- if (!strcmp(srcName, saCmdBkptSrcFileName)) {
- // Got a match. Now see whether the package name of the class also matches
- char* clazzName;
- jvmdiError sigRes = jvmdi->GetClassSignature(clazz, &clazzName);
- if (sigRes != JVMDI_ERROR_NONE) {
- reportErrorToSA("Error %d while getting a class's signature", sigRes);
- return;
- }
- JvmdiDeallocator de2(clazzName);
- if (packageNameMatches(clazzName + 1, saCmdBkptPkgName)) {
- // Iterate through all methods
- jint methodCount;
- jmethodID* methods;
- if (jvmdi->GetClassMethods(clazz, &methodCount, &methods) != JVMDI_ERROR_NONE) {
- reportErrorToSA("Error while getting methods of class %s", clazzName);
- return;
- }
- JvmdiDeallocator de3(methods);
- for (int j = 0; j < methodCount && !done; j++) {
- jmethodID m = methods[j];
- jint entryCount;
- JVMDI_line_number_entry* table;
- jvmdiError lnRes = jvmdi->GetLineNumberTable(clazz, m, &entryCount, &table);
- if (lnRes == JVMDI_ERROR_NONE) {
- JvmdiDeallocator de4(table);
- // Look for line number greater than or equal to requested line
- for (int k = 0; k < entryCount && !done; k++) {
- JVMDI_line_number_entry& entry = table[k];
- if (entry.line_number >= saCmdBkptLineNumber &&
- (!gotOne || entry.line_number < targetLineNumber)) {
- gotOne = true;
- targetClass = clazz;
- targetMethod = m;
- targetLocation = entry.start_location;
- targetLineNumber = entry.line_number;
- done = (targetLineNumber == saCmdBkptLineNumber);
- }
- }
- } else if (lnRes != JVMDI_ERROR_ABSENT_INFORMATION) {
- reportErrorToSA("Unexpected error %d while fetching line number table", lnRes);
- return;
- }
- }
- }
- }
- } else if (sfnRes != JVMDI_ERROR_ABSENT_INFORMATION) {
- reportErrorToSA("Unexpected error %d while fetching source file name", sfnRes);
- return;
- }
- }
-
- bool wasSet = true;
- if (gotOne) {
- // Really toggle this breakpoint
- jvmdiError bpRes;
- bpRes = jvmdi->SetBreakpoint(targetClass, targetMethod, targetLocation);
- if (bpRes == JVMDI_ERROR_DUPLICATE) {
- bpRes = jvmdi->ClearBreakpoint(targetClass, targetMethod, targetLocation);
- wasSet = false;
- }
- if (bpRes != JVMDI_ERROR_NONE) {
- reportErrorToSA("Unexpected error %d while setting or clearing breakpoint at bci %d, line %d",
- bpRes, targetLocation, targetLineNumber);
- return;
- }
- } else {
- saCmdBkptResWasError = 0;
- reportErrorToSA("No debug information found covering this line");
- return;
- }
-
- // Provide result
- saCmdBkptResLineNumber = targetLineNumber;
- saCmdBkptResBCI = targetLocation;
- saCmdBkptResWasSet = (wasSet ? 1 : 0);
- {
- char* methodName;
- char* methodSig;
- if (jvmdi->GetMethodName(targetClass, targetMethod, &methodName, &methodSig)
- == JVMDI_ERROR_NONE) {
- JvmdiDeallocator mnd(methodName);
- JvmdiDeallocator msd(methodSig);
- strncpy(saCmdBkptResMethodName, methodName, SA_CMD_BUF_SIZE);
- strncpy(saCmdBkptResMethodSig, methodSig, SA_CMD_BUF_SIZE);
- } else {
- strncpy(saCmdBkptResMethodName, "<error>", SA_CMD_BUF_SIZE);
- strncpy(saCmdBkptResMethodSig, "<error>", SA_CMD_BUF_SIZE);
- }
- }
- break;
- }
-
- default:
- reportErrorToSA("Command %d not yet supported", saCmdType);
- return;
- }
-
- // Successful command execution
- saCmdResult = 0;
- saCmdPending = 0;
-}
-
-static void
-saCommandThread(void *arg) {
- JNIEnv* env = NULL;
- if (jvm->GetEnv((void **) &env, JNI_VERSION_1_2) != JNI_OK) {
- stop("Error while starting Serviceability Agent "
- "command thread: could not get JNI environment");
- }
-
- while (1) {
- // Wait for command
- while (!saCmdPending) {
- SLEEP();
- }
-
- executeOneCommand(env);
- }
-}
-
-static void
-saEventHook(JNIEnv *env, JVMDI_Event *event)
-{
- MonitorLocker ml(eventLock);
-
- saEventKind = event->kind;
-
- if (event->kind == JVMDI_EVENT_VM_INIT) {
- // Create event lock
- if (jvmdi->CreateRawMonitor("Serviceability Agent Event Lock", &eventLock)
- != JVMDI_ERROR_NONE) {
- stop("Unable to create Serviceability Agent's event lock");
- }
- // Start thread which receives commands from the SA.
- jclass threadClass = env->FindClass("java/lang/Thread");
- if (threadClass == NULL) stop("Unable to find class java/lang/Thread");
- jstring threadName = env->NewStringUTF("Serviceability Agent Command Thread");
- if (threadName == NULL) stop("Unable to allocate debug thread name");
- jmethodID ctor = env->GetMethodID(threadClass, "<init>", "(Ljava/lang/String;)V");
- if (ctor == NULL) stop("Unable to find appropriate constructor for java/lang/Thread");
- // Allocate thread object
- jthread thr = (jthread) env->NewObject(threadClass, ctor, threadName);
- if (thr == NULL) stop("Unable to allocate debug thread's java/lang/Thread instance");
- // Remember which thread this is
- debugThreadObj = env->NewGlobalRef(thr);
- if (debugThreadObj == NULL) stop("Unable to allocate global ref for debug thread object");
- // Start thread
- jvmdiError err;
- if ((err = jvmdi->RunDebugThread(thr, &saCommandThread, NULL, JVMDI_THREAD_NORM_PRIORITY))
- != JVMDI_ERROR_NONE) {
- char buf[256];
- sprintf(buf, "Error %d while starting debug thread", err);
- stop(buf);
- }
- // OK, initialization is done
- return;
- }
-
- if (!saAttached) {
- return;
- }
-
- switch (event->kind) {
- case JVMDI_EVENT_EXCEPTION: {
- fprintf(stderr, "SA: Exception thrown -- ignoring\n");
- saExceptionThread = event->u.exception.thread;
- saExceptionClass = event->u.exception.clazz;
- saExceptionMethod = event->u.exception.method;
- saExceptionLocation = event->u.exception.location;
- saExceptionException = event->u.exception.exception;
- saExceptionCatchClass = event->u.exception.catch_clazz;
- saExceptionCatchClass = event->u.exception.catch_clazz;
- saExceptionCatchMethod = event->u.exception.catch_method;
- saExceptionCatchLocation = event->u.exception.catch_location;
- // saEventPending = 1;
- break;
- }
-
- case JVMDI_EVENT_BREAKPOINT: {
- saBreakpointThread = event->u.breakpoint.thread;
- saBreakpointClass = event->u.breakpoint.clazz;
- saBreakpointMethod = event->u.breakpoint.method;
- saBreakpointLocation = event->u.breakpoint.location;
- saEventPending = 1;
- break;
- }
-
- default:
- break;
- }
-
- while (saAttached && saEventPending) {
- SLEEP();
- }
-}
-
-extern "C" {
-JNIEXPORT jint JNICALL
-JVM_OnLoad(JavaVM *vm, char *options, void *reserved)
-{
- jvm = vm;
- if (jvm->GetEnv((void**) &jvmdi, JVMDI_VERSION_1) != JNI_OK) {
- return -1;
- }
- if (jvmdi->SetEventHook(&saEventHook) != JVMDI_ERROR_NONE) {
- return -1;
- }
- return 0;
-}
-};
--- a/hotspot/agent/src/share/native/jvmdi/sa.dsp Tue Mar 05 09:50:53 2013 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,105 +0,0 @@
-# Microsoft Developer Studio Project File - Name="sa" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=sa - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "sa.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "sa.mak" CFG="sa - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "sa - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "sa - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "sa - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SA_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "D:\jdk1.4\include" /I "D:\jdk1.4\include\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SA_EXPORTS" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-
-!ELSEIF "$(CFG)" == "sa - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SA_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "D:\jdk1.4\include" /I "D:\jdk1.4\include\win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SA_EXPORTS" /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-
-!ENDIF
-
-# Begin Target
-
-# Name "sa - Win32 Release"
-# Name "sa - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\sa.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
--- a/hotspot/agent/src/share/native/jvmdi/sa.dsw Tue Mar 05 09:50:53 2013 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "sa"=.\sa.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
--- a/hotspot/agent/src/share/native/jvmdi/sa.hpp Tue Mar 05 09:50:53 2013 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2002, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#include "jni.h"
-
-extern "C" {
-JNIEXPORT jint JNICALL
-JVM_OnLoad(JavaVM *vm, char *options, void *reserved);
-}
--- a/hotspot/make/Makefile Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/make/Makefile Tue Mar 05 11:49:33 2013 -0800
@@ -464,9 +464,6 @@
$(EXPORT_LIB_DIR)/%.jar: $(GEN_DIR)/%.jar
$(install-file)
-$(EXPORT_JRE_LIB_DIR)/%.jar: $(GEN_DIR)/%.jar
- $(install-file)
-
# Include files (jvmti.h, jvmticmlr.h, jni.h, $(JDK_INCLUDE_SUBDIR)/jni_md.h, jmm.h, jfr.h)
$(EXPORT_INCLUDE_DIR)/%: $(GEN_DIR)/jvmtifiles/%
$(install-file)
--- a/hotspot/make/bsd/makefiles/defs.make Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/make/bsd/makefiles/defs.make Tue Mar 05 11:49:33 2013 -0800
@@ -157,8 +157,6 @@
EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
EXPORT_MINIMAL_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/minimal
-EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/wb.jar
-
ifeq ($(findstring true, $(JVM_VARIANT_SERVER) $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX)
--- a/hotspot/make/bsd/makefiles/vm.make Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/make/bsd/makefiles/vm.make Tue Mar 05 11:49:33 2013 -0800
@@ -94,7 +94,12 @@
# This is VERY important! The version define must only be supplied to vm_version.o
# If not, ccache will not re-use the cache at all, since the version string might contain
# a time and date.
-vm_version.o: CXXFLAGS += ${JRE_VERSION}
+CXXFLAGS/vm_version.o += ${JRE_VERSION}
+
+CXXFLAGS/BYFILE = $(CXXFLAGS/$@)
+
+# File specific flags
+CXXFLAGS += $(CXXFLAGS/BYFILE)
ifdef DEFAULT_LIBPATH
CXXFLAGS += -DDEFAULT_LIBPATH="\"$(DEFAULT_LIBPATH)\""
@@ -332,9 +337,6 @@
# Serviceability agent
include $(MAKEFILES_DIR)/saproc.make
-# Whitebox testing API
-include $(MAKEFILES_DIR)/wb.make
-
#----------------------------------------------------------------------
ifeq ($(OS_VENDOR), Darwin)
@@ -342,10 +344,10 @@
dsymutil $(LIBJVM)
# no libjvm_db for macosx
-build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(BUILDLIBSAPROC) dtraceCheck $(LIBJVM).dSYM $(WB_JAR)
+build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(BUILDLIBSAPROC) dtraceCheck $(LIBJVM).dSYM
echo "Doing vm.make build:"
else
-build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(LIBJVM_DB) $(BUILDLIBSAPROC) $(WB_JAR)
+build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(LIBJVM_DB) $(BUILDLIBSAPROC)
endif
install: install_jvm install_jsig install_saproc
--- a/hotspot/make/bsd/makefiles/wb.make Tue Mar 05 09:50:53 2013 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-#
-# Copyright (c) 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-#
-
-# Rules to build whitebox testing library, used by vm.make
-WB = wb
-
-WBSRCDIR = $(GAMMADIR)/src/share/tools/whitebox
-
-WB_JAR = $(GENERATED)/$(WB).jar
-
-WB_JAVA_SRCS = $(shell find $(WBSRCDIR) -name '*.java')
-WB_JAVA_CLASSDIR = $(GENERATED)/wb/classes
-
-WB_JAVA_CLASSES = $(patsubst $(WBSRCDIR)/%,$(WB_JAVA_CLASSDIR)/%, \
- $(patsubst %.java,%.class,$(WB_JAVA_SRCS)))
-
-$(WB_JAVA_CLASSDIR)/%.class: $(WBSRCDIR)/%.java $(WB_JAVA_CLASSDIR)
- $(REMOTE) $(COMPILE.JAVAC) -sourcepath $(WBSRCDIR) -nowarn -d $(WB_JAVA_CLASSDIR) $<
-
-$(WB_JAR): $(WB_JAVA_CLASSES)
- $(QUIETLY) $(REMOTE) $(RUN.JAR) cf $@ -C $(WB_JAVA_CLASSDIR)/ .
-
-$(WB_JAVA_CLASSDIR):
- $(QUIETLY) mkdir -p $@
-
--- a/hotspot/make/excludeSrc.make Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/make/excludeSrc.make Tue Mar 05 11:49:33 2013 -0800
@@ -78,7 +78,7 @@
Src_Files_EXCLUDE += \
cmsAdaptiveSizePolicy.cpp cmsCollectorPolicy.cpp \
- cmsGCAdaptivePolicyCounters.cpp cmsLockVerifier.cpp cmsPermGen.cpp compactibleFreeListSpace.cpp \
+ cmsGCAdaptivePolicyCounters.cpp cmsLockVerifier.cpp compactibleFreeListSpace.cpp \
concurrentMarkSweepGeneration.cpp concurrentMarkSweepThread.cpp \
freeChunk.cpp adaptiveFreeList.cpp promotionInfo.cpp vmCMSOperations.cpp collectionSetChooser.cpp \
concurrentG1Refine.cpp concurrentG1RefineThread.cpp concurrentMark.cpp concurrentMarkThread.cpp \
@@ -91,11 +91,11 @@
gcTaskManager.cpp gcTaskThread.cpp objectStartArray.cpp parallelScavengeHeap.cpp parMarkBitMap.cpp \
pcTasks.cpp psAdaptiveSizePolicy.cpp psCompactionManager.cpp psGCAdaptivePolicyCounters.cpp \
psGenerationCounters.cpp psMarkSweep.cpp psMarkSweepDecorator.cpp psOldGen.cpp psParallelCompact.cpp \
- psPermGen.cpp psPromotionLAB.cpp psPromotionManager.cpp psScavenge.cpp psTasks.cpp psVirtualspace.cpp \
+ psPromotionLAB.cpp psPromotionManager.cpp psScavenge.cpp psTasks.cpp psVirtualspace.cpp \
psYoungGen.cpp vmPSOperations.cpp asParNewGeneration.cpp parCardTableModRefBS.cpp \
parGCAllocBuffer.cpp parNewGeneration.cpp mutableSpace.cpp gSpaceCounters.cpp allocationStats.cpp \
spaceCounters.cpp gcAdaptivePolicyCounters.cpp mutableNUMASpace.cpp immutableSpace.cpp \
- immutableSpace.cpp g1MemoryPool.cpp psMemoryPool.cpp yieldWorkingGroup.cpp g1Log.cpp
+ immutableSpace.cpp g1MemoryPool.cpp psMemoryPool.cpp yieldingWorkGroup.cpp g1Log.cpp
endif
ifeq ($(INCLUDE_NMT), false)
--- a/hotspot/make/hotspot_version Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/make/hotspot_version Tue Mar 05 11:49:33 2013 -0800
@@ -35,7 +35,7 @@
HS_MAJOR_VER=25
HS_MINOR_VER=0
-HS_BUILD_NUMBER=19
+HS_BUILD_NUMBER=21
JDK_MAJOR_VER=1
JDK_MINOR_VER=8
--- a/hotspot/make/linux/makefiles/defs.make Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/make/linux/makefiles/defs.make Tue Mar 05 11:49:33 2013 -0800
@@ -258,8 +258,6 @@
EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
EXPORT_MINIMAL_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/minimal
-EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/wb.jar
-
ifeq ($(findstring true, $(JVM_VARIANT_SERVER) $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX)
--- a/hotspot/make/linux/makefiles/vm.make Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/make/linux/makefiles/vm.make Tue Mar 05 11:49:33 2013 -0800
@@ -100,7 +100,13 @@
# This is VERY important! The version define must only be supplied to vm_version.o
# If not, ccache will not re-use the cache at all, since the version string might contain
# a time and date.
-vm_version.o: CXXFLAGS += ${JRE_VERSION}
+CXXFLAGS/vm_version.o += ${JRE_VERSION}
+
+CXXFLAGS/BYFILE = $(CXXFLAGS/$@)
+
+# File specific flags
+CXXFLAGS += $(CXXFLAGS/BYFILE)
+
ifndef JAVASE_EMBEDDED
ifneq (${ARCH},arm)
@@ -375,12 +381,9 @@
# Serviceability agent
include $(MAKEFILES_DIR)/saproc.make
-# Whitebox testing API
-include $(MAKEFILES_DIR)/wb.make
-
#----------------------------------------------------------------------
-build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(LIBJVM_DB) $(BUILDLIBSAPROC) dtraceCheck $(WB_JAR)
+build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(LIBJVM_DB) $(BUILDLIBSAPROC) dtraceCheck
install: install_jvm install_jsig install_saproc
--- a/hotspot/make/linux/makefiles/wb.make Tue Mar 05 09:50:53 2013 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-#
-# Copyright (c) 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-#
-
-# Rules to build whitebox testing library, used by vm.make
-WB = wb
-
-WBSRCDIR = $(GAMMADIR)/src/share/tools/whitebox
-
-WB_JAR = $(GENERATED)/$(WB).jar
-
-WB_JAVA_SRCS = $(shell find $(WBSRCDIR) -name '*.java')
-WB_JAVA_CLASSDIR = $(GENERATED)/wb/classes
-
-WB_JAVA_CLASSES = $(patsubst $(WBSRCDIR)/%,$(WB_JAVA_CLASSDIR)/%, \
- $(patsubst %.java,%.class,$(WB_JAVA_SRCS)))
-
-$(WB_JAVA_CLASSDIR)/%.class: $(WBSRCDIR)/%.java $(WB_JAVA_CLASSDIR)
- $(REMOTE) $(COMPILE.JAVAC) -sourcepath $(WBSRCDIR) -nowarn -d $(WB_JAVA_CLASSDIR) $<
-
-$(WB_JAR): $(WB_JAVA_CLASSES)
- $(QUIETLY) $(REMOTE) $(RUN.JAR) cf $@ -C $(WB_JAVA_CLASSDIR)/ .
-
-$(WB_JAVA_CLASSDIR):
- $(QUIETLY) mkdir -p $@
-
--- a/hotspot/make/sa.files Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/make/sa.files Tue Mar 05 11:49:33 2013 -0800
@@ -24,10 +24,7 @@
# This filelist macro is included in platform specific sa.make
# included all packages/*.java. package list can be generated by
-# $(GAMMADIR)/agent/make/build-pkglist. Then manually removed all
-# classes in sun.jvm.hotspot.ui (and subpackages), all ui classes
-# in sun.jvm.hotspot.bugspot/hotspot and SPARC and x86 disassembler
-# classes and sun.jvm.hotspot.utilities.soql.
+# $(GAMMADIR)/agent/make/build-pkglist.
# define AGENT_DIR before including this file in sa.make
@@ -40,8 +37,6 @@
$(AGENT_SRC_DIR)/sun/jvm/hotspot/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/asm/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/asm/sparc/*.java \
-$(AGENT_SRC_DIR)/sun/jvm/hotspot/bugspot/*.java \
-$(AGENT_SRC_DIR)/sun/jvm/hotspot/bugspot/tree/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/c1/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/ci/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/code/*.java \
@@ -82,7 +77,6 @@
$(AGENT_SRC_DIR)/sun/jvm/hotspot/gc_interface/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/interpreter/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/jdi/*.java \
-$(AGENT_SRC_DIR)/sun/jvm/hotspot/livejvm/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/memory/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/oops/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/opto/*.java \
--- a/hotspot/make/solaris/makefiles/defs.make Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/make/solaris/makefiles/defs.make Tue Mar 05 11:49:33 2013 -0800
@@ -187,8 +187,6 @@
endif
endif
-EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/wb.jar
-
EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
--- a/hotspot/make/solaris/makefiles/vm.make Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/make/solaris/makefiles/vm.make Tue Mar 05 11:49:33 2013 -0800
@@ -88,7 +88,13 @@
# This is VERY important! The version define must only be supplied to vm_version.o
# If not, ccache will not re-use the cache at all, since the version string might contain
# a time and date.
-vm_version.o: CXXFLAGS += ${JRE_VERSION}
+CXXFLAGS/vm_version.o += ${JRE_VERSION}
+
+CXXFLAGS/BYFILE = $(CXXFLAGS/$@)
+
+# File specific flags
+CXXFLAGS += $(CXXFLAGS/BYFILE)
+
# CFLAGS_WARN holds compiler options to suppress/enable warnings.
CFLAGS += $(CFLAGS_WARN)
@@ -341,12 +347,9 @@
# Serviceability agent
include $(MAKEFILES_DIR)/saproc.make
-# Whitebox testing API
-include $(MAKEFILES_DIR)/wb.make
-
#----------------------------------------------------------------------
-build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(LIBJVM_DB) $(LIBJVM_DTRACE) $(BUILDLIBSAPROC) dtraceCheck $(WB_JAR)
+build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(LIBJVM_DB) $(LIBJVM_DTRACE) $(BUILDLIBSAPROC) dtraceCheck
install: install_jvm install_jsig install_saproc
--- a/hotspot/make/solaris/makefiles/wb.make Tue Mar 05 09:50:53 2013 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-#
-# Copyright (c) 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Rules to build whitebox testing library, used by vm.make
-
-WB = wb
-
-WBSRCDIR = $(GAMMADIR)/src/share/tools/whitebox
-
-WB_JAR = $(GENERATED)/$(WB).jar
-
-WB_JAVA_SRCS = $(shell find $(WBSRCDIR) -name '*.java')
-WB_JAVA_CLASSDIR = $(GENERATED)/wb/classes
-
-WB_JAVA_CLASSES = $(patsubst $(WBSRCDIR)/%,$(WB_JAVA_CLASSDIR)/%, \
- $(patsubst %.java,%.class,$(WB_JAVA_SRCS)))
-
-$(WB_JAVA_CLASSDIR)/%.class: $(WBSRCDIR)/%.java $(WB_JAVA_CLASSDIR)
- $(REMOTE) $(COMPILE.JAVAC) -sourcepath $(WBSRCDIR) -nowarn -d $(WB_JAVA_CLASSDIR) $<
-
-$(WB_JAR): $(WB_JAVA_CLASSES)
- $(QUIETLY) $(REMOTE) $(RUN.JAR) cf $@ -C $(WB_JAVA_CLASSDIR)/ .
-
-$(WB_JAVA_CLASSDIR):
- $(QUIETLY) mkdir -p $@
-
--- a/hotspot/make/windows/makefiles/debug.make Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/make/windows/makefiles/debug.make Tue Mar 05 11:49:33 2013 -0800
@@ -33,7 +33,7 @@
BUILD_PCH_FILE=_build_pch_file.obj
!endif
-default:: $(BUILD_PCH_FILE) $(AOUT) launcher checkAndBuildSA wb
+default:: $(BUILD_PCH_FILE) $(AOUT) launcher checkAndBuildSA
!include ../local.make
!include compile.make
@@ -72,4 +72,3 @@
!include $(WorkSpace)/make/windows/makefiles/shared.make
!include $(WorkSpace)/make/windows/makefiles/sa.make
!include $(WorkSpace)/make/windows/makefiles/launcher.make
-!include $(WorkSpace)/make/windows/makefiles/wb.make
--- a/hotspot/make/windows/makefiles/defs.make Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/make/windows/makefiles/defs.make Tue Mar 05 11:49:33 2013 -0800
@@ -277,8 +277,6 @@
endif
endif
-EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/wb.jar
-
ifeq ($(BUILD_WIN_SA), 1)
EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.$(LIBRARY_SUFFIX)
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
--- a/hotspot/make/windows/makefiles/fastdebug.make Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/make/windows/makefiles/fastdebug.make Tue Mar 05 11:49:33 2013 -0800
@@ -33,7 +33,7 @@
BUILD_PCH_FILE=_build_pch_file.obj
!endif
-default:: $(BUILD_PCH_FILE) $(AOUT) launcher checkAndBuildSA wb
+default:: $(BUILD_PCH_FILE) $(AOUT) launcher checkAndBuildSA
!include ../local.make
!include compile.make
@@ -71,4 +71,3 @@
!include $(WorkSpace)/make/windows/makefiles/shared.make
!include $(WorkSpace)/make/windows/makefiles/sa.make
!include $(WorkSpace)/make/windows/makefiles/launcher.make
-!include $(WorkSpace)/make/windows/makefiles/wb.make
--- a/hotspot/make/windows/makefiles/product.make Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/make/windows/makefiles/product.make Tue Mar 05 11:49:33 2013 -0800
@@ -32,7 +32,7 @@
BUILD_PCH_FILE=_build_pch_file.obj
!endif
-default:: $(BUILD_PCH_FILE) $(AOUT) launcher checkAndBuildSA wb
+default:: $(BUILD_PCH_FILE) $(AOUT) launcher checkAndBuildSA
!include ../local.make
!include compile.make
@@ -82,4 +82,3 @@
!include $(WorkSpace)/make/windows/makefiles/shared.make
!include $(WorkSpace)/make/windows/makefiles/sa.make
!include $(WorkSpace)/make/windows/makefiles/launcher.make
-!include $(WorkSpace)/make/windows/makefiles/wb.make
--- a/hotspot/make/windows/makefiles/wb.make Tue Mar 05 09:50:53 2013 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-#
-# Copyright (c) 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-#
-
-# This makefile is used to build the whitebox testing lib
-# and compile the tests which use it
-
-!include $(WorkSpace)/make/windows/makefiles/rules.make
-
-WBSRCDIR = $(WorkSpace)/src/share/tools/whitebox
-
-# turn GENERATED into a windows path to get sane dependencies
-WB_CLASSES=$(GENERATED:/=\)\wb\classes
-WB_JAR=$(GENERATED:/=\)\wb.jar
-
-# call recursive make to do wildcard expansion
-.SUFFIXES : .java .class
-wb_java_srcs: $(WorkSpace)\src\share\tools\whitebox\sun\hotspot\*.java $(WB_CLASSES)
- $(MAKE) -f $(WorkSpace)\make\windows\makefiles\$(BUILD_FLAVOR).make $(**:.java=.class)
-
-
-{$(WorkSpace)\src\share\tools\whitebox\sun\hotspot}.java.class::
- $(COMPILE_JAVAC) -sourcepath $(WBSRCDIR) -d $(WB_CLASSES) $<
-
-$(WB_JAR): wb_java_srcs
- $(RUN_JAR) cf $@ -C $(WB_CLASSES) .
-
-# turn $@ to a unix path because mkdir in PATH is cygwin/mks mkdir
-$(WB_CLASSES):
- mkdir -p $(@:\=/)
-
-# main target to build wb
-wb: $(WB_JAR)
-
--- a/hotspot/src/cpu/sparc/vm/frame_sparc.cpp Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/src/cpu/sparc/vm/frame_sparc.cpp Tue Mar 05 11:49:33 2013 -0800
@@ -216,6 +216,11 @@
}
}
+ // Could just be some random pointer within the codeBlob
+ if (!_cb->code_contains(_pc)) {
+ return false;
+ }
+
// Entry frame checks
if (is_entry_frame()) {
// an entry frame must have a valid fp.
--- a/hotspot/src/cpu/sparc/vm/templateTable_sparc.cpp Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/src/cpu/sparc/vm/templateTable_sparc.cpp Tue Mar 05 11:49:33 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -340,8 +340,6 @@
__ bind(notInt);
// __ cmp(O2, JVM_CONSTANT_String);
- __ brx(Assembler::equal, true, Assembler::pt, isString);
- __ delayed()->cmp(O2, JVM_CONSTANT_Object);
__ brx(Assembler::notEqual, true, Assembler::pt, notString);
__ delayed()->ldf(FloatRegisterImpl::S, O0, O1, Ftos_f);
__ bind(isString);
--- a/hotspot/src/cpu/x86/vm/frame_x86.cpp Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/src/cpu/x86/vm/frame_x86.cpp Tue Mar 05 11:49:33 2013 -0800
@@ -91,6 +91,12 @@
return false;
}
}
+
+ // Could just be some random pointer within the codeBlob
+ if (!_cb->code_contains(_pc)) {
+ return false;
+ }
+
// Entry frame checks
if (is_entry_frame()) {
// an entry frame must have a valid fp.
--- a/hotspot/src/os/bsd/vm/os_bsd.cpp Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/src/os/bsd/vm/os_bsd.cpp Tue Mar 05 11:49:33 2013 -0800
@@ -2887,7 +2887,9 @@
void signalHandler(int sig, siginfo_t* info, void* uc) {
assert(info != NULL && uc != NULL, "it must be old kernel");
+ int orig_errno = errno; // Preserve errno value over signal handler.
JVM_handle_bsd_signal(sig, info, uc, true);
+ errno = orig_errno;
}
--- a/hotspot/src/os/linux/vm/os_linux.cpp Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/src/os/linux/vm/os_linux.cpp Tue Mar 05 11:49:33 2013 -0800
@@ -3653,7 +3653,9 @@
void signalHandler(int sig, siginfo_t* info, void* uc) {
assert(info != NULL && uc != NULL, "it must be old kernel");
+ int orig_errno = errno; // Preserve errno value over signal handler.
JVM_handle_linux_signal(sig, info, uc, true);
+ errno = orig_errno;
}
@@ -4741,49 +4743,26 @@
//
static jlong slow_thread_cpu_time(Thread *thread, bool user_sys_cpu_time) {
- static bool proc_pid_cpu_avail = true;
static bool proc_task_unchecked = true;
static const char *proc_stat_path = "/proc/%d/stat";
pid_t tid = thread->osthread()->thread_id();
- int i;
char *s;
char stat[2048];
int statlen;
char proc_name[64];
int count;
long sys_time, user_time;
- char string[64];
char cdummy;
int idummy;
long ldummy;
FILE *fp;
- // We first try accessing /proc/<pid>/cpu since this is faster to
- // process. If this file is not present (linux kernels 2.5 and above)
- // then we open /proc/<pid>/stat.
- if ( proc_pid_cpu_avail ) {
- sprintf(proc_name, "/proc/%d/cpu", tid);
- fp = fopen(proc_name, "r");
- if ( fp != NULL ) {
- count = fscanf( fp, "%s %lu %lu\n", string, &user_time, &sys_time);
- fclose(fp);
- if ( count != 3 ) return -1;
-
- if (user_sys_cpu_time) {
- return ((jlong)sys_time + (jlong)user_time) * (1000000000 / clock_tics_per_sec);
- } else {
- return (jlong)user_time * (1000000000 / clock_tics_per_sec);
- }
- }
- else proc_pid_cpu_avail = false;
- }
-
// The /proc/<tid>/stat aggregates per-process usage on
// new Linux kernels 2.6+ where NPTL is supported.
// The /proc/self/task/<tid>/stat still has the per-thread usage.
// See bug 6328462.
- // There can be no directory /proc/self/task on kernels 2.4 with NPTL
- // and possibly in some other cases, so we check its availability.
+ // There possibly can be cases where there is no directory
+ // /proc/self/task, so we check its availability.
if (proc_task_unchecked && os::Linux::is_NPTL()) {
// This is executed only once
proc_task_unchecked = false;
@@ -4808,7 +4787,6 @@
// We don't really need to know the command string, just find the last
// occurrence of ")" and then start parsing from there. See bug 4726580.
s = strrchr(stat, ')');
- i = 0;
if (s == NULL ) return -1;
// Skip blank chars
--- a/hotspot/src/os/solaris/vm/os_solaris.cpp Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/src/os/solaris/vm/os_solaris.cpp Tue Mar 05 11:49:33 2013 -0800
@@ -1865,7 +1865,7 @@
// Die immediately, no exit hook, no abort hook, no cleanup.
void os::die() {
- _exit(-1);
+ ::abort(); // dump core (for debugging)
}
// unused
@@ -4317,7 +4317,9 @@
void signalHandler(int sig, siginfo_t* info, void* ucVoid) {
+ int orig_errno = errno; // Preserve errno value over signal handler.
JVM_handle_solaris_signal(sig, info, ucVoid, true);
+ errno = orig_errno;
}
/* Do not delete - if guarantee is ever removed, a signal handler (even empty)
--- a/hotspot/src/os/windows/vm/os_windows.cpp Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/src/os/windows/vm/os_windows.cpp Tue Mar 05 11:49:33 2013 -0800
@@ -1940,7 +1940,7 @@
// a counter for each possible signal value, including signal_thread exit signal
static volatile jint pending_signals[NSIG+1] = { 0 };
-static HANDLE sig_sem;
+static HANDLE sig_sem = NULL;
void os::signal_init_pd() {
// Initialize signal structures
@@ -1970,10 +1970,11 @@
void os::signal_notify(int signal_number) {
BOOL ret;
-
- Atomic::inc(&pending_signals[signal_number]);
- ret = ::ReleaseSemaphore(sig_sem, 1, NULL);
- assert(ret != 0, "ReleaseSemaphore() failed");
+ if (sig_sem != NULL) {
+ Atomic::inc(&pending_signals[signal_number]);
+ ret = ::ReleaseSemaphore(sig_sem, 1, NULL);
+ assert(ret != 0, "ReleaseSemaphore() failed");
+ }
}
static int check_pending_signals(bool wait_for_signal) {
--- a/hotspot/src/share/tools/whitebox/sun/hotspot/WhiteBox.java Tue Mar 05 09:50:53 2013 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.hotspot;
-
-import java.lang.reflect.Method;
-import java.security.BasicPermission;
-import sun.hotspot.parser.DiagnosticCommand;
-
-public class WhiteBox {
-
- @SuppressWarnings("serial")
- public static class WhiteBoxPermission extends BasicPermission {
- public WhiteBoxPermission(String s) {
- super(s);
- }
- }
-
- private WhiteBox() {}
- private static final WhiteBox instance = new WhiteBox();
- private static native void registerNatives();
-
- /**
- * Returns the singleton WhiteBox instance.
- *
- * The returned WhiteBox object should be carefully guarded
- * by the caller, since it can be used to read and write data
- * at arbitrary memory addresses. It must never be passed to
- * untrusted code.
- */
- public synchronized static WhiteBox getWhiteBox() {
- SecurityManager sm = System.getSecurityManager();
- if (sm != null) {
- sm.checkPermission(new WhiteBoxPermission("getInstance"));
- }
- return instance;
- }
-
- static {
- registerNatives();
- }
-
- // Memory
- public native long getObjectAddress(Object o);
- public native int getHeapOopSize();
-
- // Runtime
- // Make sure class name is in the correct format
- public boolean isClassAlive(String name) {
- return isClassAlive0(name.replace('.', '/'));
- }
- private native boolean isClassAlive0(String name);
-
- // G1
- public native boolean g1InConcurrentMark();
- public native boolean g1IsHumongous(Object o);
- public native long g1NumFreeRegions();
- public native int g1RegionSize();
- public native Object[] parseCommandLine(String commandline, DiagnosticCommand[] args);
-
- // NMT
- public native boolean NMTAllocTest();
- public native boolean NMTFreeTestMemory();
- public native boolean NMTWaitForDataMerge();
-
- // Compiler
- public native void deoptimizeAll();
- public native boolean isMethodCompiled(Method method);
- public native boolean isMethodCompilable(Method method);
- public native boolean isMethodQueuedForCompilation(Method method);
- public native int deoptimizeMethod(Method method);
- public native void makeMethodNotCompilable(Method method);
- public native int getMethodCompilationLevel(Method method);
- public native boolean setDontInlineMethod(Method method, boolean value);
- public native int getCompileQueuesSize();
-}
--- a/hotspot/src/share/tools/whitebox/sun/hotspot/parser/DiagnosticCommand.java Tue Mar 05 09:50:53 2013 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-package sun.hotspot.parser;
-
-public class DiagnosticCommand {
-
- public enum DiagnosticArgumentType {
- JLONG, BOOLEAN, STRING, NANOTIME, STRINGARRAY, MEMORYSIZE
- }
-
- private String name;
- private String desc;
- private DiagnosticArgumentType type;
- private boolean mandatory;
- private String defaultValue;
-
- public DiagnosticCommand(String name, String desc, DiagnosticArgumentType type,
- boolean mandatory, String defaultValue) {
- this.name = name;
- this.desc = desc;
- this.type = type;
- this.mandatory = mandatory;
- this.defaultValue = defaultValue;
- }
-
- public String getName() {
- return name;
- }
-
- public String getDesc() {
- return desc;
- }
-
- public DiagnosticArgumentType getType() {
- return type;
- }
-
- public boolean isMandatory() {
- return mandatory;
- }
-
- public String getDefaultValue() {
- return defaultValue;
- }
-}
--- a/hotspot/src/share/vm/adlc/formssel.cpp Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/src/share/vm/adlc/formssel.cpp Tue Mar 05 11:49:33 2013 -0800
@@ -753,10 +753,11 @@
!strcmp(_matrule->_rChild->_opType,"DecodeNKlass") ||
!strcmp(_matrule->_rChild->_opType,"EncodePKlass") ||
!strcmp(_matrule->_rChild->_opType,"LoadN") ||
- !strcmp(_matrule->_rChild->_opType,"GetAndSetN") ||
!strcmp(_matrule->_rChild->_opType,"LoadNKlass") ||
!strcmp(_matrule->_rChild->_opType,"CreateEx") || // type of exception
- !strcmp(_matrule->_rChild->_opType,"CheckCastPP")) ) return true;
+ !strcmp(_matrule->_rChild->_opType,"CheckCastPP") ||
+ !strcmp(_matrule->_rChild->_opType,"GetAndSetP") ||
+ !strcmp(_matrule->_rChild->_opType,"GetAndSetN")) ) return true;
else if ( is_ideal_load() == Form::idealP ) return true;
else if ( is_ideal_store() != Form::none ) return true;
--- a/hotspot/src/share/vm/c1/c1_LIR.cpp Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/src/share/vm/c1/c1_LIR.cpp Tue Mar 05 11:49:33 2013 -0800
@@ -814,7 +814,7 @@
// only visit register parameters
int n = opJavaCall->_arguments->length();
- for (int i = 0; i < n; i++) {
+ for (int i = opJavaCall->_receiver->is_valid() ? 1 : 0; i < n; i++) {
if (!opJavaCall->_arguments->at(i)->is_pointer()) {
do_input(*opJavaCall->_arguments->adr_at(i));
}
--- a/hotspot/src/share/vm/ci/ciEnv.cpp Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/src/share/vm/ci/ciEnv.cpp Tue Mar 05 11:49:33 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, 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
@@ -597,10 +597,6 @@
assert (klass->is_instance_klass() || klass->is_array_klass(),
"must be an instance or array klass ");
return ciConstant(T_OBJECT, klass->java_mirror());
- } else if (tag.is_object()) {
- oop obj = cpool->object_at(index);
- ciObject* ciobj = get_object(obj);
- return ciConstant(T_OBJECT, ciobj);
} else if (tag.is_method_type()) {
// must execute Java code to link this CP entry into cache[i].f1
ciSymbol* signature = get_symbol(cpool->method_type_signature_at(index));
--- a/hotspot/src/share/vm/classfile/verifier.cpp Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/src/share/vm/classfile/verifier.cpp Tue Mar 05 11:49:33 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2013, 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
@@ -61,7 +61,8 @@
# include "bytes_ppc.hpp"
#endif
-#define NOFAILOVER_MAJOR_VERSION 51
+#define NOFAILOVER_MAJOR_VERSION 51
+#define STATIC_METHOD_IN_INTERFACE_MAJOR_VERSION 52
// Access to external entry for VerifyClassCodes - old byte code verifier
@@ -2317,6 +2318,11 @@
types = (1 << JVM_CONSTANT_InterfaceMethodref) |
(1 << JVM_CONSTANT_Methodref);
break;
+ case Bytecodes::_invokestatic:
+ types = (_klass->major_version() < STATIC_METHOD_IN_INTERFACE_MAJOR_VERSION) ?
+ (1 << JVM_CONSTANT_Methodref) :
+ ((1 << JVM_CONSTANT_InterfaceMethodref) | (1 << JVM_CONSTANT_Methodref));
+ break;
default:
types = 1 << JVM_CONSTANT_Methodref;
}
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp Tue Mar 05 11:49:33 2013 -0800
@@ -117,7 +117,7 @@
if (G1Log::fine()) {
gclog_or_tty->date_stamp(PrintGCDateStamps);
gclog_or_tty->stamp(PrintGCTimeStamps);
- gclog_or_tty->print_cr("[GC concurrent-root-region-scan-end, %1.7lf]",
+ gclog_or_tty->print_cr("[GC concurrent-root-region-scan-end, %1.7lf secs]",
scan_end - scan_start);
}
}
@@ -150,7 +150,7 @@
if (G1Log::fine()) {
gclog_or_tty->date_stamp(PrintGCDateStamps);
gclog_or_tty->stamp(PrintGCTimeStamps);
- gclog_or_tty->print_cr("[GC concurrent-mark-end, %1.7lf sec]",
+ gclog_or_tty->print_cr("[GC concurrent-mark-end, %1.7lf secs]",
mark_end_sec - mark_start_sec);
}
@@ -234,7 +234,7 @@
if (G1Log::fine()) {
gclog_or_tty->date_stamp(PrintGCDateStamps);
gclog_or_tty->stamp(PrintGCTimeStamps);
- gclog_or_tty->print_cr("[GC concurrent-cleanup-end, %1.7lf]",
+ gclog_or_tty->print_cr("[GC concurrent-cleanup-end, %1.7lf secs]",
cleanup_end_sec - cleanup_start_sec);
}
}
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp Tue Mar 05 11:49:33 2013 -0800
@@ -267,7 +267,15 @@
double max_gc_time = (double) MaxGCPauseMillis / 1000.0;
double time_slice = (double) GCPauseIntervalMillis / 1000.0;
_mmu_tracker = new G1MMUTrackerQueue(time_slice, max_gc_time);
- _sigma = (double) G1ConfidencePercent / 100.0;
+
+ uintx confidence_perc = G1ConfidencePercent;
+ // Put an artificial ceiling on this so that it's not set to a silly value.
+ if (confidence_perc > 100) {
+ confidence_perc = 100;
+ warning("G1ConfidencePercent is set to a value that is too large, "
+ "it's been updated to %u", confidence_perc);
+ }
+ _sigma = (double) confidence_perc / 100.0;
// start conservatively (around 50ms is about right)
_concurrent_mark_remark_times_ms->add(0.05);
--- a/hotspot/src/share/vm/gc_implementation/g1/g1_globals.hpp Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1_globals.hpp Tue Mar 05 11:49:33 2013 -0800
@@ -32,7 +32,7 @@
#define G1_FLAGS(develop, develop_pd, product, product_pd, diagnostic, experimental, notproduct, manageable, product_rw) \
\
- product(intx, G1ConfidencePercent, 50, \
+ product(uintx, G1ConfidencePercent, 50, \
"Confidence level for MMU/pause predictions") \
\
develop(intx, G1MarkingOverheadPercent, 0, \
--- a/hotspot/src/share/vm/interpreter/bytecodeTracer.cpp Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/src/share/vm/interpreter/bytecodeTracer.cpp Tue Mar 05 11:49:33 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -335,9 +335,6 @@
st->print_cr(" %s", constants->resolved_klass_at(i)->external_name());
} else if (tag.is_unresolved_klass()) {
st->print_cr(" <unresolved klass at %d>", i);
- } else if (tag.is_object()) {
- st->print(" <Object>");
- print_oop(constants->object_at(i), st);
} else if (tag.is_method_type()) {
int i2 = constants->method_type_index_at(i);
st->print(" <MethodType> %d", i2);
--- a/hotspot/src/share/vm/interpreter/linkResolver.cpp Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/src/share/vm/interpreter/linkResolver.cpp Tue Mar 05 11:49:33 2013 -0800
@@ -1241,7 +1241,6 @@
void LinkResolver::resolve_invokedynamic(CallInfo& result, constantPoolHandle pool, int index, TRAPS) {
assert(EnableInvokeDynamic, "");
- pool->set_has_invokedynamic(); // mark header to flag active call sites
//resolve_pool(<resolved_klass>, method_name, method_signature, current_klass, pool, index, CHECK);
Symbol* method_name = pool->name_ref_at(index);
--- a/hotspot/src/share/vm/interpreter/rewriter.cpp Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/src/share/vm/interpreter/rewriter.cpp Tue Mar 05 11:49:33 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2013, 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
@@ -48,7 +48,6 @@
add_cp_cache_entry(i);
break;
case JVM_CONSTANT_String:
- case JVM_CONSTANT_Object:
case JVM_CONSTANT_MethodHandle : // fall through
case JVM_CONSTANT_MethodType : // fall through
add_resolved_references_entry(i);
@@ -238,7 +237,7 @@
address p = bcp + offset;
int cp_index = is_wide ? Bytes::get_Java_u2(p) : (u1)(*p);
constantTag tag = _pool->tag_at(cp_index).value();
- if (tag.is_method_handle() || tag.is_method_type() || tag.is_string() || tag.is_object()) {
+ if (tag.is_method_handle() || tag.is_method_type() || tag.is_string()) {
int ref_index = cp_entry_to_resolved_references(cp_index);
if (is_wide) {
(*bcp) = Bytecodes::_fast_aldc_w;
--- a/hotspot/src/share/vm/memory/collectorPolicy.cpp Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/src/share/vm/memory/collectorPolicy.cpp Tue Mar 05 11:49:33 2013 -0800
@@ -168,11 +168,11 @@
void GenCollectorPolicy::initialize_size_policy(size_t init_eden_size,
size_t init_promo_size,
size_t init_survivor_size) {
- const double max_gc_minor_pause_sec = ((double) MaxGCMinorPauseMillis)/1000.0;
+ const double max_gc_pause_sec = ((double) MaxGCPauseMillis)/1000.0;
_size_policy = new AdaptiveSizePolicy(init_eden_size,
init_promo_size,
init_survivor_size,
- max_gc_minor_pause_sec,
+ max_gc_pause_sec,
GCTimeRatio);
}
--- a/hotspot/src/share/vm/oops/constantPool.cpp Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/src/share/vm/oops/constantPool.cpp Tue Mar 05 11:49:33 2013 -0800
@@ -695,10 +695,6 @@
result_oop = string_at_impl(this_oop, index, cache_index, CHECK_NULL);
break;
- case JVM_CONSTANT_Object:
- result_oop = this_oop->object_at(index);
- break;
-
case JVM_CONSTANT_MethodHandleInError:
case JVM_CONSTANT_MethodTypeInError:
{
@@ -1824,8 +1820,6 @@
st->print_cr(internal_name());
if (flags() != 0) {
st->print(" - flags: 0x%x", flags());
- if (has_pseudo_string()) st->print(" has_pseudo_string");
- if (has_invokedynamic()) st->print(" has_invokedynamic");
if (has_preresolution()) st->print(" has_preresolution");
if (on_stack()) st->print(" on_stack");
st->cr();
@@ -1869,13 +1863,14 @@
st->print(" name_and_type_index=%d", uncached_name_and_type_ref_index_at(index));
break;
case JVM_CONSTANT_String :
- unresolved_string_at(index)->print_value_on(st);
+ if (is_pseudo_string_at(index)) {
+ oop anObj = pseudo_string_at(index);
+ anObj->print_value_on(st);
+ st->print(" {0x%lx}", (address)anObj);
+ } else {
+ unresolved_string_at(index)->print_value_on(st);
+ }
break;
- case JVM_CONSTANT_Object : {
- oop anObj = object_at(index);
- anObj->print_value_on(st);
- st->print(" {0x%lx}", (address)anObj);
- } break;
case JVM_CONSTANT_Integer :
st->print("%d", int_at(index));
break;
@@ -1939,8 +1934,6 @@
void ConstantPool::print_value_on(outputStream* st) const {
assert(is_constantPool(), "must be constantPool");
st->print("constant pool [%d]", length());
- if (has_pseudo_string()) st->print("/pseudo_string");
- if (has_invokedynamic()) st->print("/invokedynamic");
if (has_preresolution()) st->print("/preresolution");
if (operands() != NULL) st->print("/operands[%d]", operands()->length());
print_address_on(st);
--- a/hotspot/src/share/vm/oops/constantPool.hpp Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/src/share/vm/oops/constantPool.hpp Tue Mar 05 11:49:33 2013 -0800
@@ -97,10 +97,8 @@
Array<u2>* _reference_map;
enum {
- _has_invokedynamic = 1, // Flags
- _has_pseudo_string = 2,
- _has_preresolution = 4,
- _on_stack = 8
+ _has_preresolution = 1, // Flags
+ _on_stack = 2
};
int _flags; // old fashioned bit twiddling
@@ -175,12 +173,6 @@
Array<u1>* tags() const { return _tags; }
Array<u2>* operands() const { return _operands; }
- bool has_invokedynamic() const { return (_flags & _has_invokedynamic) != 0; }
- void set_has_invokedynamic() { _flags |= _has_invokedynamic; }
-
- bool has_pseudo_string() const { return (_flags & _has_pseudo_string) != 0; }
- void set_has_pseudo_string() { _flags |= _has_pseudo_string; }
-
bool has_preresolution() const { return (_flags & _has_preresolution) != 0; }
void set_has_preresolution() { _flags |= _has_preresolution; }
@@ -324,14 +316,6 @@
resolved_references()->obj_at_put(obj_index, str);
}
- void set_object_tag_at(int which) {
- release_tag_at_put(which, JVM_CONSTANT_Object);
- }
-
- void object_at_put(int which, oop obj) {
- resolved_references()->obj_at_put(cp_to_object_index(which), obj);
- }
-
// For temporary use while constructing constant pool
void string_index_at_put(int which, int string_index) {
tag_at_put(which, JVM_CONSTANT_StringIndex);
@@ -429,12 +413,6 @@
// Version that can be used before string oop array is created.
oop uncached_string_at(int which, TRAPS);
- oop object_at(int which) {
- assert(tag_at(which).is_object(), "Corrupted constant pool");
- int obj_index = cp_to_object_index(which);
- return resolved_references()->obj_at(obj_index);
- }
-
// A "pseudo-string" is an non-string oop that has found is way into
// a String entry.
// Under EnableInvokeDynamic this can happen if the user patches a live
@@ -454,10 +432,18 @@
return s;
}
+ oop pseudo_string_at(int which) {
+ assert(tag_at(which).is_string(), "Corrupted constant pool");
+ assert(unresolved_string_at(which) == NULL, "shouldn't have symbol");
+ int obj_index = cp_to_object_index(which);
+ oop s = resolved_references()->obj_at(obj_index);
+ return s;
+ }
+
void pseudo_string_at_put(int which, int obj_index, oop x) {
assert(EnableInvokeDynamic, "");
- set_has_pseudo_string(); // mark header
assert(tag_at(which).is_string(), "Corrupted constant pool");
+ unresolved_string_at_put(which, NULL); // indicates patched string
string_at_put(which, obj_index, x); // this works just fine
}
--- a/hotspot/src/share/vm/oops/generateOopMap.cpp Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/src/share/vm/oops/generateOopMap.cpp Tue Mar 05 11:49:33 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -1853,7 +1853,6 @@
if (tag.is_klass() ||
tag.is_unresolved_klass() ||
tag.is_string() ||
- tag.is_object() ||
tag.is_method_handle() ||
tag.is_method_type()) {
assert(bt == T_OBJECT, "Guard is incorrect");
--- a/hotspot/src/share/vm/oops/method.hpp Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/src/share/vm/oops/method.hpp Tue Mar 05 11:49:33 2013 -0800
@@ -456,6 +456,8 @@
void print_codes_on(int from, int to, outputStream* st) const PRODUCT_RETURN;
// method parameters
+ bool has_method_parameters() const
+ { return constMethod()->has_method_parameters(); }
int method_parameters_length() const
{ return constMethod()->method_parameters_length(); }
MethodParametersElement* method_parameters_start() const
--- a/hotspot/src/share/vm/opto/bytecodeInfo.cpp Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/src/share/vm/opto/bytecodeInfo.cpp Tue Mar 05 11:49:33 2013 -0800
@@ -47,7 +47,8 @@
_site_invoke_ratio(site_invoke_ratio),
_max_inline_level(max_inline_level),
_count_inline_bcs(method()->code_size_for_inlining()),
- _subtrees(c->comp_arena(), 2, 0, NULL)
+ _subtrees(c->comp_arena(), 2, 0, NULL),
+ _msg(NULL)
{
NOT_PRODUCT(_count_inlines = 0;)
if (_caller_jvms != NULL) {
@@ -77,7 +78,8 @@
_method(callee_method),
_site_invoke_ratio(site_invoke_ratio),
_max_inline_level(max_inline_level),
- _count_inline_bcs(method()->code_size())
+ _count_inline_bcs(method()->code_size()),
+ _msg(NULL)
{
NOT_PRODUCT(_count_inlines = 0;)
assert(!UseOldInlining, "do not use for old stuff");
@@ -95,8 +97,10 @@
);
}
-// positive filter: should callee be inlined? returns NULL, if yes, or rejection msg
-const char* InlineTree::should_inline(ciMethod* callee_method, ciMethod* caller_method, int caller_bci, ciCallProfile& profile, WarmCallInfo* wci_result) const {
+// positive filter: should callee be inlined?
+bool InlineTree::should_inline(ciMethod* callee_method, ciMethod* caller_method,
+ int caller_bci, ciCallProfile& profile,
+ WarmCallInfo* wci_result) {
// Allows targeted inlining
if(callee_method->should_inline()) {
*wci_result = *(WarmCallInfo::always_hot());
@@ -104,11 +108,10 @@
CompileTask::print_inline_indent(inline_level());
tty->print_cr("Inlined method is hot: ");
}
- return NULL;
+ set_msg("force inline by CompilerOracle");
+ return true;
}
- // positive filter: should send be inlined? returns NULL (--> yes)
- // or rejection msg
int size = callee_method->code_size_for_inlining();
// Check for too many throws (and not too huge)
@@ -119,11 +122,13 @@
CompileTask::print_inline_indent(inline_level());
tty->print_cr("Inlined method with many throws (throws=%d):", callee_method->interpreter_throwout_count());
}
- return NULL;
+ set_msg("many throws");
+ return true;
}
if (!UseOldInlining) {
- return NULL; // size and frequency are represented in a new way
+ set_msg("!UseOldInlining");
+ return true; // size and frequency are represented in a new way
}
int default_max_inline_size = C->max_inline_size();
@@ -153,31 +158,44 @@
// Not hot. Check for medium-sized pre-existing nmethod at cold sites.
if (callee_method->has_compiled_code() &&
callee_method->instructions_size() > inline_small_code_size)
- return "already compiled into a medium method";
+ set_msg("already compiled into a medium method");
+ return false;
}
if (size > max_inline_size) {
- if (max_inline_size > default_max_inline_size)
- return "hot method too big";
- return "too big";
+ if (max_inline_size > default_max_inline_size) {
+ set_msg("hot method too big");
+ } else {
+ set_msg("too big");
+ }
+ return false;
}
- return NULL;
+ return true;
}
-// negative filter: should callee NOT be inlined? returns NULL, ok to inline, or rejection msg
-const char* InlineTree::should_not_inline(ciMethod *callee_method, ciMethod* caller_method, WarmCallInfo* wci_result) const {
- // negative filter: should send NOT be inlined? returns NULL (--> inline) or rejection msg
+// negative filter: should callee NOT be inlined?
+bool InlineTree::should_not_inline(ciMethod *callee_method,
+ ciMethod* caller_method,
+ WarmCallInfo* wci_result) {
+
+ const char* fail_msg = NULL;
+
+ // First check all inlining restrictions which are required for correctness
+ if ( callee_method->is_abstract()) {
+ fail_msg = "abstract method"; // // note: we allow ik->is_abstract()
+ } else if (!callee_method->holder()->is_initialized()) {
+ fail_msg = "method holder not initialized";
+ } else if ( callee_method->is_native()) {
+ fail_msg = "native method";
+ } else if ( callee_method->dont_inline()) {
+ fail_msg = "don't inline by annotation";
+ }
+
if (!UseOldInlining) {
- const char* fail = NULL;
- if ( callee_method->is_abstract()) fail = "abstract method";
- // note: we allow ik->is_abstract()
- if (!callee_method->holder()->is_initialized()) fail = "method holder not initialized";
- if ( callee_method->is_native()) fail = "native method";
- if ( callee_method->dont_inline()) fail = "don't inline by annotation";
-
- if (fail) {
+ if (fail_msg != NULL) {
*wci_result = *(WarmCallInfo::always_cold());
- return fail;
+ set_msg(fail_msg);
+ return true;
}
if (callee_method->has_unloaded_classes_in_signature()) {
@@ -199,20 +217,23 @@
// %%% adjust wci_result->size()?
}
- return NULL;
+ return false;
+ }
+
+ // one more inlining restriction
+ if (fail_msg == NULL && callee_method->has_unloaded_classes_in_signature()) {
+ fail_msg = "unloaded signature classes";
}
- // First check all inlining restrictions which are required for correctness
- if ( callee_method->is_abstract()) return "abstract method";
- // note: we allow ik->is_abstract()
- if (!callee_method->holder()->is_initialized()) return "method holder not initialized";
- if ( callee_method->is_native()) return "native method";
- if ( callee_method->dont_inline()) return "don't inline by annotation";
- if ( callee_method->has_unloaded_classes_in_signature()) return "unloaded signature classes";
+ if (fail_msg != NULL) {
+ set_msg(fail_msg);
+ return true;
+ }
+ // ignore heuristic controls on inlining
if (callee_method->should_inline()) {
- // ignore heuristic controls on inlining
- return NULL;
+ set_msg("force inline by CompilerOracle");
+ return false;
}
// Now perform checks which are heuristic
@@ -220,7 +241,8 @@
if (!callee_method->force_inline()) {
if (callee_method->has_compiled_code() &&
callee_method->instructions_size() > InlineSmallCode) {
- return "already compiled into a big method";
+ set_msg("already compiled into a big method");
+ return true;
}
}
@@ -231,17 +253,21 @@
const InlineTree *top = this;
while (top->caller_tree() != NULL) top = top->caller_tree();
ciInstanceKlass* k = top->method()->holder();
- if (!k->is_subclass_of(C->env()->Throwable_klass()))
- return "exception method";
+ if (!k->is_subclass_of(C->env()->Throwable_klass())) {
+ set_msg("exception method");
+ return true;
+ }
}
if (callee_method->should_not_inline()) {
- return "disallowed by CompilerOracle";
+ set_msg("disallowed by CompilerOracle");
+ return true;
}
#ifndef PRODUCT
if (ciReplay::should_not_inline(callee_method)) {
- return "disallowed by ciReplay";
+ set_msg("disallowed by ciReplay");
+ return true;
}
#endif
@@ -249,19 +275,23 @@
// Do not inline StringCache::profile() method used only at the beginning.
if (callee_method->name() == ciSymbol::profile_name() &&
callee_method->holder()->name() == ciSymbol::java_lang_StringCache()) {
- return "profiling method";
+ set_msg("profiling method");
+ return true;
}
}
// use frequency-based objections only for non-trivial methods
- if (callee_method->code_size() <= MaxTrivialSize) return NULL;
+ if (callee_method->code_size() <= MaxTrivialSize) {
+ return false;
+ }
// don't use counts with -Xcomp or CTW
if (UseInterpreter && !CompileTheWorld) {
if (!callee_method->has_compiled_code() &&
!callee_method->was_executed_more_than(0)) {
- return "never executed";
+ set_msg("never executed");
+ return true;
}
if (is_init_with_ea(callee_method, caller_method, C)) {
@@ -270,39 +300,44 @@
} else if (!callee_method->was_executed_more_than(MIN2(MinInliningThreshold,
CompileThreshold >> 1))) {
- return "executed < MinInliningThreshold times";
+ set_msg("executed < MinInliningThreshold times");
+ return true;
}
}
- return NULL;
+ return false;
}
//-----------------------------try_to_inline-----------------------------------
-// return NULL if ok, reason for not inlining otherwise
+// return true if ok
// Relocated from "InliningClosure::try_to_inline"
-const char* InlineTree::try_to_inline(ciMethod* callee_method, ciMethod* caller_method, int caller_bci, ciCallProfile& profile, WarmCallInfo* wci_result, bool& should_delay) {
- // Old algorithm had funny accumulating BC-size counters
+bool InlineTree::try_to_inline(ciMethod* callee_method, ciMethod* caller_method,
+ int caller_bci, ciCallProfile& profile,
+ WarmCallInfo* wci_result, bool& should_delay) {
+
+ // Old algorithm had funny accumulating BC-size counters
if (UseOldInlining && ClipInlining
&& (int)count_inline_bcs() >= DesiredMethodLimit) {
if (!callee_method->force_inline() || !IncrementalInline) {
- return "size > DesiredMethodLimit";
+ set_msg("size > DesiredMethodLimit");
+ return false;
} else if (!C->inlining_incrementally()) {
should_delay = true;
}
}
- const char *msg = NULL;
- msg = should_inline(callee_method, caller_method, caller_bci, profile, wci_result);
- if (msg != NULL)
- return msg;
-
- msg = should_not_inline(callee_method, caller_method, wci_result);
- if (msg != NULL)
- return msg;
+ if (!should_inline(callee_method, caller_method, caller_bci, profile,
+ wci_result)) {
+ return false;
+ }
+ if (should_not_inline(callee_method, caller_method, wci_result)) {
+ return false;
+ }
if (InlineAccessors && callee_method->is_accessor()) {
// accessor methods are not subject to any of the following limits.
- return NULL;
+ set_msg("accessor");
+ return true;
}
// suppress a few checks for accessors and trivial methods
@@ -312,7 +347,8 @@
if (C->over_inlining_cutoff()) {
if ((!callee_method->force_inline() && !caller_method->is_compiled_lambda_form())
|| !IncrementalInline) {
- return "NodeCountInliningCutoff";
+ set_msg("NodeCountInliningCutoff");
+ return false;
} else {
should_delay = true;
}
@@ -326,16 +362,19 @@
} else if (profile.count() == 0) {
// don't inline unreached call sites
- return "call site not reached";
+ set_msg("call site not reached");
+ return false;
}
}
if (!C->do_inlining() && InlineAccessors) {
- return "not an accessor";
+ set_msg("not an accessor");
+ return false;
}
if (inline_level() > _max_inline_level) {
if (!callee_method->force_inline() || !IncrementalInline) {
- return "inlining too deep";
+ set_msg("inlining too deep");
+ return false;
} else if (!C->inlining_incrementally()) {
should_delay = true;
}
@@ -345,15 +384,19 @@
if (!callee_method->is_compiled_lambda_form()) {
// count the current method and the callee
int inline_level = (method() == callee_method) ? 1 : 0;
- if (inline_level > MaxRecursiveInlineLevel)
- return "recursively inlining too deep";
+ if (inline_level > MaxRecursiveInlineLevel) {
+ set_msg("recursively inlining too deep");
+ return false;
+ }
// count callers of current method and callee
JVMState* jvms = caller_jvms();
while (jvms != NULL && jvms->has_method()) {
if (jvms->method() == callee_method) {
inline_level++;
- if (inline_level > MaxRecursiveInlineLevel)
- return "recursively inlining too deep";
+ if (inline_level > MaxRecursiveInlineLevel) {
+ set_msg("recursively inlining too deep");
+ return false;
+ }
}
jvms = jvms->caller();
}
@@ -364,14 +407,15 @@
if (UseOldInlining && ClipInlining
&& (int)count_inline_bcs() + size >= DesiredMethodLimit) {
if (!callee_method->force_inline() || !IncrementalInline) {
- return "size > DesiredMethodLimit";
+ set_msg("size > DesiredMethodLimit");
+ return false;
} else if (!C->inlining_incrementally()) {
should_delay = true;
}
}
// ok, inline this method
- return NULL;
+ return true;
}
//------------------------------pass_initial_checks----------------------------
@@ -421,17 +465,18 @@
//------------------------------print_inlining---------------------------------
void InlineTree::print_inlining(ciMethod* callee_method, int caller_bci,
- const char* msg, bool success) const {
- assert(msg != NULL, "just checking");
+ bool success) const {
+ const char* inline_msg = msg();
+ assert(inline_msg != NULL, "just checking");
if (C->log() != NULL) {
if (success) {
- C->log()->inline_success(msg);
+ C->log()->inline_success(inline_msg);
} else {
- C->log()->inline_fail(msg);
+ C->log()->inline_fail(inline_msg);
}
}
if (PrintInlining) {
- C->print_inlining(callee_method, inline_level(), caller_bci, msg);
+ C->print_inlining(callee_method, inline_level(), caller_bci, inline_msg);
if (callee_method == NULL) tty->print(" callee not monotonic or profiled");
if (Verbose && callee_method) {
const InlineTree *top = this;
@@ -455,49 +500,51 @@
}
assert(_method == jvms->method(), "redundant instance state");
#endif
- const char *failure_msg = NULL;
int caller_bci = jvms->bci();
- ciMethod *caller_method = jvms->method();
+ ciMethod* caller_method = jvms->method();
// Do some initial checks.
if (!pass_initial_checks(caller_method, caller_bci, callee_method)) {
- print_inlining(callee_method, caller_bci, "failed initial checks",
- false /* !success */);
+ set_msg("failed initial checks");
+ print_inlining(callee_method, caller_bci, false /* !success */);
return NULL;
}
// Do some parse checks.
- failure_msg = check_can_parse(callee_method);
- if (failure_msg != NULL) {
- print_inlining(callee_method, caller_bci, failure_msg,
- false /* !success */);
+ set_msg(check_can_parse(callee_method));
+ if (msg() != NULL) {
+ print_inlining(callee_method, caller_bci, false /* !success */);
return NULL;
}
// Check if inlining policy says no.
WarmCallInfo wci = *(initial_wci);
- failure_msg = try_to_inline(callee_method, caller_method, caller_bci, profile,
- &wci, should_delay);
+ bool success = try_to_inline(callee_method, caller_method, caller_bci,
+ profile, &wci, should_delay);
#ifndef PRODUCT
if (UseOldInlining && InlineWarmCalls
&& (PrintOpto || PrintOptoInlining || PrintInlining)) {
bool cold = wci.is_cold();
bool hot = !cold && wci.is_hot();
- bool old_cold = (failure_msg != NULL);
+ bool old_cold = !success;
if (old_cold != cold || (Verbose || WizardMode)) {
+ if (msg() == NULL) {
+ set_msg("OK");
+ }
tty->print(" OldInlining= %4s : %s\n WCI=",
- old_cold ? "cold" : "hot", failure_msg ? failure_msg : "OK");
+ old_cold ? "cold" : "hot", msg());
wci.print();
}
}
#endif
if (UseOldInlining) {
- if (failure_msg == NULL)
+ if (success) {
wci = *(WarmCallInfo::always_hot());
- else
+ } else {
wci = *(WarmCallInfo::always_cold());
}
+ }
if (!InlineWarmCalls) {
if (!wci.is_cold() && !wci.is_hot()) {
// Do not inline the warm calls.
@@ -507,9 +554,10 @@
if (!wci.is_cold()) {
// Inline!
- print_inlining(callee_method, caller_bci,
- failure_msg ? failure_msg : "inline (hot)",
- true /* success */);
+ if (msg() == NULL) {
+ set_msg("inline (hot)");
+ }
+ print_inlining(callee_method, caller_bci, true /* success */);
if (UseOldInlining)
build_inline_tree_for_callee(callee_method, jvms, caller_bci);
if (InlineWarmCalls && !wci.is_hot())
@@ -518,9 +566,10 @@
}
// Do not inline
- print_inlining(callee_method, caller_bci,
- failure_msg ? failure_msg : "too cold to inline",
- false /* !success */ );
+ if (msg() == NULL) {
+ set_msg("too cold to inline");
+ }
+ print_inlining(callee_method, caller_bci, false /* !success */ );
return NULL;
}
--- a/hotspot/src/share/vm/opto/library_call.cpp Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/src/share/vm/opto/library_call.cpp Tue Mar 05 11:49:33 2013 -0800
@@ -1481,10 +1481,10 @@
Node* arg = round_double_node(argument(0));
Node* n;
switch (id) {
- case vmIntrinsics::_dabs: n = new (C) AbsDNode( arg); break;
- case vmIntrinsics::_dsqrt: n = new (C) SqrtDNode(0, arg); break;
- case vmIntrinsics::_dlog: n = new (C) LogDNode( arg); break;
- case vmIntrinsics::_dlog10: n = new (C) Log10DNode( arg); break;
+ case vmIntrinsics::_dabs: n = new (C) AbsDNode( arg); break;
+ case vmIntrinsics::_dsqrt: n = new (C) SqrtDNode(C, control(), arg); break;
+ case vmIntrinsics::_dlog: n = new (C) LogDNode(C, control(), arg); break;
+ case vmIntrinsics::_dlog10: n = new (C) Log10DNode(C, control(), arg); break;
default: fatal_unexpected_iid(id); break;
}
set_result(_gvn.transform(n));
@@ -1499,9 +1499,9 @@
Node* n = NULL;
switch (id) {
- case vmIntrinsics::_dsin: n = new (C) SinDNode(arg); break;
- case vmIntrinsics::_dcos: n = new (C) CosDNode(arg); break;
- case vmIntrinsics::_dtan: n = new (C) TanDNode(arg); break;
+ case vmIntrinsics::_dsin: n = new (C) SinDNode(C, control(), arg); break;
+ case vmIntrinsics::_dcos: n = new (C) CosDNode(C, control(), arg); break;
+ case vmIntrinsics::_dtan: n = new (C) TanDNode(C, control(), arg); break;
default: fatal_unexpected_iid(id); break;
}
n = _gvn.transform(n);
--- a/hotspot/src/share/vm/opto/memnode.cpp Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/src/share/vm/opto/memnode.cpp Tue Mar 05 11:49:33 2013 -0800
@@ -320,6 +320,9 @@
if (mem != old_mem) {
set_req(MemNode::Memory, mem);
+ if (can_reshape && old_mem->outcnt() == 0) {
+ igvn->_worklist.push(old_mem);
+ }
if (phase->type( mem ) == Type::TOP) return NodeSentinel;
return this;
}
@@ -2319,9 +2322,9 @@
if (ReduceFieldZeroing && /*can_reshape &&*/
mem->is_Proj() && mem->in(0)->is_Initialize()) {
InitializeNode* init = mem->in(0)->as_Initialize();
- intptr_t offset = init->can_capture_store(this, phase);
+ intptr_t offset = init->can_capture_store(this, phase, can_reshape);
if (offset > 0) {
- Node* moved = init->capture_store(this, offset, phase);
+ Node* moved = init->capture_store(this, offset, phase, can_reshape);
// If the InitializeNode captured me, it made a raw copy of me,
// and I need to disappear.
if (moved != NULL) {
@@ -3134,7 +3137,7 @@
// an initialization. Returns zero if a check fails.
// On success, returns the (constant) offset to which the store applies,
// within the initialized memory.
-intptr_t InitializeNode::can_capture_store(StoreNode* st, PhaseTransform* phase) {
+intptr_t InitializeNode::can_capture_store(StoreNode* st, PhaseTransform* phase, bool can_reshape) {
const int FAIL = 0;
if (st->req() != MemNode::ValueIn + 1)
return FAIL; // an inscrutable StoreNode (card mark?)
@@ -3156,6 +3159,91 @@
if (!detect_init_independence(val, true, complexity_count))
return FAIL; // stored value must be 'simple enough'
+ // The Store can be captured only if nothing after the allocation
+ // and before the Store is using the memory location that the store
+ // overwrites.
+ bool failed = false;
+ // If is_complete_with_arraycopy() is true the shape of the graph is
+ // well defined and is safe so no need for extra checks.
+ if (!is_complete_with_arraycopy()) {
+ // We are going to look at each use of the memory state following
+ // the allocation to make sure nothing reads the memory that the
+ // Store writes.
+ const TypePtr* t_adr = phase->type(adr)->isa_ptr();
+ int alias_idx = phase->C->get_alias_index(t_adr);
+ ResourceMark rm;
+ Unique_Node_List mems;
+ mems.push(mem);
+ Node* unique_merge = NULL;
+ for (uint next = 0; next < mems.size(); ++next) {
+ Node *m = mems.at(next);
+ for (DUIterator_Fast jmax, j = m->fast_outs(jmax); j < jmax; j++) {
+ Node *n = m->fast_out(j);
+ if (n->outcnt() == 0) {
+ continue;
+ }
+ if (n == st) {
+ continue;
+ } else if (n->in(0) != NULL && n->in(0) != ctl) {
+ // If the control of this use is different from the control
+ // of the Store which is right after the InitializeNode then
+ // this node cannot be between the InitializeNode and the
+ // Store.
+ continue;
+ } else if (n->is_MergeMem()) {
+ if (n->as_MergeMem()->memory_at(alias_idx) == m) {
+ // We can hit a MergeMemNode (that will likely go away
+ // later) that is a direct use of the memory state
+ // following the InitializeNode on the same slice as the
+ // store node that we'd like to capture. We need to check
+ // the uses of the MergeMemNode.
+ mems.push(n);
+ }
+ } else if (n->is_Mem()) {
+ Node* other_adr = n->in(MemNode::Address);
+ if (other_adr == adr) {
+ failed = true;
+ break;
+ } else {
+ const TypePtr* other_t_adr = phase->type(other_adr)->isa_ptr();
+ if (other_t_adr != NULL) {
+ int other_alias_idx = phase->C->get_alias_index(other_t_adr);
+ if (other_alias_idx == alias_idx) {
+ // A load from the same memory slice as the store right
+ // after the InitializeNode. We check the control of the
+ // object/array that is loaded from. If it's the same as
+ // the store control then we cannot capture the store.
+ assert(!n->is_Store(), "2 stores to same slice on same control?");
+ Node* base = other_adr;
+ assert(base->is_AddP(), err_msg_res("should be addp but is %s", base->Name()));
+ base = base->in(AddPNode::Base);
+ if (base != NULL) {
+ base = base->uncast();
+ if (base->is_Proj() && base->in(0) == alloc) {
+ failed = true;
+ break;
+ }
+ }
+ }
+ }
+ }
+ } else {
+ failed = true;
+ break;
+ }
+ }
+ }
+ }
+ if (failed) {
+ if (!can_reshape) {
+ // We decided we couldn't capture the store during parsing. We
+ // should try again during the next IGVN once the graph is
+ // cleaner.
+ phase->C->record_for_igvn(st);
+ }
+ return FAIL;
+ }
+
return offset; // success
}
@@ -3266,11 +3354,11 @@
// rawstore1 rawstore2)
//
Node* InitializeNode::capture_store(StoreNode* st, intptr_t start,
- PhaseTransform* phase) {
+ PhaseTransform* phase, bool can_reshape) {
assert(stores_are_sane(phase), "");
if (start < 0) return NULL;
- assert(can_capture_store(st, phase) == start, "sanity");
+ assert(can_capture_store(st, phase, can_reshape) == start, "sanity");
Compile* C = phase->C;
int size_in_bytes = st->memory_size();
--- a/hotspot/src/share/vm/opto/memnode.hpp Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/src/share/vm/opto/memnode.hpp Tue Mar 05 11:49:33 2013 -0800
@@ -1072,11 +1072,11 @@
// See if this store can be captured; return offset where it initializes.
// Return 0 if the store cannot be moved (any sort of problem).
- intptr_t can_capture_store(StoreNode* st, PhaseTransform* phase);
+ intptr_t can_capture_store(StoreNode* st, PhaseTransform* phase, bool can_reshape);
// Capture another store; reformat it to write my internal raw memory.
// Return the captured copy, else NULL if there is some sort of problem.
- Node* capture_store(StoreNode* st, intptr_t start, PhaseTransform* phase);
+ Node* capture_store(StoreNode* st, intptr_t start, PhaseTransform* phase, bool can_reshape);
// Find captured store which corresponds to the range [start..start+size).
// Return my own memory projection (meaning the initial zero bits)
--- a/hotspot/src/share/vm/opto/node.cpp Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/src/share/vm/opto/node.cpp Tue Mar 05 11:49:33 2013 -0800
@@ -1261,6 +1261,7 @@
if (dead->is_expensive()) {
igvn->C->remove_expensive_node(dead);
}
+ igvn->C->record_dead_node(dead->_idx);
// Kill all inputs to the dead guy
for (uint i=0; i < dead->req(); i++) {
Node *n = dead->in(i); // Get input to dead guy
--- a/hotspot/src/share/vm/opto/parse.hpp Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/src/share/vm/opto/parse.hpp Tue Mar 05 11:49:33 2013 -0800
@@ -58,7 +58,7 @@
GrowableArray<InlineTree*> _subtrees;
void print_impl(outputStream* stj, int indent) const PRODUCT_RETURN;
-
+ const char* _msg;
protected:
InlineTree(Compile* C,
const InlineTree* caller_tree,
@@ -70,17 +70,29 @@
InlineTree *build_inline_tree_for_callee(ciMethod* callee_method,
JVMState* caller_jvms,
int caller_bci);
- const char* try_to_inline(ciMethod* callee_method, ciMethod* caller_method, int caller_bci, ciCallProfile& profile, WarmCallInfo* wci_result, bool& should_delay);
- const char* should_inline(ciMethod* callee_method, ciMethod* caller_method, int caller_bci, ciCallProfile& profile, WarmCallInfo* wci_result) const;
- const char* should_not_inline(ciMethod* callee_method, ciMethod* caller_method, WarmCallInfo* wci_result) const;
+ bool try_to_inline(ciMethod* callee_method,
+ ciMethod* caller_method,
+ int caller_bci,
+ ciCallProfile& profile,
+ WarmCallInfo* wci_result,
+ bool& should_delay);
+ bool should_inline(ciMethod* callee_method,
+ ciMethod* caller_method,
+ int caller_bci,
+ ciCallProfile& profile,
+ WarmCallInfo* wci_result);
+ bool should_not_inline(ciMethod* callee_method,
+ ciMethod* caller_method,
+ WarmCallInfo* wci_result);
void print_inlining(ciMethod* callee_method, int caller_bci,
- const char* msg, bool success) const;
+ bool success) const;
- InlineTree *caller_tree() const { return _caller_tree; }
+ InlineTree* caller_tree() const { return _caller_tree; }
InlineTree* callee_at(int bci, ciMethod* m) const;
int inline_level() const { return stack_depth(); }
int stack_depth() const { return _caller_jvms ? _caller_jvms->depth() : 0; }
-
+ const char* msg() const { return _msg; }
+ void set_msg(const char* msg) { _msg = msg; }
public:
static const char* check_can_parse(ciMethod* callee);
--- a/hotspot/src/share/vm/opto/phaseX.cpp Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/src/share/vm/opto/phaseX.cpp Tue Mar 05 11:49:33 2013 -0800
@@ -1197,6 +1197,18 @@
assert(!(i < imax), "sanity");
}
}
+ if (ReduceFieldZeroing && dead->is_Load() && i == MemNode::Memory &&
+ in->is_Proj() && in->in(0) != NULL && in->in(0)->is_Initialize()) {
+ // A Load that directly follows an InitializeNode is
+ // going away. The Stores that follow are candidates
+ // again to be captured by the InitializeNode.
+ for (DUIterator_Fast jmax, j = in->fast_outs(jmax); j < jmax; j++) {
+ Node *n = in->fast_out(j);
+ if (n->is_Store()) {
+ _worklist.push(n);
+ }
+ }
+ }
}
}
C->record_dead_node(dead->_idx);
--- a/hotspot/src/share/vm/opto/subnode.hpp Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/src/share/vm/opto/subnode.hpp Tue Mar 05 11:49:33 2013 -0800
@@ -399,7 +399,10 @@
// Cosinus of a double
class CosDNode : public Node {
public:
- CosDNode( Node *in1 ) : Node(0, in1) {}
+ CosDNode(Compile* C, Node *c, Node *in1) : Node(c, in1) {
+ init_flags(Flag_is_expensive);
+ C->add_expensive_node(this);
+ }
virtual int Opcode() const;
const Type *bottom_type() const { return Type::DOUBLE; }
virtual uint ideal_reg() const { return Op_RegD; }
@@ -410,7 +413,10 @@
// Sinus of a double
class SinDNode : public Node {
public:
- SinDNode( Node *in1 ) : Node(0, in1) {}
+ SinDNode(Compile* C, Node *c, Node *in1) : Node(c, in1) {
+ init_flags(Flag_is_expensive);
+ C->add_expensive_node(this);
+ }
virtual int Opcode() const;
const Type *bottom_type() const { return Type::DOUBLE; }
virtual uint ideal_reg() const { return Op_RegD; }
@@ -422,7 +428,10 @@
// tangens of a double
class TanDNode : public Node {
public:
- TanDNode(Node *in1 ) : Node(0, in1) {}
+ TanDNode(Compile* C, Node *c,Node *in1) : Node(c, in1) {
+ init_flags(Flag_is_expensive);
+ C->add_expensive_node(this);
+ }
virtual int Opcode() const;
const Type *bottom_type() const { return Type::DOUBLE; }
virtual uint ideal_reg() const { return Op_RegD; }
@@ -445,7 +454,10 @@
// square root a double
class SqrtDNode : public Node {
public:
- SqrtDNode(Node *c, Node *in1 ) : Node(c, in1) {}
+ SqrtDNode(Compile* C, Node *c, Node *in1) : Node(c, in1) {
+ init_flags(Flag_is_expensive);
+ C->add_expensive_node(this);
+ }
virtual int Opcode() const;
const Type *bottom_type() const { return Type::DOUBLE; }
virtual uint ideal_reg() const { return Op_RegD; }
@@ -470,7 +482,10 @@
// Log_e of a double
class LogDNode : public Node {
public:
- LogDNode( Node *in1 ) : Node(0, in1) {}
+ LogDNode(Compile* C, Node *c, Node *in1) : Node(c, in1) {
+ init_flags(Flag_is_expensive);
+ C->add_expensive_node(this);
+ }
virtual int Opcode() const;
const Type *bottom_type() const { return Type::DOUBLE; }
virtual uint ideal_reg() const { return Op_RegD; }
@@ -481,7 +496,10 @@
// Log_10 of a double
class Log10DNode : public Node {
public:
- Log10DNode( Node *in1 ) : Node(0, in1) {}
+ Log10DNode(Compile* C, Node *c, Node *in1) : Node(c, in1) {
+ init_flags(Flag_is_expensive);
+ C->add_expensive_node(this);
+ }
virtual int Opcode() const;
const Type *bottom_type() const { return Type::DOUBLE; }
virtual uint ideal_reg() const { return Op_RegD; }
--- a/hotspot/src/share/vm/opto/superword.cpp Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/src/share/vm/opto/superword.cpp Tue Mar 05 11:49:33 2013 -0800
@@ -143,7 +143,8 @@
// Ready the block
- construct_bb();
+ if (!construct_bb())
+ return; // Exit if no interesting nodes or complex graph.
dependence_graph();
@@ -615,6 +616,7 @@
if (n == stop) break;
preds.push(n);
prev = n;
+ assert(n->is_Mem(), err_msg_res("unexpected node %s", n->Name()));
n = n->in(MemNode::Memory);
}
}
@@ -1578,7 +1580,7 @@
//------------------------------construct_bb---------------------------
// Construct reverse postorder list of block members
-void SuperWord::construct_bb() {
+bool SuperWord::construct_bb() {
Node* entry = bb();
assert(_stk.length() == 0, "stk is empty");
@@ -1596,6 +1598,12 @@
Node *n = lpt()->_body.at(i);
set_bb_idx(n, i); // Create a temporary map
if (in_bb(n)) {
+ if (n->is_LoadStore() || n->is_MergeMem() ||
+ (n->is_Proj() && !n->as_Proj()->is_CFG())) {
+ // Bailout if the loop has LoadStore, MergeMem or data Proj
+ // nodes. Superword optimization does not work with them.
+ return false;
+ }
bb_ct++;
if (!n->is_CFG()) {
bool found = false;
@@ -1620,6 +1628,10 @@
if (in_bb(n) && (n->is_Phi() && n->bottom_type() == Type::MEMORY)) {
Node* n_tail = n->in(LoopNode::LoopBackControl);
if (n_tail != n->in(LoopNode::EntryControl)) {
+ if (!n_tail->is_Mem()) {
+ assert(n_tail->is_Mem(), err_msg_res("unexpected node for memory slice: %s", n_tail->Name()));
+ return false; // Bailout
+ }
_mem_slice_head.push(n);
_mem_slice_tail.push(n_tail);
}
@@ -1695,6 +1707,7 @@
}
#endif
assert(rpo_idx == -1 && bb_ct == _block.length(), "all block members found");
+ return (_mem_slice_head.length() > 0) || (_data_entry.length() > 0);
}
//------------------------------initialize_bb---------------------------
--- a/hotspot/src/share/vm/opto/superword.hpp Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/src/share/vm/opto/superword.hpp Tue Mar 05 11:49:33 2013 -0800
@@ -380,7 +380,7 @@
// Is use->in(u_idx) a vector use?
bool is_vector_use(Node* use, int u_idx);
// Construct reverse postorder list of block members
- void construct_bb();
+ bool construct_bb();
// Initialize per node info
void initialize_bb();
// Insert n into block after pos
--- a/hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp Tue Mar 05 11:49:33 2013 -0800
@@ -1558,6 +1558,18 @@
} break;
}
} // end for each bytecode
+
+ // We also need to rewrite the parameter name indexes, if there is
+ // method parameter data present
+ if(method->has_method_parameters()) {
+ const int len = method->method_parameters_length();
+ MethodParametersElement* elem = method->method_parameters_start();
+
+ for (int i = 0; i < len; i++) {
+ const u2 cp_index = elem[i].name_cp_index;
+ elem[i].name_cp_index = find_new_index(cp_index);
+ }
+ }
} // end rewrite_cp_refs_in_method()
--- a/hotspot/src/share/vm/runtime/arguments.cpp Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/src/share/vm/runtime/arguments.cpp Tue Mar 05 11:49:33 2013 -0800
@@ -1738,16 +1738,6 @@
return false;
}
-static void force_serial_gc() {
- FLAG_SET_DEFAULT(UseSerialGC, true);
- FLAG_SET_DEFAULT(UseParNewGC, false);
- FLAG_SET_DEFAULT(UseConcMarkSweepGC, false);
- FLAG_SET_DEFAULT(CMSIncrementalMode, false); // special CMS suboption
- FLAG_SET_DEFAULT(UseParallelGC, false);
- FLAG_SET_DEFAULT(UseParallelOldGC, false);
- FLAG_SET_DEFAULT(UseG1GC, false);
-}
-
static bool verify_serial_gc_flags() {
return (UseSerialGC &&
!(UseParNewGC || (UseConcMarkSweepGC || CMSIncrementalMode) || UseG1GC ||
@@ -2191,19 +2181,6 @@
FREE_C_HEAP_ARRAY(char, altclasses_path, mtInternal);
}
- if (WhiteBoxAPI) {
- // Append wb.jar to bootclasspath if enabled
- const char* wb_jar = "wb.jar";
- size_t wb_path_len = strlen(get_meta_index_dir()) + 1 +
- strlen(wb_jar);
- char* wb_path = NEW_C_HEAP_ARRAY(char, wb_path_len, mtInternal);
- strcpy(wb_path, get_meta_index_dir());
- strcat(wb_path, wb_jar);
- scp.add_suffix(wb_path);
- scp_assembly_required = true;
- FREE_C_HEAP_ARRAY(char, wb_path, mtInternal);
- }
-
// Parse _JAVA_OPTIONS environment variable (if present) (mimics classic VM)
result = parse_java_options_environment_variable(&scp, &scp_assembly_required);
if (result != JNI_OK) {
@@ -2498,7 +2475,12 @@
}
// Out of the box management support
if (match_option(option, "-Dcom.sun.management", &tail)) {
+#if INCLUDE_MANAGEMENT
FLAG_SET_CMDLINE(bool, ManagementServer, true);
+#else
+ vm_exit_during_initialization(
+ "-Dcom.sun.management is not supported in this VM.", NULL);
+#endif
}
// -Xint
} else if (match_option(option, "-Xint", &tail)) {
@@ -2844,6 +2826,11 @@
// away and will cause VM initialization failures!
warning("-XX:+UseVMInterruptibleIO is obsolete and will be removed in a future release.");
FLAG_SET_CMDLINE(bool, UseVMInterruptibleIO, true);
+#if !INCLUDE_MANAGEMENT
+ } else if (match_option(option, "-XX:+ManagementServer", &tail)) {
+ vm_exit_during_initialization(
+ "ManagementServer is not supported in this VM.", NULL);
+#endif // INCLUDE_MANAGEMENT
} else if (match_option(option, "-XX:", &tail)) { // -XX:xxxx
// Skip -XX:Flags= since that case has already been handled
if (strncmp(tail, "Flags=", strlen("Flags=")) != 0) {
@@ -3072,6 +3059,27 @@
} \
} while(0)
+
+#define UNSUPPORTED_GC_OPTION(gc) \
+do { \
+ if (gc) { \
+ if (FLAG_IS_CMDLINE(gc)) { \
+ warning(#gc " is not supported in this VM. Using Serial GC."); \
+ } \
+ FLAG_SET_DEFAULT(gc, false); \
+ } \
+} while(0)
+
+static void force_serial_gc() {
+ FLAG_SET_DEFAULT(UseSerialGC, true);
+ FLAG_SET_DEFAULT(CMSIncrementalMode, false); // special CMS suboption
+ UNSUPPORTED_GC_OPTION(UseG1GC);
+ UNSUPPORTED_GC_OPTION(UseParallelGC);
+ UNSUPPORTED_GC_OPTION(UseParallelOldGC);
+ UNSUPPORTED_GC_OPTION(UseConcMarkSweepGC);
+ UNSUPPORTED_GC_OPTION(UseParNewGC);
+}
+
// Parse entry point called from JNI_CreateJavaVM
jint Arguments::parse(const JavaVMInitArgs* args) {
@@ -3187,28 +3195,15 @@
hotspotrc, hotspotrc);
}
-#if (defined JAVASE_EMBEDDED || defined ARM)
- UNSUPPORTED_OPTION(UseG1GC, "G1 GC");
-#endif
-
#ifdef _ALLBSD_SOURCE // UseLargePages is not yet supported on BSD.
UNSUPPORTED_OPTION(UseLargePages, "-XX:+UseLargePages");
#endif
-#if !INCLUDE_ALL_GCS
- if (UseParallelGC) {
- warning("Parallel GC is not supported in this VM. Using Serial GC.");
- }
- if (UseParallelOldGC) {
- warning("Parallel Old GC is not supported in this VM. Using Serial GC.");
- }
- if (UseConcMarkSweepGC) {
- warning("Concurrent Mark Sweep GC is not supported in this VM. Using Serial GC.");
- }
- if (UseParNewGC) {
- warning("Par New GC is not supported in this VM. Using Serial GC.");
- }
-#endif // INCLUDE_ALL_GCS
+#if INCLUDE_ALL_GCS
+ #if (defined JAVASE_EMBEDDED || defined ARM)
+ UNSUPPORTED_OPTION(UseG1GC, "G1 GC");
+ #endif
+#endif
#ifndef PRODUCT
if (TraceBytecodesAt != 0) {
--- a/hotspot/src/share/vm/runtime/atomic.hpp Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/src/share/vm/runtime/atomic.hpp Tue Mar 05 11:49:33 2013 -0800
@@ -29,10 +29,17 @@
class Atomic : AllStatic {
public:
+ // Atomic operations on jlong types are not available on all 32-bit
+ // platforms. If atomic ops on jlongs are defined here they must only
+ // be used from code that verifies they are available at runtime and
+ // can provide an alternative action if not - see supports_cx8() for
+ // a means to test availability.
+
// Atomically store to a location
inline static void store (jbyte store_value, jbyte* dest);
inline static void store (jshort store_value, jshort* dest);
inline static void store (jint store_value, jint* dest);
+ // See comment above about using jlong atomics on 32-bit platforms
inline static void store (jlong store_value, jlong* dest);
inline static void store_ptr(intptr_t store_value, intptr_t* dest);
inline static void store_ptr(void* store_value, void* dest);
@@ -40,17 +47,19 @@
inline static void store (jbyte store_value, volatile jbyte* dest);
inline static void store (jshort store_value, volatile jshort* dest);
inline static void store (jint store_value, volatile jint* dest);
+ // See comment above about using jlong atomics on 32-bit platforms
inline static void store (jlong store_value, volatile jlong* dest);
inline static void store_ptr(intptr_t store_value, volatile intptr_t* dest);
inline static void store_ptr(void* store_value, volatile void* dest);
+ // See comment above about using jlong atomics on 32-bit platforms
inline static jlong load(volatile jlong* src);
// Atomically add to a location, return updated value
inline static jint add (jint add_value, volatile jint* dest);
inline static intptr_t add_ptr(intptr_t add_value, volatile intptr_t* dest);
inline static void* add_ptr(intptr_t add_value, volatile void* dest);
-
+ // See comment above about using jlong atomics on 32-bit platforms
static jlong add (jlong add_value, volatile jlong* dest);
// Atomically increment location
@@ -75,6 +84,7 @@
// barrier across the cmpxchg. I.e., it's really a 'fence_cmpxchg_acquire'.
static jbyte cmpxchg (jbyte exchange_value, volatile jbyte* dest, jbyte compare_value);
inline static jint cmpxchg (jint exchange_value, volatile jint* dest, jint compare_value);
+ // See comment above about using jlong atomics on 32-bit platforms
inline static jlong cmpxchg (jlong exchange_value, volatile jlong* dest, jlong compare_value);
static unsigned int cmpxchg(unsigned int exchange_value,
--- a/hotspot/src/share/vm/runtime/vmStructs.cpp Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/src/share/vm/runtime/vmStructs.cpp Tue Mar 05 11:49:33 2013 -0800
@@ -2109,8 +2109,6 @@
/* Useful globals */ \
/******************/ \
\
- declare_constant(UseTLAB) \
- declare_constant(EnableInvokeDynamic) \
\
/**************/ \
/* Stack bias */ \
--- a/hotspot/src/share/vm/services/memSnapshot.cpp Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/src/share/vm/services/memSnapshot.cpp Tue Mar 05 11:49:33 2013 -0800
@@ -528,7 +528,8 @@
// an arena record can be followed by a size record, we need to remove both
if (matched_rec->is_arena_record()) {
MemPointerRecord* next = (MemPointerRecord*)malloc_snapshot_itr.peek_next();
- if (next->is_arena_memory_record() && next->is_memory_record_of_arena(matched_rec)) {
+ if (next != NULL && next->is_arena_memory_record() &&
+ next->is_memory_record_of_arena(matched_rec)) {
malloc_snapshot_itr.remove();
}
}
--- a/hotspot/src/share/vm/utilities/constantTag.cpp Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/src/share/vm/utilities/constantTag.cpp Tue Mar 05 11:49:33 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -52,7 +52,6 @@
case JVM_CONSTANT_StringIndex :
case JVM_CONSTANT_MethodHandle :
case JVM_CONSTANT_MethodType :
- case JVM_CONSTANT_Object :
return T_OBJECT;
default:
ShouldNotReachHere();
@@ -96,8 +95,6 @@
return "MethodType Error";
case JVM_CONSTANT_InvokeDynamic :
return "InvokeDynamic";
- case JVM_CONSTANT_Object :
- return "Object";
case JVM_CONSTANT_Utf8 :
return "Utf8";
case JVM_CONSTANT_UnresolvedClass :
--- a/hotspot/src/share/vm/utilities/constantTag.hpp Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/src/share/vm/utilities/constantTag.hpp Tue Mar 05 11:49:33 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -43,8 +43,7 @@
JVM_CONSTANT_UnresolvedClassInError = 103, // Error tag due to resolution error
JVM_CONSTANT_MethodHandleInError = 104, // Error tag due to resolution error
JVM_CONSTANT_MethodTypeInError = 105, // Error tag due to resolution error
- JVM_CONSTANT_Object = 106, // Required for BoundMethodHandle arguments.
- JVM_CONSTANT_InternalMax = 106 // Last implementation tag
+ JVM_CONSTANT_InternalMax = 105 // Last implementation tag
};
@@ -84,8 +83,6 @@
bool is_klass_index() const { return _tag == JVM_CONSTANT_ClassIndex; }
bool is_string_index() const { return _tag == JVM_CONSTANT_StringIndex; }
- bool is_object() const { return _tag == JVM_CONSTANT_Object; }
-
bool is_klass_reference() const { return is_klass_index() || is_unresolved_klass(); }
bool is_klass_or_reference() const{ return is_klass() || is_klass_reference(); }
bool is_field_or_method() const { return is_field() || is_method() || is_interface_method(); }
@@ -98,7 +95,7 @@
bool is_loadable_constant() const {
return ((_tag >= JVM_CONSTANT_Integer && _tag <= JVM_CONSTANT_String) ||
is_method_type() || is_method_handle() ||
- is_unresolved_klass() || is_object());
+ is_unresolved_klass());
}
constantTag() {
--- a/hotspot/src/share/vm/utilities/debug.cpp Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/src/share/vm/utilities/debug.cpp Tue Mar 05 11:49:33 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -228,28 +228,16 @@
report_vm_error(file, line, "fatal error", message);
}
-// Used by report_vm_out_of_memory to detect recursion.
-static jint _exiting_out_of_mem = 0;
-
void report_vm_out_of_memory(const char* file, int line, size_t size,
const char* message) {
if (Debugging) return;
- // We try to gather additional information for the first out of memory
- // error only; gathering additional data might cause an allocation and a
- // recursive out_of_memory condition.
-
- const jint exiting = 1;
- // If we succeed in changing the value, we're the first one in.
- bool first_time_here = Atomic::xchg(exiting, &_exiting_out_of_mem) != exiting;
+ Thread* thread = ThreadLocalStorage::get_thread_slow();
+ VMError(thread, file, line, size, message).report_and_die();
- if (first_time_here) {
- Thread* thread = ThreadLocalStorage::get_thread_slow();
- VMError(thread, file, line, size, message).report_and_die();
- }
-
- // Dump core and abort
- vm_abort(true);
+ // The UseOSErrorReporting option in report_and_die() may allow a return
+ // to here. If so then we'll have to figure out how to handle it.
+ guarantee(false, "report_and_die() should not return here");
}
void report_should_not_call(const char* file, int line) {
--- a/hotspot/src/share/vm/utilities/ostream.cpp Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/src/share/vm/utilities/ostream.cpp Tue Mar 05 11:49:33 2013 -0800
@@ -431,7 +431,7 @@
rotatingFileStream::rotatingFileStream(const char* file_name) {
_cur_file_num = 0;
- _bytes_writen = 0L;
+ _bytes_written = 0L;
_file_name = NEW_C_HEAP_ARRAY(char, strlen(file_name)+10, mtInternal);
jio_snprintf(_file_name, strlen(file_name)+10, "%s.%d", file_name, _cur_file_num);
_file = fopen(_file_name, "w");
@@ -440,7 +440,7 @@
rotatingFileStream::rotatingFileStream(const char* file_name, const char* opentype) {
_cur_file_num = 0;
- _bytes_writen = 0L;
+ _bytes_written = 0L;
_file_name = NEW_C_HEAP_ARRAY(char, strlen(file_name)+10, mtInternal);
jio_snprintf(_file_name, strlen(file_name)+10, "%s.%d", file_name, _cur_file_num);
_file = fopen(_file_name, opentype);
@@ -448,10 +448,9 @@
}
void rotatingFileStream::write(const char* s, size_t len) {
- if (_file != NULL) {
- // Make an unused local variable to avoid warning from gcc 4.x compiler.
+ if (_file != NULL) {
size_t count = fwrite(s, 1, len, _file);
- Atomic::add((jlong)count, &_bytes_writen);
+ _bytes_written += count;
}
update_position(s, len);
}
@@ -465,7 +464,10 @@
// concurrent GC threads to run parallel with VMThread at safepoint, write and rotate_log
// must be synchronized.
void rotatingFileStream::rotate_log() {
- if (_bytes_writen < (jlong)GCLogFileSize) return;
+ if (_bytes_written < (jlong)GCLogFileSize) {
+ return;
+ }
+
#ifdef ASSERT
Thread *thread = Thread::current();
assert(thread == NULL ||
@@ -475,7 +477,7 @@
if (NumberOfGCLogFiles == 1) {
// rotate in same file
rewind();
- _bytes_writen = 0L;
+ _bytes_written = 0L;
return;
}
@@ -491,7 +493,7 @@
}
_file = fopen(_file_name, "w");
if (_file != NULL) {
- _bytes_writen = 0L;
+ _bytes_written = 0L;
_need_close = true;
} else {
tty->print_cr("failed to open rotation log file %s due to %s\n",
--- a/hotspot/src/share/vm/utilities/ostream.hpp Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/src/share/vm/utilities/ostream.hpp Tue Mar 05 11:49:33 2013 -0800
@@ -231,7 +231,7 @@
class rotatingFileStream : public fileStream {
protected:
char* _file_name;
- jlong _bytes_writen;
+ jlong _bytes_written;
uintx _cur_file_num; // current logfile rotation number, from 0 to MaxGCLogFileNumbers-1
public:
rotatingFileStream(const char* file_name);
--- a/hotspot/src/share/vm/utilities/yieldingWorkgroup.cpp Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/src/share/vm/utilities/yieldingWorkgroup.cpp Tue Mar 05 11:49:33 2013 -0800
@@ -24,9 +24,7 @@
#include "precompiled.hpp"
#include "utilities/macros.hpp"
-#if INCLUDE_ALL_GCS
#include "utilities/yieldingWorkgroup.hpp"
-#endif // INCLUDE_ALL_GCS
// Forward declaration of classes declared here.
--- a/hotspot/test/TEST.ROOT Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/test/TEST.ROOT Tue Mar 05 11:49:33 2013 -0800
@@ -28,4 +28,4 @@
# DO NOT EDIT without first contacting hotspot-regtest@sun.com
# The list of keywords supported in this test suite
-keys=cte_test jcmd nmt regression
+keys=cte_test jcmd nmt regression gc
--- a/hotspot/test/compiler/5091921/Test6850611.java Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/test/compiler/5091921/Test6850611.java Tue Mar 05 11:49:33 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, 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
@@ -27,7 +27,7 @@
* @bug 6850611
* @summary int / long arithmetic seems to be broken in 1.6.0_14 HotSpot Server VM (Win XP)
*
- * @run main Test6850611
+ * @run main/timeout=480 Test6850611
*/
public class Test6850611 {
--- a/hotspot/test/compiler/5091921/Test6890943.java Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/test/compiler/5091921/Test6890943.java Tue Mar 05 11:49:33 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, 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
@@ -27,7 +27,7 @@
* @bug 6890943
* @summary JVM mysteriously gives wrong result on 64-bit 1.6 VMs in hotspot mode.
*
- * @run shell Test6890943.sh
+ * @run shell/timeout=240 Test6890943.sh
*/
import java.util.*;
import java.io.*;
--- a/hotspot/test/compiler/5091921/Test6890943.sh Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/test/compiler/5091921/Test6890943.sh Tue Mar 05 11:49:33 2013 -0800
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, 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
@@ -52,7 +52,10 @@
${TESTJAVA}/bin/javac -d . Test6890943.java
-${TESTJAVA}/bin/java -XX:-PrintVMOptions ${TESTVMOPTS} Test6890943 < input6890943.txt > test.out 2>&1
+${TESTJAVA}/bin/java -XX:-PrintVMOptions -XX:+IgnoreUnrecognizedVMOptions ${TESTVMOPTS} Test6890943 < input6890943.txt > pretest.out 2>&1
+
+# This test sometimes tickles an unrelated performance warning that interferes with diff.
+grep -v 'warning: Performance bug: SystemDictionary' pretest.out > test.out
diff output6890943.txt test.out
--- a/hotspot/test/compiler/5091921/Test6905845.java Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/test/compiler/5091921/Test6905845.java Tue Mar 05 11:49:33 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, 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
@@ -27,7 +27,7 @@
* @bug 6905845
* @summary Server VM improperly optimizing away loop.
*
- * @run main Test6905845
+ * @run main/timeout=480 Test6905845
*/
public class Test6905845 {
--- a/hotspot/test/compiler/5091921/Test6992759.java Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/test/compiler/5091921/Test6992759.java Tue Mar 05 11:49:33 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, 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
@@ -27,7 +27,7 @@
* @bug 6992759
* @summary Bad code generated for integer <= comparison, fails for Integer.MAX_VALUE
*
- * @run main Test6992759
+ * @run main/timeout=240 Test6992759
*/
public class Test6992759 {
--- a/hotspot/test/compiler/6852078/Test6852078.java Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/test/compiler/6852078/Test6852078.java Tue Mar 05 11:49:33 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2013, 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
@@ -27,7 +27,7 @@
* @bug 6852078
* @summary Disable SuperWord optimization for unsafe read/write
*
- * @run main/othervm Test6852078
+ * @run main Test6852078
*/
import java.util.*;
@@ -50,7 +50,11 @@
}
public static void main(String [] args) {
+ long start = System.currentTimeMillis();
for (int i=0; i<2000; i++) {
+ // To protect slow systems from test-too-long timeouts
+ if ((i > 100) && ((System.currentTimeMillis() - start) > 100000))
+ break;
Test6852078 t = new Test6852078(args);
}
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/8004867/TestIntAtomicCAS.java Tue Mar 05 11:49:33 2013 -0800
@@ -0,0 +1,969 @@
+/*
+ * Copyright (c) 2013, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/**
+ * @test
+ * @bug 8004867
+ * @summary VM crashing with assert "share/vm/opto/node.hpp:357 - assert(i < _max) failed: oob"
+ *
+ * @run main/othervm/timeout=300 -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation -XX:-OptimizeFill TestIntAtomicCAS
+ * @run main/othervm/timeout=300 -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation -XX:+OptimizeFill TestIntAtomicCAS
+ */
+
+import java.util.concurrent.atomic.AtomicIntegerArray;
+
+public class TestIntAtomicCAS {
+ private static final int ARRLEN = 97;
+ private static final int ITERS = 11000;
+ private static final int OFFSET = 3;
+ private static final int SCALE = 2;
+ private static final int ALIGN_OFF = 8;
+ private static final int UNALIGN_OFF = 5;
+
+ public static void main(String args[]) {
+ System.out.println("Testing Integer array atomic CAS operations");
+ int errn = test(false);
+ if (errn > 0) {
+ System.err.println("FAILED: " + errn + " errors");
+ System.exit(97);
+ }
+ System.out.println("PASSED");
+ }
+
+ static int test(boolean test_only) {
+ AtomicIntegerArray a1 = new AtomicIntegerArray(ARRLEN);
+ AtomicIntegerArray a2 = new AtomicIntegerArray(ARRLEN);
+ // Initialize
+ for (int i=0; i<ARRLEN; i++) {
+ a1.set(i, -1);
+ a2.set(i, -1);
+ }
+ System.out.println("Warmup");
+ for (int i=0; i<ITERS; i++) {
+ test_ci(a1);
+ test_vi(a2, 123, -1);
+ test_cp(a1, a2);
+ test_2ci(a1, a2);
+ test_2vi(a1, a2, 123, 103);
+ test_ci_neg(a1, 123);
+ test_vi_neg(a2, 123, 103);
+ test_cp_neg(a1, a2);
+ test_2ci_neg(a1, a2);
+ test_2vi_neg(a1, a2, 123, 103);
+ test_ci_oppos(a1, 123);
+ test_vi_oppos(a2, 123, 103);
+ test_cp_oppos(a1, a2);
+ test_2ci_oppos(a1, a2);
+ test_2vi_oppos(a1, a2, 123, 103);
+ test_ci_off(a1, 123);
+ test_vi_off(a2, 123, 103);
+ test_cp_off(a1, a2);
+ test_2ci_off(a1, a2);
+ test_2vi_off(a1, a2, 123, 103);
+ test_ci_inv(a1, OFFSET, 123);
+ test_vi_inv(a2, 123, OFFSET, 103);
+ test_cp_inv(a1, a2, OFFSET);
+ test_2ci_inv(a1, a2, OFFSET);
+ test_2vi_inv(a1, a2, 123, 103, OFFSET);
+ test_ci_scl(a1, 123);
+ test_vi_scl(a2, 123, 103);
+ test_cp_scl(a1, a2);
+ test_2ci_scl(a1, a2);
+ test_2vi_scl(a1, a2, 123, 103);
+ test_cp_alndst(a1, a2);
+ test_cp_alnsrc(a1, a2);
+ test_2ci_aln(a1, a2);
+ test_2vi_aln(a1, a2, 123, 103);
+ test_cp_unalndst(a1, a2);
+ test_cp_unalnsrc(a1, a2);
+ test_2ci_unaln(a1, a2);
+ test_2vi_unaln(a1, a2, 123, 103);
+ }
+ // Initialize
+ for (int i=0; i<ARRLEN; i++) {
+ a1.set(i, -1);
+ a2.set(i, -1);
+ }
+ // Test and verify results
+ System.out.println("Verification");
+ int errn = 0;
+ {
+ test_ci(a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_ci: a1", i, a1.get(i), -123);
+ }
+ test_vi(a2, 123, -1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_vi: a2", i, a2.get(i), 123);
+ }
+ test_cp(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_cp: a1", i, a1.get(i), 123);
+ }
+ test_2ci(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_2ci: a1", i, a1.get(i), -123);
+ errn += verify("test_2ci: a2", i, a2.get(i), -103);
+ }
+ test_2vi(a1, a2, 123, 103);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_2vi: a1", i, a1.get(i), 123);
+ errn += verify("test_2vi: a2", i, a2.get(i), 103);
+ }
+ // Reset for negative stride
+ for (int i=0; i<ARRLEN; i++) {
+ a1.set(i, -1);
+ a2.set(i, -1);
+ }
+ test_ci_neg(a1, -1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_ci_neg: a1", i, a1.get(i), -123);
+ }
+ test_vi_neg(a2, 123, -1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_vi_neg: a2", i, a2.get(i), 123);
+ }
+ test_cp_neg(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_cp_neg: a1", i, a1.get(i), 123);
+ }
+ test_2ci_neg(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_2ci_neg: a1", i, a1.get(i), -123);
+ errn += verify("test_2ci_neg: a2", i, a2.get(i), -103);
+ }
+ test_2vi_neg(a1, a2, 123, 103);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_2vi_neg: a1", i, a1.get(i), 123);
+ errn += verify("test_2vi_neg: a2", i, a2.get(i), 103);
+ }
+ // Reset for opposite stride
+ for (int i=0; i<ARRLEN; i++) {
+ a1.set(i, -1);
+ a2.set(i, -1);
+ }
+ test_ci_oppos(a1, -1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_ci_oppos: a1", i, a1.get(i), -123);
+ }
+ test_vi_oppos(a2, 123, -1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_vi_oppos: a2", i, a2.get(i), 123);
+ }
+ test_cp_oppos(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_cp_oppos: a1", i, a1.get(i), 123);
+ }
+ test_2ci_oppos(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_2ci_oppos: a1", i, a1.get(i), -123);
+ errn += verify("test_2ci_oppos: a2", i, a2.get(i), -103);
+ }
+ test_2vi_oppos(a1, a2, 123, 103);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_2vi_oppos: a1", i, a1.get(i), 123);
+ errn += verify("test_2vi_oppos: a2", i, a2.get(i), 103);
+ }
+ // Reset for indexing with offset
+ for (int i=0; i<ARRLEN; i++) {
+ a1.set(i, -1);
+ a2.set(i, -1);
+ }
+ test_ci_off(a1, -1);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_ci_off: a1", i, a1.get(i), -123);
+ }
+ test_vi_off(a2, 123, -1);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_vi_off: a2", i, a2.get(i), 123);
+ }
+ test_cp_off(a1, a2);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_cp_off: a1", i, a1.get(i), 123);
+ }
+ test_2ci_off(a1, a2);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_2ci_off: a1", i, a1.get(i), -123);
+ errn += verify("test_2ci_off: a2", i, a2.get(i), -103);
+ }
+ test_2vi_off(a1, a2, 123, 103);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_2vi_off: a1", i, a1.get(i), 123);
+ errn += verify("test_2vi_off: a2", i, a2.get(i), 103);
+ }
+ for (int i=0; i<OFFSET; i++) {
+ errn += verify("test_2vi_off: a1", i, a1.get(i), -1);
+ errn += verify("test_2vi_off: a2", i, a2.get(i), -1);
+ }
+ // Reset for indexing with invariant offset
+ for (int i=0; i<ARRLEN; i++) {
+ a1.set(i, -1);
+ a2.set(i, -1);
+ }
+ test_ci_inv(a1, OFFSET, -1);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_ci_inv: a1", i, a1.get(i), -123);
+ }
+ test_vi_inv(a2, 123, OFFSET, -1);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_vi_inv: a2", i, a2.get(i), 123);
+ }
+ test_cp_inv(a1, a2, OFFSET);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_cp_inv: a1", i, a1.get(i), 123);
+ }
+ test_2ci_inv(a1, a2, OFFSET);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_2ci_inv: a1", i, a1.get(i), -123);
+ errn += verify("test_2ci_inv: a2", i, a2.get(i), -103);
+ }
+ test_2vi_inv(a1, a2, 123, 103, OFFSET);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_2vi_inv: a1", i, a1.get(i), 123);
+ errn += verify("test_2vi_inv: a2", i, a2.get(i), 103);
+ }
+ for (int i=0; i<OFFSET; i++) {
+ errn += verify("test_2vi_inv: a1", i, a1.get(i), -1);
+ errn += verify("test_2vi_inv: a2", i, a2.get(i), -1);
+ }
+ // Reset for indexing with scale
+ for (int i=0; i<ARRLEN; i++) {
+ a1.set(i, -1);
+ a2.set(i, -1);
+ }
+ test_ci_scl(a1, -1);
+ for (int i=0; i<ARRLEN; i++) {
+ int val = (i%SCALE != 0) ? -1 : -123;
+ errn += verify("test_ci_scl: a1", i, a1.get(i), val);
+ }
+ test_vi_scl(a2, 123, -1);
+ for (int i=0; i<ARRLEN; i++) {
+ int val = (i%SCALE != 0) ? -1 : 123;
+ errn += verify("test_vi_scl: a2", i, a2.get(i), val);
+ }
+ test_cp_scl(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ int val = (i%SCALE != 0) ? -1 : 123;
+ errn += verify("test_cp_scl: a1", i, a1.get(i), val);
+ }
+ test_2ci_scl(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ if (i%SCALE != 0) {
+ errn += verify("test_2ci_scl: a1", i, a1.get(i), -1);
+ } else if (i*SCALE < ARRLEN) {
+ errn += verify("test_2ci_scl: a1", i*SCALE, a1.get(i*SCALE), -123);
+ }
+ if (i%SCALE != 0) {
+ errn += verify("test_2ci_scl: a2", i, a2.get(i), -1);
+ } else if (i*SCALE < ARRLEN) {
+ errn += verify("test_2ci_scl: a2", i*SCALE, a2.get(i*SCALE), -103);
+ }
+ }
+ test_2vi_scl(a1, a2, 123, 103);
+ for (int i=0; i<ARRLEN; i++) {
+ if (i%SCALE != 0) {
+ errn += verify("test_2vi_scl: a1", i, a1.get(i), -1);
+ } else if (i*SCALE < ARRLEN) {
+ errn += verify("test_2vi_scl: a1", i*SCALE, a1.get(i*SCALE), 123);
+ }
+ if (i%SCALE != 0) {
+ errn += verify("test_2vi_scl: a2", i, a2.get(i), -1);
+ } else if (i*SCALE < ARRLEN) {
+ errn += verify("test_2vi_scl: a2", i*SCALE, a2.get(i*SCALE), 103);
+ }
+ }
+ // Reset for 2 arrays with relative aligned offset
+ for (int i=0; i<ARRLEN; i++) {
+ a1.set(i, -1);
+ a2.set(i, -1);
+ }
+ test_vi(a2, 123, -1);
+ test_cp_alndst(a1, a2);
+ for (int i=0; i<ALIGN_OFF; i++) {
+ errn += verify("test_cp_alndst: a1", i, a1.get(i), -1);
+ }
+ for (int i=ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_cp_alndst: a1", i, a1.get(i), 123);
+ }
+ for (int i=0; i<ALIGN_OFF; i++) {
+ a1.set(i, 123);
+ }
+ test_vi(a2, -123, 123);
+ test_cp_alnsrc(a1, a2);
+ for (int i=0; i<ARRLEN-ALIGN_OFF; i++) {
+ errn += verify("test_cp_alnsrc: a1", i, a1.get(i), -123);
+ }
+ for (int i=ARRLEN-ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_cp_alnsrc: a1", i, a1.get(i), 123);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1.set(i, -1);
+ a2.set(i, -1);
+ }
+ test_2ci_aln(a1, a2);
+ for (int i=0; i<ALIGN_OFF; i++) {
+ errn += verify("test_2ci_aln: a1", i, a1.get(i), -1);
+ }
+ for (int i=ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2ci_aln: a1", i, a1.get(i), -123);
+ }
+ for (int i=0; i<ARRLEN-ALIGN_OFF; i++) {
+ errn += verify("test_2ci_aln: a2", i, a2.get(i), -103);
+ }
+ for (int i=ARRLEN-ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2ci_aln: a2", i, a2.get(i), -1);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1.set(i, -1);
+ a2.set(i, -1);
+ }
+ test_2vi_aln(a1, a2, 123, 103);
+ for (int i=0; i<ARRLEN-ALIGN_OFF; i++) {
+ errn += verify("test_2vi_aln: a1", i, a1.get(i), 123);
+ }
+ for (int i=ARRLEN-ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2vi_aln: a1", i, a1.get(i), -1);
+ }
+ for (int i=0; i<ALIGN_OFF; i++) {
+ errn += verify("test_2vi_aln: a2", i, a2.get(i), -1);
+ }
+ for (int i=ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2vi_aln: a2", i, a2.get(i), 103);
+ }
+
+ // Reset for 2 arrays with relative unaligned offset
+ for (int i=0; i<ARRLEN; i++) {
+ a1.set(i, -1);
+ a2.set(i, -1);
+ }
+ test_vi(a2, 123, -1);
+ test_cp_unalndst(a1, a2);
+ for (int i=0; i<UNALIGN_OFF; i++) {
+ errn += verify("test_cp_unalndst: a1", i, a1.get(i), -1);
+ }
+ for (int i=UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_cp_unalndst: a1", i, a1.get(i), 123);
+ }
+ test_vi(a2, -123, 123);
+ test_cp_unalnsrc(a1, a2);
+ for (int i=0; i<ARRLEN-UNALIGN_OFF; i++) {
+ errn += verify("test_cp_unalnsrc: a1", i, a1.get(i), -123);
+ }
+ for (int i=ARRLEN-UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_cp_unalnsrc: a1", i, a1.get(i), 123);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1.set(i, -1);
+ a2.set(i, -1);
+ }
+ test_2ci_unaln(a1, a2);
+ for (int i=0; i<UNALIGN_OFF; i++) {
+ errn += verify("test_2ci_unaln: a1", i, a1.get(i), -1);
+ }
+ for (int i=UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2ci_unaln: a1", i, a1.get(i), -123);
+ }
+ for (int i=0; i<ARRLEN-UNALIGN_OFF; i++) {
+ errn += verify("test_2ci_unaln: a2", i, a2.get(i), -103);
+ }
+ for (int i=ARRLEN-UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2ci_unaln: a2", i, a2.get(i), -1);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1.set(i, -1);
+ a2.set(i, -1);
+ }
+ test_2vi_unaln(a1, a2, 123, 103);
+ for (int i=0; i<ARRLEN-UNALIGN_OFF; i++) {
+ errn += verify("test_2vi_unaln: a1", i, a1.get(i), 123);
+ }
+ for (int i=ARRLEN-UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2vi_unaln: a1", i, a1.get(i), -1);
+ }
+ for (int i=0; i<UNALIGN_OFF; i++) {
+ errn += verify("test_2vi_unaln: a2", i, a2.get(i), -1);
+ }
+ for (int i=UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2vi_unaln: a2", i, a2.get(i), 103);
+ }
+
+ // Reset for aligned overlap initialization
+ for (int i=0; i<ALIGN_OFF; i++) {
+ a1.set(i, i);
+ }
+ for (int i=ALIGN_OFF; i<ARRLEN; i++) {
+ a1.set(i, -1);
+ }
+ test_cp_alndst(a1, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ int v = i%ALIGN_OFF;
+ errn += verify("test_cp_alndst_overlap: a1", i, a1.get(i), v);
+ }
+ for (int i=0; i<ALIGN_OFF; i++) {
+ a1.set((i+ALIGN_OFF), -1);
+ }
+ test_cp_alnsrc(a1, a1);
+ for (int i=0; i<ALIGN_OFF; i++) {
+ errn += verify("test_cp_alnsrc_overlap: a1", i, a1.get(i), -1);
+ }
+ for (int i=ALIGN_OFF; i<ARRLEN; i++) {
+ int v = i%ALIGN_OFF;
+ errn += verify("test_cp_alnsrc_overlap: a1", i, a1.get(i), v);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1.set(i, -1);
+ }
+ test_2ci_aln(a1, a1);
+ for (int i=0; i<ARRLEN-ALIGN_OFF; i++) {
+ errn += verify("test_2ci_aln_overlap: a1", i, a1.get(i), -103);
+ }
+ for (int i=ARRLEN-ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2ci_aln_overlap: a1", i, a1.get(i), -123);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1.set(i, -1);
+ }
+ test_2vi_aln(a1, a1, 123, 103);
+ for (int i=0; i<ARRLEN-ALIGN_OFF; i++) {
+ errn += verify("test_2vi_aln_overlap: a1", i, a1.get(i), 123);
+ }
+ for (int i=ARRLEN-ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2vi_aln_overlap: a1", i, a1.get(i), 103);
+ }
+
+ // Reset for unaligned overlap initialization
+ for (int i=0; i<UNALIGN_OFF; i++) {
+ a1.set(i, i);
+ }
+ for (int i=UNALIGN_OFF; i<ARRLEN; i++) {
+ a1.set(i, -1);
+ }
+ test_cp_unalndst(a1, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ int v = i%UNALIGN_OFF;
+ errn += verify("test_cp_unalndst_overlap: a1", i, a1.get(i), v);
+ }
+ for (int i=0; i<UNALIGN_OFF; i++) {
+ a1.set((i+UNALIGN_OFF), -1);
+ }
+ test_cp_unalnsrc(a1, a1);
+ for (int i=0; i<UNALIGN_OFF; i++) {
+ errn += verify("test_cp_unalnsrc_overlap: a1", i, a1.get(i), -1);
+ }
+ for (int i=UNALIGN_OFF; i<ARRLEN; i++) {
+ int v = i%UNALIGN_OFF;
+ errn += verify("test_cp_unalnsrc_overlap: a1", i, a1.get(i), v);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1.set(i, -1);
+ }
+ test_2ci_unaln(a1, a1);
+ for (int i=0; i<ARRLEN-UNALIGN_OFF; i++) {
+ errn += verify("test_2ci_unaln_overlap: a1", i, a1.get(i), -103);
+ }
+ for (int i=ARRLEN-UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2ci_unaln_overlap: a1", i, a1.get(i), -123);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1.set(i, -1);
+ }
+ test_2vi_unaln(a1, a1, 123, 103);
+ for (int i=0; i<ARRLEN-UNALIGN_OFF; i++) {
+ errn += verify("test_2vi_unaln_overlap: a1", i, a1.get(i), 123);
+ }
+ for (int i=ARRLEN-UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2vi_unaln_overlap: a1", i, a1.get(i), 103);
+ }
+
+ }
+
+ if (errn > 0 || test_only)
+ return errn;
+
+ // Initialize
+ for (int i=0; i<ARRLEN; i++) {
+ a1.set(i, -1);
+ a2.set(i, -1);
+ }
+ System.out.println("Time");
+ long start, end;
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_ci(a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_ci: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_vi(a2, 123, -1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_vi: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi(a1, a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_ci_neg(a1, 123);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_ci_neg: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_vi_neg(a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_vi_neg: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_neg(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_neg: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci_neg(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci_neg: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi_neg(a1, a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi_neg: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_ci_oppos(a1, 123);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_ci_oppos: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_vi_oppos(a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_vi_oppos: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_oppos(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_oppos: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci_oppos(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci_oppos: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi_oppos(a1, a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi_oppos: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_ci_off(a1, 123);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_ci_off: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_vi_off(a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_vi_off: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_off(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_off: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci_off(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci_off: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi_off(a1, a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi_off: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_ci_inv(a1, OFFSET, 123);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_ci_inv: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_vi_inv(a2, 123, OFFSET, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_vi_inv: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_inv(a1, a2, OFFSET);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_inv: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci_inv(a1, a2, OFFSET);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci_inv: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi_inv(a1, a2, 123, 103, OFFSET);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi_inv: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_ci_scl(a1, 123);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_ci_scl: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_vi_scl(a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_vi_scl: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_scl(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_scl: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci_scl(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci_scl: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi_scl(a1, a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi_scl: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_alndst(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_alndst: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_alnsrc(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_alnsrc: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci_aln(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci_aln: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi_aln(a1, a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi_aln: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_unalndst(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_unalndst: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_unalnsrc(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_unalnsrc: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci_unaln(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci_unaln: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi_unaln(a1, a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi_unaln: " + (end - start));
+
+ return errn;
+ }
+
+ static void test_ci(AtomicIntegerArray a) {
+ for (int i = 0; i < ARRLEN; i+=1) {
+ a.compareAndSet(i, -1, -123);
+ }
+ }
+ static void test_vi(AtomicIntegerArray a, int b, int old) {
+ for (int i = 0; i < ARRLEN; i+=1) {
+ a.compareAndSet(i, old, b);
+ }
+ }
+ static void test_cp(AtomicIntegerArray a, AtomicIntegerArray b) {
+ for (int i = 0; i < ARRLEN; i+=1) {
+ a.compareAndSet(i, -123, b.get(i));
+ }
+ }
+ static void test_2ci(AtomicIntegerArray a, AtomicIntegerArray b) {
+ for (int i = 0; i < ARRLEN; i+=1) {
+ a.compareAndSet(i, 123, -123);
+ b.compareAndSet(i, 123, -103);
+ }
+ }
+ static void test_2vi(AtomicIntegerArray a, AtomicIntegerArray b, int c, int d) {
+ for (int i = 0; i < ARRLEN; i+=1) {
+ a.compareAndSet(i, -123, c);
+ b.compareAndSet(i, -103, d);
+ }
+ }
+ static void test_ci_neg(AtomicIntegerArray a, int old) {
+ for (int i = ARRLEN-1; i >= 0; i-=1) {
+ a.compareAndSet(i, old, -123);
+ }
+ }
+ static void test_vi_neg(AtomicIntegerArray a, int b, int old) {
+ for (int i = ARRLEN-1; i >= 0; i-=1) {
+ a.compareAndSet(i, old, b);
+ }
+ }
+ static void test_cp_neg(AtomicIntegerArray a, AtomicIntegerArray b) {
+ for (int i = ARRLEN-1; i >= 0; i-=1) {
+ a.compareAndSet(i, -123, b.get(i));
+ }
+ }
+ static void test_2ci_neg(AtomicIntegerArray a, AtomicIntegerArray b) {
+ for (int i = ARRLEN-1; i >= 0; i-=1) {
+ a.compareAndSet(i, 123, -123);
+ b.compareAndSet(i, 123, -103);
+ }
+ }
+ static void test_2vi_neg(AtomicIntegerArray a, AtomicIntegerArray b, int c, int d) {
+ for (int i = ARRLEN-1; i >= 0; i-=1) {
+ a.compareAndSet(i, -123, c);
+ b.compareAndSet(i, -103, d);
+ }
+ }
+ static void test_ci_oppos(AtomicIntegerArray a, int old) {
+ int limit = ARRLEN-1;
+ for (int i = 0; i < ARRLEN; i+=1) {
+ a.compareAndSet((limit-i), old, -123);
+ }
+ }
+ static void test_vi_oppos(AtomicIntegerArray a, int b, int old) {
+ int limit = ARRLEN-1;
+ for (int i = limit; i >= 0; i-=1) {
+ a.compareAndSet((limit-i), old, b);
+ }
+ }
+ static void test_cp_oppos(AtomicIntegerArray a, AtomicIntegerArray b) {
+ int limit = ARRLEN-1;
+ for (int i = 0; i < ARRLEN; i+=1) {
+ a.compareAndSet(i, -123, b.get(limit-i));
+ }
+ }
+ static void test_2ci_oppos(AtomicIntegerArray a, AtomicIntegerArray b) {
+ int limit = ARRLEN-1;
+ for (int i = 0; i < ARRLEN; i+=1) {
+ a.compareAndSet((limit-i), 123, -123);
+ b.compareAndSet(i, 123, -103);
+ }
+ }
+ static void test_2vi_oppos(AtomicIntegerArray a, AtomicIntegerArray b, int c, int d) {
+ int limit = ARRLEN-1;
+ for (int i = limit; i >= 0; i-=1) {
+ a.compareAndSet(i, -123, c);
+ b.compareAndSet((limit-i), -103, d);
+ }
+ }
+ static void test_ci_off(AtomicIntegerArray a, int old) {
+ for (int i = 0; i < ARRLEN-OFFSET; i+=1) {
+ a.compareAndSet((i+OFFSET), old, -123);
+ }
+ }
+ static void test_vi_off(AtomicIntegerArray a, int b, int old) {
+ for (int i = 0; i < ARRLEN-OFFSET; i+=1) {
+ a.compareAndSet((i+OFFSET), old, b);
+ }
+ }
+ static void test_cp_off(AtomicIntegerArray a, AtomicIntegerArray b) {
+ for (int i = 0; i < ARRLEN-OFFSET; i+=1) {
+ a.compareAndSet((i+OFFSET), -123, b.get(i+OFFSET));
+ }
+ }
+ static void test_2ci_off(AtomicIntegerArray a, AtomicIntegerArray b) {
+ for (int i = 0; i < ARRLEN-OFFSET; i+=1) {
+ a.compareAndSet((i+OFFSET), 123, -123);
+ b.compareAndSet((i+OFFSET), 123, -103);
+ }
+ }
+ static void test_2vi_off(AtomicIntegerArray a, AtomicIntegerArray b, int c, int d) {
+ for (int i = 0; i < ARRLEN-OFFSET; i+=1) {
+ a.compareAndSet((i+OFFSET), -123, c);
+ b.compareAndSet((i+OFFSET), -103, d);
+ }
+ }
+ static void test_ci_inv(AtomicIntegerArray a, int k, int old) {
+ for (int i = 0; i < ARRLEN-k; i+=1) {
+ a.compareAndSet((i+k), old, -123);
+ }
+ }
+ static void test_vi_inv(AtomicIntegerArray a, int b, int k, int old) {
+ for (int i = 0; i < ARRLEN-k; i+=1) {
+ a.compareAndSet((i+k), old, b);
+ }
+ }
+ static void test_cp_inv(AtomicIntegerArray a, AtomicIntegerArray b, int k) {
+ for (int i = 0; i < ARRLEN-k; i+=1) {
+ a.compareAndSet((i+k), -123, b.get(i+k));
+ }
+ }
+ static void test_2ci_inv(AtomicIntegerArray a, AtomicIntegerArray b, int k) {
+ for (int i = 0; i < ARRLEN-k; i+=1) {
+ a.compareAndSet((i+k), 123, -123);
+ b.compareAndSet((i+k), 123, -103);
+ }
+ }
+ static void test_2vi_inv(AtomicIntegerArray a, AtomicIntegerArray b, int c, int d, int k) {
+ for (int i = 0; i < ARRLEN-k; i+=1) {
+ a.compareAndSet((i+k), -123, c);
+ b.compareAndSet((i+k), -103, d);
+ }
+ }
+ static void test_ci_scl(AtomicIntegerArray a, int old) {
+ for (int i = 0; i*SCALE < ARRLEN; i+=1) {
+ a.compareAndSet((i*SCALE), old, -123);
+ }
+ }
+ static void test_vi_scl(AtomicIntegerArray a, int b, int old) {
+ for (int i = 0; i*SCALE < ARRLEN; i+=1) {
+ a.compareAndSet((i*SCALE), old, b);
+ }
+ }
+ static void test_cp_scl(AtomicIntegerArray a, AtomicIntegerArray b) {
+ for (int i = 0; i*SCALE < ARRLEN; i+=1) {
+ a.compareAndSet((i*SCALE), -123, b.get(i*SCALE));
+ }
+ }
+ static void test_2ci_scl(AtomicIntegerArray a, AtomicIntegerArray b) {
+ for (int i = 0; i*SCALE < ARRLEN; i+=1) {
+ a.compareAndSet((i*SCALE), 123, -123);
+ b.compareAndSet((i*SCALE), 123, -103);
+ }
+ }
+ static void test_2vi_scl(AtomicIntegerArray a, AtomicIntegerArray b, int c, int d) {
+ for (int i = 0; i*SCALE < ARRLEN; i+=1) {
+ a.compareAndSet((i*SCALE), -123, c);
+ b.compareAndSet((i*SCALE), -103, d);
+ }
+ }
+ static void test_cp_alndst(AtomicIntegerArray a, AtomicIntegerArray b) {
+ for (int i = 0; i < ARRLEN-ALIGN_OFF; i+=1) {
+ a.compareAndSet((i+ALIGN_OFF), -1, b.get(i));
+ }
+ }
+ static void test_cp_alnsrc(AtomicIntegerArray a, AtomicIntegerArray b) {
+ for (int i = 0; i < ARRLEN-ALIGN_OFF; i+=1) {
+ a.getAndSet(i, b.get(i+ALIGN_OFF));
+ }
+ }
+ static void test_2ci_aln(AtomicIntegerArray a, AtomicIntegerArray b) {
+ for (int i = 0; i < ARRLEN-ALIGN_OFF; i+=1) {
+ a.compareAndSet((i+ALIGN_OFF), -1, -123);
+ b.getAndSet(i, -103);
+ }
+ }
+ static void test_2vi_aln(AtomicIntegerArray a, AtomicIntegerArray b, int c, int d) {
+ for (int i = 0; i < ARRLEN-ALIGN_OFF; i+=1) {
+ a.getAndSet(i, c);
+ b.getAndSet((i+ALIGN_OFF), d);
+ }
+ }
+ static void test_cp_unalndst(AtomicIntegerArray a, AtomicIntegerArray b) {
+ for (int i = 0; i < ARRLEN-UNALIGN_OFF; i+=1) {
+ a.compareAndSet((i+UNALIGN_OFF), -1, b.get(i));
+ }
+ }
+ static void test_cp_unalnsrc(AtomicIntegerArray a, AtomicIntegerArray b) {
+ for (int i = 0; i < ARRLEN-UNALIGN_OFF; i+=1) {
+ a.getAndSet(i, b.get(i+UNALIGN_OFF));
+ }
+ }
+ static void test_2ci_unaln(AtomicIntegerArray a, AtomicIntegerArray b) {
+ for (int i = 0; i < ARRLEN-UNALIGN_OFF; i+=1) {
+ a.compareAndSet((i+UNALIGN_OFF), -1, -123);
+ b.getAndSet(i, -103);
+ }
+ }
+ static void test_2vi_unaln(AtomicIntegerArray a, AtomicIntegerArray b, int c, int d) {
+ for (int i = 0; i < ARRLEN-UNALIGN_OFF; i+=1) {
+ a.getAndSet(i, c);
+ b.getAndSet((i+UNALIGN_OFF), d);
+ }
+ }
+
+ static int verify(String text, int i, int elem, int val) {
+ if (elem != val) {
+ System.err.println(text + "[" + i + "] = " + elem + " != " + val);
+ return 1;
+ }
+ return 0;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/8004867/TestIntAtomicOrdered.java Tue Mar 05 11:49:33 2013 -0800
@@ -0,0 +1,969 @@
+/*
+ * Copyright (c) 2013, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/**
+ * @test
+ * @bug 8004867
+ * @summary VM crashing with assert "share/vm/opto/node.hpp:357 - assert(i < _max) failed: oob"
+ *
+ * @run main/othervm/timeout=300 -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation -XX:-OptimizeFill TestIntAtomicOrdered
+ * @run main/othervm/timeout=300 -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation -XX:+OptimizeFill TestIntAtomicOrdered
+ */
+
+import java.util.concurrent.atomic.AtomicIntegerArray;
+
+public class TestIntAtomicOrdered {
+ private static final int ARRLEN = 97;
+ private static final int ITERS = 11000;
+ private static final int OFFSET = 3;
+ private static final int SCALE = 2;
+ private static final int ALIGN_OFF = 8;
+ private static final int UNALIGN_OFF = 5;
+
+ public static void main(String args[]) {
+ System.out.println("Testing Integer array atomic ordered operations");
+ int errn = test(false);
+ if (errn > 0) {
+ System.err.println("FAILED: " + errn + " errors");
+ System.exit(97);
+ }
+ System.out.println("PASSED");
+ }
+
+ static int test(boolean test_only) {
+ AtomicIntegerArray a1 = new AtomicIntegerArray(ARRLEN);
+ AtomicIntegerArray a2 = new AtomicIntegerArray(ARRLEN);
+ // Initialize
+ for (int i=0; i<ARRLEN; i++) {
+ a1.lazySet(i, -1);
+ a2.lazySet(i, -1);
+ }
+ System.out.println("Warmup");
+ for (int i=0; i<ITERS; i++) {
+ test_ci(a1);
+ test_vi(a2, 123, -1);
+ test_cp(a1, a2);
+ test_2ci(a1, a2);
+ test_2vi(a1, a2, 123, 103);
+ test_ci_neg(a1, 123);
+ test_vi_neg(a2, 123, 103);
+ test_cp_neg(a1, a2);
+ test_2ci_neg(a1, a2);
+ test_2vi_neg(a1, a2, 123, 103);
+ test_ci_oppos(a1, 123);
+ test_vi_oppos(a2, 123, 103);
+ test_cp_oppos(a1, a2);
+ test_2ci_oppos(a1, a2);
+ test_2vi_oppos(a1, a2, 123, 103);
+ test_ci_off(a1, 123);
+ test_vi_off(a2, 123, 103);
+ test_cp_off(a1, a2);
+ test_2ci_off(a1, a2);
+ test_2vi_off(a1, a2, 123, 103);
+ test_ci_inv(a1, OFFSET, 123);
+ test_vi_inv(a2, 123, OFFSET, 103);
+ test_cp_inv(a1, a2, OFFSET);
+ test_2ci_inv(a1, a2, OFFSET);
+ test_2vi_inv(a1, a2, 123, 103, OFFSET);
+ test_ci_scl(a1, 123);
+ test_vi_scl(a2, 123, 103);
+ test_cp_scl(a1, a2);
+ test_2ci_scl(a1, a2);
+ test_2vi_scl(a1, a2, 123, 103);
+ test_cp_alndst(a1, a2);
+ test_cp_alnsrc(a1, a2);
+ test_2ci_aln(a1, a2);
+ test_2vi_aln(a1, a2, 123, 103);
+ test_cp_unalndst(a1, a2);
+ test_cp_unalnsrc(a1, a2);
+ test_2ci_unaln(a1, a2);
+ test_2vi_unaln(a1, a2, 123, 103);
+ }
+ // Initialize
+ for (int i=0; i<ARRLEN; i++) {
+ a1.lazySet(i, -1);
+ a2.lazySet(i, -1);
+ }
+ // Test and verify results
+ System.out.println("Verification");
+ int errn = 0;
+ {
+ test_ci(a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_ci: a1", i, a1.get(i), -123);
+ }
+ test_vi(a2, 123, -1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_vi: a2", i, a2.get(i), 123);
+ }
+ test_cp(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_cp: a1", i, a1.get(i), 123);
+ }
+ test_2ci(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_2ci: a1", i, a1.get(i), -123);
+ errn += verify("test_2ci: a2", i, a2.get(i), -103);
+ }
+ test_2vi(a1, a2, 123, 103);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_2vi: a1", i, a1.get(i), 123);
+ errn += verify("test_2vi: a2", i, a2.get(i), 103);
+ }
+ // Reset for negative stride
+ for (int i=0; i<ARRLEN; i++) {
+ a1.lazySet(i, -1);
+ a2.lazySet(i, -1);
+ }
+ test_ci_neg(a1, -1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_ci_neg: a1", i, a1.get(i), -123);
+ }
+ test_vi_neg(a2, 123, -1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_vi_neg: a2", i, a2.get(i), 123);
+ }
+ test_cp_neg(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_cp_neg: a1", i, a1.get(i), 123);
+ }
+ test_2ci_neg(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_2ci_neg: a1", i, a1.get(i), -123);
+ errn += verify("test_2ci_neg: a2", i, a2.get(i), -103);
+ }
+ test_2vi_neg(a1, a2, 123, 103);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_2vi_neg: a1", i, a1.get(i), 123);
+ errn += verify("test_2vi_neg: a2", i, a2.get(i), 103);
+ }
+ // Reset for opposite stride
+ for (int i=0; i<ARRLEN; i++) {
+ a1.lazySet(i, -1);
+ a2.lazySet(i, -1);
+ }
+ test_ci_oppos(a1, -1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_ci_oppos: a1", i, a1.get(i), -123);
+ }
+ test_vi_oppos(a2, 123, -1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_vi_oppos: a2", i, a2.get(i), 123);
+ }
+ test_cp_oppos(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_cp_oppos: a1", i, a1.get(i), 123);
+ }
+ test_2ci_oppos(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_2ci_oppos: a1", i, a1.get(i), -123);
+ errn += verify("test_2ci_oppos: a2", i, a2.get(i), -103);
+ }
+ test_2vi_oppos(a1, a2, 123, 103);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_2vi_oppos: a1", i, a1.get(i), 123);
+ errn += verify("test_2vi_oppos: a2", i, a2.get(i), 103);
+ }
+ // Reset for indexing with offset
+ for (int i=0; i<ARRLEN; i++) {
+ a1.lazySet(i, -1);
+ a2.lazySet(i, -1);
+ }
+ test_ci_off(a1, -1);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_ci_off: a1", i, a1.get(i), -123);
+ }
+ test_vi_off(a2, 123, -1);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_vi_off: a2", i, a2.get(i), 123);
+ }
+ test_cp_off(a1, a2);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_cp_off: a1", i, a1.get(i), 123);
+ }
+ test_2ci_off(a1, a2);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_2ci_off: a1", i, a1.get(i), -123);
+ errn += verify("test_2ci_off: a2", i, a2.get(i), -103);
+ }
+ test_2vi_off(a1, a2, 123, 103);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_2vi_off: a1", i, a1.get(i), 123);
+ errn += verify("test_2vi_off: a2", i, a2.get(i), 103);
+ }
+ for (int i=0; i<OFFSET; i++) {
+ errn += verify("test_2vi_off: a1", i, a1.get(i), -1);
+ errn += verify("test_2vi_off: a2", i, a2.get(i), -1);
+ }
+ // Reset for indexing with invariant offset
+ for (int i=0; i<ARRLEN; i++) {
+ a1.lazySet(i, -1);
+ a2.lazySet(i, -1);
+ }
+ test_ci_inv(a1, OFFSET, -1);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_ci_inv: a1", i, a1.get(i), -123);
+ }
+ test_vi_inv(a2, 123, OFFSET, -1);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_vi_inv: a2", i, a2.get(i), 123);
+ }
+ test_cp_inv(a1, a2, OFFSET);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_cp_inv: a1", i, a1.get(i), 123);
+ }
+ test_2ci_inv(a1, a2, OFFSET);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_2ci_inv: a1", i, a1.get(i), -123);
+ errn += verify("test_2ci_inv: a2", i, a2.get(i), -103);
+ }
+ test_2vi_inv(a1, a2, 123, 103, OFFSET);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_2vi_inv: a1", i, a1.get(i), 123);
+ errn += verify("test_2vi_inv: a2", i, a2.get(i), 103);
+ }
+ for (int i=0; i<OFFSET; i++) {
+ errn += verify("test_2vi_inv: a1", i, a1.get(i), -1);
+ errn += verify("test_2vi_inv: a2", i, a2.get(i), -1);
+ }
+ // Reset for indexing with scale
+ for (int i=0; i<ARRLEN; i++) {
+ a1.lazySet(i, -1);
+ a2.lazySet(i, -1);
+ }
+ test_ci_scl(a1, -1);
+ for (int i=0; i<ARRLEN; i++) {
+ int val = (i%SCALE != 0) ? -1 : -123;
+ errn += verify("test_ci_scl: a1", i, a1.get(i), val);
+ }
+ test_vi_scl(a2, 123, -1);
+ for (int i=0; i<ARRLEN; i++) {
+ int val = (i%SCALE != 0) ? -1 : 123;
+ errn += verify("test_vi_scl: a2", i, a2.get(i), val);
+ }
+ test_cp_scl(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ int val = (i%SCALE != 0) ? -1 : 123;
+ errn += verify("test_cp_scl: a1", i, a1.get(i), val);
+ }
+ test_2ci_scl(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ if (i%SCALE != 0) {
+ errn += verify("test_2ci_scl: a1", i, a1.get(i), -1);
+ } else if (i*SCALE < ARRLEN) {
+ errn += verify("test_2ci_scl: a1", i*SCALE, a1.get(i*SCALE), -123);
+ }
+ if (i%SCALE != 0) {
+ errn += verify("test_2ci_scl: a2", i, a2.get(i), -1);
+ } else if (i*SCALE < ARRLEN) {
+ errn += verify("test_2ci_scl: a2", i*SCALE, a2.get(i*SCALE), -103);
+ }
+ }
+ test_2vi_scl(a1, a2, 123, 103);
+ for (int i=0; i<ARRLEN; i++) {
+ if (i%SCALE != 0) {
+ errn += verify("test_2vi_scl: a1", i, a1.get(i), -1);
+ } else if (i*SCALE < ARRLEN) {
+ errn += verify("test_2vi_scl: a1", i*SCALE, a1.get(i*SCALE), 123);
+ }
+ if (i%SCALE != 0) {
+ errn += verify("test_2vi_scl: a2", i, a2.get(i), -1);
+ } else if (i*SCALE < ARRLEN) {
+ errn += verify("test_2vi_scl: a2", i*SCALE, a2.get(i*SCALE), 103);
+ }
+ }
+ // Reset for 2 arrays with relative aligned offset
+ for (int i=0; i<ARRLEN; i++) {
+ a1.lazySet(i, -1);
+ a2.lazySet(i, -1);
+ }
+ test_vi(a2, 123, -1);
+ test_cp_alndst(a1, a2);
+ for (int i=0; i<ALIGN_OFF; i++) {
+ errn += verify("test_cp_alndst: a1", i, a1.get(i), -1);
+ }
+ for (int i=ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_cp_alndst: a1", i, a1.get(i), 123);
+ }
+ for (int i=0; i<ALIGN_OFF; i++) {
+ a1.lazySet(i, 123);
+ }
+ test_vi(a2, -123, 123);
+ test_cp_alnsrc(a1, a2);
+ for (int i=0; i<ARRLEN-ALIGN_OFF; i++) {
+ errn += verify("test_cp_alnsrc: a1", i, a1.get(i), -123);
+ }
+ for (int i=ARRLEN-ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_cp_alnsrc: a1", i, a1.get(i), 123);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1.lazySet(i, -1);
+ a2.lazySet(i, -1);
+ }
+ test_2ci_aln(a1, a2);
+ for (int i=0; i<ALIGN_OFF; i++) {
+ errn += verify("test_2ci_aln: a1", i, a1.get(i), -1);
+ }
+ for (int i=ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2ci_aln: a1", i, a1.get(i), -123);
+ }
+ for (int i=0; i<ARRLEN-ALIGN_OFF; i++) {
+ errn += verify("test_2ci_aln: a2", i, a2.get(i), -103);
+ }
+ for (int i=ARRLEN-ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2ci_aln: a2", i, a2.get(i), -1);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1.lazySet(i, -1);
+ a2.lazySet(i, -1);
+ }
+ test_2vi_aln(a1, a2, 123, 103);
+ for (int i=0; i<ARRLEN-ALIGN_OFF; i++) {
+ errn += verify("test_2vi_aln: a1", i, a1.get(i), 123);
+ }
+ for (int i=ARRLEN-ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2vi_aln: a1", i, a1.get(i), -1);
+ }
+ for (int i=0; i<ALIGN_OFF; i++) {
+ errn += verify("test_2vi_aln: a2", i, a2.get(i), -1);
+ }
+ for (int i=ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2vi_aln: a2", i, a2.get(i), 103);
+ }
+
+ // Reset for 2 arrays with relative unaligned offset
+ for (int i=0; i<ARRLEN; i++) {
+ a1.lazySet(i, -1);
+ a2.lazySet(i, -1);
+ }
+ test_vi(a2, 123, -1);
+ test_cp_unalndst(a1, a2);
+ for (int i=0; i<UNALIGN_OFF; i++) {
+ errn += verify("test_cp_unalndst: a1", i, a1.get(i), -1);
+ }
+ for (int i=UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_cp_unalndst: a1", i, a1.get(i), 123);
+ }
+ test_vi(a2, -123, 123);
+ test_cp_unalnsrc(a1, a2);
+ for (int i=0; i<ARRLEN-UNALIGN_OFF; i++) {
+ errn += verify("test_cp_unalnsrc: a1", i, a1.get(i), -123);
+ }
+ for (int i=ARRLEN-UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_cp_unalnsrc: a1", i, a1.get(i), 123);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1.lazySet(i, -1);
+ a2.lazySet(i, -1);
+ }
+ test_2ci_unaln(a1, a2);
+ for (int i=0; i<UNALIGN_OFF; i++) {
+ errn += verify("test_2ci_unaln: a1", i, a1.get(i), -1);
+ }
+ for (int i=UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2ci_unaln: a1", i, a1.get(i), -123);
+ }
+ for (int i=0; i<ARRLEN-UNALIGN_OFF; i++) {
+ errn += verify("test_2ci_unaln: a2", i, a2.get(i), -103);
+ }
+ for (int i=ARRLEN-UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2ci_unaln: a2", i, a2.get(i), -1);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1.lazySet(i, -1);
+ a2.lazySet(i, -1);
+ }
+ test_2vi_unaln(a1, a2, 123, 103);
+ for (int i=0; i<ARRLEN-UNALIGN_OFF; i++) {
+ errn += verify("test_2vi_unaln: a1", i, a1.get(i), 123);
+ }
+ for (int i=ARRLEN-UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2vi_unaln: a1", i, a1.get(i), -1);
+ }
+ for (int i=0; i<UNALIGN_OFF; i++) {
+ errn += verify("test_2vi_unaln: a2", i, a2.get(i), -1);
+ }
+ for (int i=UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2vi_unaln: a2", i, a2.get(i), 103);
+ }
+
+ // Reset for aligned overlap initialization
+ for (int i=0; i<ALIGN_OFF; i++) {
+ a1.lazySet(i, i);
+ }
+ for (int i=ALIGN_OFF; i<ARRLEN; i++) {
+ a1.lazySet(i, -1);
+ }
+ test_cp_alndst(a1, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ int v = i%ALIGN_OFF;
+ errn += verify("test_cp_alndst_overlap: a1", i, a1.get(i), v);
+ }
+ for (int i=0; i<ALIGN_OFF; i++) {
+ a1.lazySet((i+ALIGN_OFF), -1);
+ }
+ test_cp_alnsrc(a1, a1);
+ for (int i=0; i<ALIGN_OFF; i++) {
+ errn += verify("test_cp_alnsrc_overlap: a1", i, a1.get(i), -1);
+ }
+ for (int i=ALIGN_OFF; i<ARRLEN; i++) {
+ int v = i%ALIGN_OFF;
+ errn += verify("test_cp_alnsrc_overlap: a1", i, a1.get(i), v);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1.lazySet(i, -1);
+ }
+ test_2ci_aln(a1, a1);
+ for (int i=0; i<ARRLEN-ALIGN_OFF; i++) {
+ errn += verify("test_2ci_aln_overlap: a1", i, a1.get(i), -103);
+ }
+ for (int i=ARRLEN-ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2ci_aln_overlap: a1", i, a1.get(i), -123);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1.lazySet(i, -1);
+ }
+ test_2vi_aln(a1, a1, 123, 103);
+ for (int i=0; i<ARRLEN-ALIGN_OFF; i++) {
+ errn += verify("test_2vi_aln_overlap: a1", i, a1.get(i), 123);
+ }
+ for (int i=ARRLEN-ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2vi_aln_overlap: a1", i, a1.get(i), 103);
+ }
+
+ // Reset for unaligned overlap initialization
+ for (int i=0; i<UNALIGN_OFF; i++) {
+ a1.lazySet(i, i);
+ }
+ for (int i=UNALIGN_OFF; i<ARRLEN; i++) {
+ a1.lazySet(i, -1);
+ }
+ test_cp_unalndst(a1, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ int v = i%UNALIGN_OFF;
+ errn += verify("test_cp_unalndst_overlap: a1", i, a1.get(i), v);
+ }
+ for (int i=0; i<UNALIGN_OFF; i++) {
+ a1.lazySet((i+UNALIGN_OFF), -1);
+ }
+ test_cp_unalnsrc(a1, a1);
+ for (int i=0; i<UNALIGN_OFF; i++) {
+ errn += verify("test_cp_unalnsrc_overlap: a1", i, a1.get(i), -1);
+ }
+ for (int i=UNALIGN_OFF; i<ARRLEN; i++) {
+ int v = i%UNALIGN_OFF;
+ errn += verify("test_cp_unalnsrc_overlap: a1", i, a1.get(i), v);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1.lazySet(i, -1);
+ }
+ test_2ci_unaln(a1, a1);
+ for (int i=0; i<ARRLEN-UNALIGN_OFF; i++) {
+ errn += verify("test_2ci_unaln_overlap: a1", i, a1.get(i), -103);
+ }
+ for (int i=ARRLEN-UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2ci_unaln_overlap: a1", i, a1.get(i), -123);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1.lazySet(i, -1);
+ }
+ test_2vi_unaln(a1, a1, 123, 103);
+ for (int i=0; i<ARRLEN-UNALIGN_OFF; i++) {
+ errn += verify("test_2vi_unaln_overlap: a1", i, a1.get(i), 123);
+ }
+ for (int i=ARRLEN-UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2vi_unaln_overlap: a1", i, a1.get(i), 103);
+ }
+
+ }
+
+ if (errn > 0 || test_only)
+ return errn;
+
+ // Initialize
+ for (int i=0; i<ARRLEN; i++) {
+ a1.lazySet(i, -1);
+ a2.lazySet(i, -1);
+ }
+ System.out.println("Time");
+ long start, end;
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_ci(a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_ci: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_vi(a2, 123, -1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_vi: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi(a1, a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_ci_neg(a1, 123);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_ci_neg: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_vi_neg(a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_vi_neg: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_neg(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_neg: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci_neg(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci_neg: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi_neg(a1, a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi_neg: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_ci_oppos(a1, 123);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_ci_oppos: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_vi_oppos(a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_vi_oppos: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_oppos(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_oppos: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci_oppos(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci_oppos: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi_oppos(a1, a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi_oppos: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_ci_off(a1, 123);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_ci_off: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_vi_off(a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_vi_off: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_off(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_off: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci_off(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci_off: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi_off(a1, a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi_off: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_ci_inv(a1, OFFSET, 123);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_ci_inv: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_vi_inv(a2, 123, OFFSET, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_vi_inv: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_inv(a1, a2, OFFSET);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_inv: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci_inv(a1, a2, OFFSET);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci_inv: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi_inv(a1, a2, 123, 103, OFFSET);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi_inv: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_ci_scl(a1, 123);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_ci_scl: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_vi_scl(a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_vi_scl: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_scl(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_scl: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci_scl(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci_scl: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi_scl(a1, a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi_scl: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_alndst(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_alndst: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_alnsrc(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_alnsrc: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci_aln(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci_aln: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi_aln(a1, a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi_aln: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_unalndst(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_unalndst: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_unalnsrc(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_unalnsrc: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci_unaln(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci_unaln: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi_unaln(a1, a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi_unaln: " + (end - start));
+
+ return errn;
+ }
+
+ static void test_ci(AtomicIntegerArray a) {
+ for (int i = 0; i < ARRLEN; i+=1) {
+ a.lazySet(i, -123);
+ }
+ }
+ static void test_vi(AtomicIntegerArray a, int b, int old) {
+ for (int i = 0; i < ARRLEN; i+=1) {
+ a.lazySet(i, b);
+ }
+ }
+ static void test_cp(AtomicIntegerArray a, AtomicIntegerArray b) {
+ for (int i = 0; i < ARRLEN; i+=1) {
+ a.lazySet(i, b.get(i));
+ }
+ }
+ static void test_2ci(AtomicIntegerArray a, AtomicIntegerArray b) {
+ for (int i = 0; i < ARRLEN; i+=1) {
+ a.lazySet(i, -123);
+ b.lazySet(i, -103);
+ }
+ }
+ static void test_2vi(AtomicIntegerArray a, AtomicIntegerArray b, int c, int d) {
+ for (int i = 0; i < ARRLEN; i+=1) {
+ a.lazySet(i, c);
+ b.lazySet(i, d);
+ }
+ }
+ static void test_ci_neg(AtomicIntegerArray a, int old) {
+ for (int i = ARRLEN-1; i >= 0; i-=1) {
+ a.lazySet(i,-123);
+ }
+ }
+ static void test_vi_neg(AtomicIntegerArray a, int b, int old) {
+ for (int i = ARRLEN-1; i >= 0; i-=1) {
+ a.lazySet(i, b);
+ }
+ }
+ static void test_cp_neg(AtomicIntegerArray a, AtomicIntegerArray b) {
+ for (int i = ARRLEN-1; i >= 0; i-=1) {
+ a.lazySet(i, b.get(i));
+ }
+ }
+ static void test_2ci_neg(AtomicIntegerArray a, AtomicIntegerArray b) {
+ for (int i = ARRLEN-1; i >= 0; i-=1) {
+ a.lazySet(i, -123);
+ b.lazySet(i, -103);
+ }
+ }
+ static void test_2vi_neg(AtomicIntegerArray a, AtomicIntegerArray b, int c, int d) {
+ for (int i = ARRLEN-1; i >= 0; i-=1) {
+ a.lazySet(i, c);
+ b.lazySet(i, d);
+ }
+ }
+ static void test_ci_oppos(AtomicIntegerArray a, int old) {
+ int limit = ARRLEN-1;
+ for (int i = 0; i < ARRLEN; i+=1) {
+ a.lazySet((limit-i), -123);
+ }
+ }
+ static void test_vi_oppos(AtomicIntegerArray a, int b, int old) {
+ int limit = ARRLEN-1;
+ for (int i = limit; i >= 0; i-=1) {
+ a.lazySet((limit-i), b);
+ }
+ }
+ static void test_cp_oppos(AtomicIntegerArray a, AtomicIntegerArray b) {
+ int limit = ARRLEN-1;
+ for (int i = 0; i < ARRLEN; i+=1) {
+ a.lazySet(i, b.get(limit-i));
+ }
+ }
+ static void test_2ci_oppos(AtomicIntegerArray a, AtomicIntegerArray b) {
+ int limit = ARRLEN-1;
+ for (int i = 0; i < ARRLEN; i+=1) {
+ a.lazySet((limit-i), -123);
+ b.lazySet(i, -103);
+ }
+ }
+ static void test_2vi_oppos(AtomicIntegerArray a, AtomicIntegerArray b, int c, int d) {
+ int limit = ARRLEN-1;
+ for (int i = limit; i >= 0; i-=1) {
+ a.lazySet(i, c);
+ b.lazySet((limit-i), d);
+ }
+ }
+ static void test_ci_off(AtomicIntegerArray a, int old) {
+ for (int i = 0; i < ARRLEN-OFFSET; i+=1) {
+ a.lazySet((i+OFFSET), -123);
+ }
+ }
+ static void test_vi_off(AtomicIntegerArray a, int b, int old) {
+ for (int i = 0; i < ARRLEN-OFFSET; i+=1) {
+ a.lazySet((i+OFFSET), b);
+ }
+ }
+ static void test_cp_off(AtomicIntegerArray a, AtomicIntegerArray b) {
+ for (int i = 0; i < ARRLEN-OFFSET; i+=1) {
+ a.lazySet((i+OFFSET), b.get(i+OFFSET));
+ }
+ }
+ static void test_2ci_off(AtomicIntegerArray a, AtomicIntegerArray b) {
+ for (int i = 0; i < ARRLEN-OFFSET; i+=1) {
+ a.lazySet((i+OFFSET), -123);
+ b.lazySet((i+OFFSET), -103);
+ }
+ }
+ static void test_2vi_off(AtomicIntegerArray a, AtomicIntegerArray b, int c, int d) {
+ for (int i = 0; i < ARRLEN-OFFSET; i+=1) {
+ a.lazySet((i+OFFSET), c);
+ b.lazySet((i+OFFSET), d);
+ }
+ }
+ static void test_ci_inv(AtomicIntegerArray a, int k, int old) {
+ for (int i = 0; i < ARRLEN-k; i+=1) {
+ a.lazySet((i+k),-123);
+ }
+ }
+ static void test_vi_inv(AtomicIntegerArray a, int b, int k, int old) {
+ for (int i = 0; i < ARRLEN-k; i+=1) {
+ a.lazySet((i+k), b);
+ }
+ }
+ static void test_cp_inv(AtomicIntegerArray a, AtomicIntegerArray b, int k) {
+ for (int i = 0; i < ARRLEN-k; i+=1) {
+ a.lazySet((i+k), b.get(i+k));
+ }
+ }
+ static void test_2ci_inv(AtomicIntegerArray a, AtomicIntegerArray b, int k) {
+ for (int i = 0; i < ARRLEN-k; i+=1) {
+ a.lazySet((i+k), -123);
+ b.lazySet((i+k), -103);
+ }
+ }
+ static void test_2vi_inv(AtomicIntegerArray a, AtomicIntegerArray b, int c, int d, int k) {
+ for (int i = 0; i < ARRLEN-k; i+=1) {
+ a.lazySet((i+k), c);
+ b.lazySet((i+k), d);
+ }
+ }
+ static void test_ci_scl(AtomicIntegerArray a, int old) {
+ for (int i = 0; i*SCALE < ARRLEN; i+=1) {
+ a.lazySet((i*SCALE), -123);
+ }
+ }
+ static void test_vi_scl(AtomicIntegerArray a, int b, int old) {
+ for (int i = 0; i*SCALE < ARRLEN; i+=1) {
+ a.lazySet((i*SCALE), b);
+ }
+ }
+ static void test_cp_scl(AtomicIntegerArray a, AtomicIntegerArray b) {
+ for (int i = 0; i*SCALE < ARRLEN; i+=1) {
+ a.lazySet((i*SCALE), b.get(i*SCALE));
+ }
+ }
+ static void test_2ci_scl(AtomicIntegerArray a, AtomicIntegerArray b) {
+ for (int i = 0; i*SCALE < ARRLEN; i+=1) {
+ a.lazySet((i*SCALE), -123);
+ b.lazySet((i*SCALE), -103);
+ }
+ }
+ static void test_2vi_scl(AtomicIntegerArray a, AtomicIntegerArray b, int c, int d) {
+ for (int i = 0; i*SCALE < ARRLEN; i+=1) {
+ a.lazySet((i*SCALE), c);
+ b.lazySet((i*SCALE), d);
+ }
+ }
+ static void test_cp_alndst(AtomicIntegerArray a, AtomicIntegerArray b) {
+ for (int i = 0; i < ARRLEN-ALIGN_OFF; i+=1) {
+ a.lazySet((i+ALIGN_OFF), b.get(i));
+ }
+ }
+ static void test_cp_alnsrc(AtomicIntegerArray a, AtomicIntegerArray b) {
+ for (int i = 0; i < ARRLEN-ALIGN_OFF; i+=1) {
+ a.lazySet(i, b.get(i+ALIGN_OFF));
+ }
+ }
+ static void test_2ci_aln(AtomicIntegerArray a, AtomicIntegerArray b) {
+ for (int i = 0; i < ARRLEN-ALIGN_OFF; i+=1) {
+ a.lazySet((i+ALIGN_OFF), -123);
+ b.lazySet(i, -103);
+ }
+ }
+ static void test_2vi_aln(AtomicIntegerArray a, AtomicIntegerArray b, int c, int d) {
+ for (int i = 0; i < ARRLEN-ALIGN_OFF; i+=1) {
+ a.lazySet(i, c);
+ b.lazySet((i+ALIGN_OFF), d);
+ }
+ }
+ static void test_cp_unalndst(AtomicIntegerArray a, AtomicIntegerArray b) {
+ for (int i = 0; i < ARRLEN-UNALIGN_OFF; i+=1) {
+ a.lazySet((i+UNALIGN_OFF), b.get(i));
+ }
+ }
+ static void test_cp_unalnsrc(AtomicIntegerArray a, AtomicIntegerArray b) {
+ for (int i = 0; i < ARRLEN-UNALIGN_OFF; i+=1) {
+ a.lazySet(i, b.get(i+UNALIGN_OFF));
+ }
+ }
+ static void test_2ci_unaln(AtomicIntegerArray a, AtomicIntegerArray b) {
+ for (int i = 0; i < ARRLEN-UNALIGN_OFF; i+=1) {
+ a.lazySet((i+UNALIGN_OFF), -123);
+ b.lazySet(i, -103);
+ }
+ }
+ static void test_2vi_unaln(AtomicIntegerArray a, AtomicIntegerArray b, int c, int d) {
+ for (int i = 0; i < ARRLEN-UNALIGN_OFF; i+=1) {
+ a.lazySet(i, c);
+ b.lazySet((i+UNALIGN_OFF), d);
+ }
+ }
+
+ static int verify(String text, int i, int elem, int val) {
+ if (elem != val) {
+ System.err.println(text + "[" + i + "] = " + elem + " != " + val);
+ return 1;
+ }
+ return 0;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/8004867/TestIntAtomicVolatile.java Tue Mar 05 11:49:33 2013 -0800
@@ -0,0 +1,969 @@
+/*
+ * Copyright (c) 2013, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/**
+ * @test
+ * @bug 8004867
+ * @summary VM crashing with assert "share/vm/opto/node.hpp:357 - assert(i < _max) failed: oob"
+ *
+ * @run main/othervm/timeout=300 -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation -XX:-OptimizeFill TestIntAtomicVolatile
+ * @run main/othervm/timeout=300 -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation -XX:+OptimizeFill TestIntAtomicVolatile
+ */
+
+import java.util.concurrent.atomic.AtomicIntegerArray;
+
+public class TestIntAtomicVolatile {
+ private static final int ARRLEN = 97;
+ private static final int ITERS = 11000;
+ private static final int OFFSET = 3;
+ private static final int SCALE = 2;
+ private static final int ALIGN_OFF = 8;
+ private static final int UNALIGN_OFF = 5;
+
+ public static void main(String args[]) {
+ System.out.println("Testing Integer array atomic volatile operations");
+ int errn = test(false);
+ if (errn > 0) {
+ System.err.println("FAILED: " + errn + " errors");
+ System.exit(97);
+ }
+ System.out.println("PASSED");
+ }
+
+ static int test(boolean test_only) {
+ AtomicIntegerArray a1 = new AtomicIntegerArray(ARRLEN);
+ AtomicIntegerArray a2 = new AtomicIntegerArray(ARRLEN);
+ // Initialize
+ for (int i=0; i<ARRLEN; i++) {
+ a1.set(i, -1);
+ a2.set(i, -1);
+ }
+ System.out.println("Warmup");
+ for (int i=0; i<ITERS; i++) {
+ test_ci(a1);
+ test_vi(a2, 123, -1);
+ test_cp(a1, a2);
+ test_2ci(a1, a2);
+ test_2vi(a1, a2, 123, 103);
+ test_ci_neg(a1, 123);
+ test_vi_neg(a2, 123, 103);
+ test_cp_neg(a1, a2);
+ test_2ci_neg(a1, a2);
+ test_2vi_neg(a1, a2, 123, 103);
+ test_ci_oppos(a1, 123);
+ test_vi_oppos(a2, 123, 103);
+ test_cp_oppos(a1, a2);
+ test_2ci_oppos(a1, a2);
+ test_2vi_oppos(a1, a2, 123, 103);
+ test_ci_off(a1, 123);
+ test_vi_off(a2, 123, 103);
+ test_cp_off(a1, a2);
+ test_2ci_off(a1, a2);
+ test_2vi_off(a1, a2, 123, 103);
+ test_ci_inv(a1, OFFSET, 123);
+ test_vi_inv(a2, 123, OFFSET, 103);
+ test_cp_inv(a1, a2, OFFSET);
+ test_2ci_inv(a1, a2, OFFSET);
+ test_2vi_inv(a1, a2, 123, 103, OFFSET);
+ test_ci_scl(a1, 123);
+ test_vi_scl(a2, 123, 103);
+ test_cp_scl(a1, a2);
+ test_2ci_scl(a1, a2);
+ test_2vi_scl(a1, a2, 123, 103);
+ test_cp_alndst(a1, a2);
+ test_cp_alnsrc(a1, a2);
+ test_2ci_aln(a1, a2);
+ test_2vi_aln(a1, a2, 123, 103);
+ test_cp_unalndst(a1, a2);
+ test_cp_unalnsrc(a1, a2);
+ test_2ci_unaln(a1, a2);
+ test_2vi_unaln(a1, a2, 123, 103);
+ }
+ // Initialize
+ for (int i=0; i<ARRLEN; i++) {
+ a1.set(i, -1);
+ a2.set(i, -1);
+ }
+ // Test and verify results
+ System.out.println("Verification");
+ int errn = 0;
+ {
+ test_ci(a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_ci: a1", i, a1.get(i), -123);
+ }
+ test_vi(a2, 123, -1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_vi: a2", i, a2.get(i), 123);
+ }
+ test_cp(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_cp: a1", i, a1.get(i), 123);
+ }
+ test_2ci(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_2ci: a1", i, a1.get(i), -123);
+ errn += verify("test_2ci: a2", i, a2.get(i), -103);
+ }
+ test_2vi(a1, a2, 123, 103);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_2vi: a1", i, a1.get(i), 123);
+ errn += verify("test_2vi: a2", i, a2.get(i), 103);
+ }
+ // Reset for negative stride
+ for (int i=0; i<ARRLEN; i++) {
+ a1.set(i, -1);
+ a2.set(i, -1);
+ }
+ test_ci_neg(a1, -1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_ci_neg: a1", i, a1.get(i), -123);
+ }
+ test_vi_neg(a2, 123, -1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_vi_neg: a2", i, a2.get(i), 123);
+ }
+ test_cp_neg(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_cp_neg: a1", i, a1.get(i), 123);
+ }
+ test_2ci_neg(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_2ci_neg: a1", i, a1.get(i), -123);
+ errn += verify("test_2ci_neg: a2", i, a2.get(i), -103);
+ }
+ test_2vi_neg(a1, a2, 123, 103);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_2vi_neg: a1", i, a1.get(i), 123);
+ errn += verify("test_2vi_neg: a2", i, a2.get(i), 103);
+ }
+ // Reset for opposite stride
+ for (int i=0; i<ARRLEN; i++) {
+ a1.set(i, -1);
+ a2.set(i, -1);
+ }
+ test_ci_oppos(a1, -1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_ci_oppos: a1", i, a1.get(i), -123);
+ }
+ test_vi_oppos(a2, 123, -1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_vi_oppos: a2", i, a2.get(i), 123);
+ }
+ test_cp_oppos(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_cp_oppos: a1", i, a1.get(i), 123);
+ }
+ test_2ci_oppos(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_2ci_oppos: a1", i, a1.get(i), -123);
+ errn += verify("test_2ci_oppos: a2", i, a2.get(i), -103);
+ }
+ test_2vi_oppos(a1, a2, 123, 103);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_2vi_oppos: a1", i, a1.get(i), 123);
+ errn += verify("test_2vi_oppos: a2", i, a2.get(i), 103);
+ }
+ // Reset for indexing with offset
+ for (int i=0; i<ARRLEN; i++) {
+ a1.set(i, -1);
+ a2.set(i, -1);
+ }
+ test_ci_off(a1, -1);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_ci_off: a1", i, a1.get(i), -123);
+ }
+ test_vi_off(a2, 123, -1);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_vi_off: a2", i, a2.get(i), 123);
+ }
+ test_cp_off(a1, a2);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_cp_off: a1", i, a1.get(i), 123);
+ }
+ test_2ci_off(a1, a2);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_2ci_off: a1", i, a1.get(i), -123);
+ errn += verify("test_2ci_off: a2", i, a2.get(i), -103);
+ }
+ test_2vi_off(a1, a2, 123, 103);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_2vi_off: a1", i, a1.get(i), 123);
+ errn += verify("test_2vi_off: a2", i, a2.get(i), 103);
+ }
+ for (int i=0; i<OFFSET; i++) {
+ errn += verify("test_2vi_off: a1", i, a1.get(i), -1);
+ errn += verify("test_2vi_off: a2", i, a2.get(i), -1);
+ }
+ // Reset for indexing with invariant offset
+ for (int i=0; i<ARRLEN; i++) {
+ a1.set(i, -1);
+ a2.set(i, -1);
+ }
+ test_ci_inv(a1, OFFSET, -1);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_ci_inv: a1", i, a1.get(i), -123);
+ }
+ test_vi_inv(a2, 123, OFFSET, -1);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_vi_inv: a2", i, a2.get(i), 123);
+ }
+ test_cp_inv(a1, a2, OFFSET);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_cp_inv: a1", i, a1.get(i), 123);
+ }
+ test_2ci_inv(a1, a2, OFFSET);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_2ci_inv: a1", i, a1.get(i), -123);
+ errn += verify("test_2ci_inv: a2", i, a2.get(i), -103);
+ }
+ test_2vi_inv(a1, a2, 123, 103, OFFSET);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_2vi_inv: a1", i, a1.get(i), 123);
+ errn += verify("test_2vi_inv: a2", i, a2.get(i), 103);
+ }
+ for (int i=0; i<OFFSET; i++) {
+ errn += verify("test_2vi_inv: a1", i, a1.get(i), -1);
+ errn += verify("test_2vi_inv: a2", i, a2.get(i), -1);
+ }
+ // Reset for indexing with scale
+ for (int i=0; i<ARRLEN; i++) {
+ a1.set(i, -1);
+ a2.set(i, -1);
+ }
+ test_ci_scl(a1, -1);
+ for (int i=0; i<ARRLEN; i++) {
+ int val = (i%SCALE != 0) ? -1 : -123;
+ errn += verify("test_ci_scl: a1", i, a1.get(i), val);
+ }
+ test_vi_scl(a2, 123, -1);
+ for (int i=0; i<ARRLEN; i++) {
+ int val = (i%SCALE != 0) ? -1 : 123;
+ errn += verify("test_vi_scl: a2", i, a2.get(i), val);
+ }
+ test_cp_scl(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ int val = (i%SCALE != 0) ? -1 : 123;
+ errn += verify("test_cp_scl: a1", i, a1.get(i), val);
+ }
+ test_2ci_scl(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ if (i%SCALE != 0) {
+ errn += verify("test_2ci_scl: a1", i, a1.get(i), -1);
+ } else if (i*SCALE < ARRLEN) {
+ errn += verify("test_2ci_scl: a1", i*SCALE, a1.get(i*SCALE), -123);
+ }
+ if (i%SCALE != 0) {
+ errn += verify("test_2ci_scl: a2", i, a2.get(i), -1);
+ } else if (i*SCALE < ARRLEN) {
+ errn += verify("test_2ci_scl: a2", i*SCALE, a2.get(i*SCALE), -103);
+ }
+ }
+ test_2vi_scl(a1, a2, 123, 103);
+ for (int i=0; i<ARRLEN; i++) {
+ if (i%SCALE != 0) {
+ errn += verify("test_2vi_scl: a1", i, a1.get(i), -1);
+ } else if (i*SCALE < ARRLEN) {
+ errn += verify("test_2vi_scl: a1", i*SCALE, a1.get(i*SCALE), 123);
+ }
+ if (i%SCALE != 0) {
+ errn += verify("test_2vi_scl: a2", i, a2.get(i), -1);
+ } else if (i*SCALE < ARRLEN) {
+ errn += verify("test_2vi_scl: a2", i*SCALE, a2.get(i*SCALE), 103);
+ }
+ }
+ // Reset for 2 arrays with relative aligned offset
+ for (int i=0; i<ARRLEN; i++) {
+ a1.set(i, -1);
+ a2.set(i, -1);
+ }
+ test_vi(a2, 123, -1);
+ test_cp_alndst(a1, a2);
+ for (int i=0; i<ALIGN_OFF; i++) {
+ errn += verify("test_cp_alndst: a1", i, a1.get(i), -1);
+ }
+ for (int i=ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_cp_alndst: a1", i, a1.get(i), 123);
+ }
+ for (int i=0; i<ALIGN_OFF; i++) {
+ a1.set(i, 123);
+ }
+ test_vi(a2, -123, 123);
+ test_cp_alnsrc(a1, a2);
+ for (int i=0; i<ARRLEN-ALIGN_OFF; i++) {
+ errn += verify("test_cp_alnsrc: a1", i, a1.get(i), -123);
+ }
+ for (int i=ARRLEN-ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_cp_alnsrc: a1", i, a1.get(i), 123);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1.set(i, -1);
+ a2.set(i, -1);
+ }
+ test_2ci_aln(a1, a2);
+ for (int i=0; i<ALIGN_OFF; i++) {
+ errn += verify("test_2ci_aln: a1", i, a1.get(i), -1);
+ }
+ for (int i=ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2ci_aln: a1", i, a1.get(i), -123);
+ }
+ for (int i=0; i<ARRLEN-ALIGN_OFF; i++) {
+ errn += verify("test_2ci_aln: a2", i, a2.get(i), -103);
+ }
+ for (int i=ARRLEN-ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2ci_aln: a2", i, a2.get(i), -1);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1.set(i, -1);
+ a2.set(i, -1);
+ }
+ test_2vi_aln(a1, a2, 123, 103);
+ for (int i=0; i<ARRLEN-ALIGN_OFF; i++) {
+ errn += verify("test_2vi_aln: a1", i, a1.get(i), 123);
+ }
+ for (int i=ARRLEN-ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2vi_aln: a1", i, a1.get(i), -1);
+ }
+ for (int i=0; i<ALIGN_OFF; i++) {
+ errn += verify("test_2vi_aln: a2", i, a2.get(i), -1);
+ }
+ for (int i=ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2vi_aln: a2", i, a2.get(i), 103);
+ }
+
+ // Reset for 2 arrays with relative unaligned offset
+ for (int i=0; i<ARRLEN; i++) {
+ a1.set(i, -1);
+ a2.set(i, -1);
+ }
+ test_vi(a2, 123, -1);
+ test_cp_unalndst(a1, a2);
+ for (int i=0; i<UNALIGN_OFF; i++) {
+ errn += verify("test_cp_unalndst: a1", i, a1.get(i), -1);
+ }
+ for (int i=UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_cp_unalndst: a1", i, a1.get(i), 123);
+ }
+ test_vi(a2, -123, 123);
+ test_cp_unalnsrc(a1, a2);
+ for (int i=0; i<ARRLEN-UNALIGN_OFF; i++) {
+ errn += verify("test_cp_unalnsrc: a1", i, a1.get(i), -123);
+ }
+ for (int i=ARRLEN-UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_cp_unalnsrc: a1", i, a1.get(i), 123);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1.set(i, -1);
+ a2.set(i, -1);
+ }
+ test_2ci_unaln(a1, a2);
+ for (int i=0; i<UNALIGN_OFF; i++) {
+ errn += verify("test_2ci_unaln: a1", i, a1.get(i), -1);
+ }
+ for (int i=UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2ci_unaln: a1", i, a1.get(i), -123);
+ }
+ for (int i=0; i<ARRLEN-UNALIGN_OFF; i++) {
+ errn += verify("test_2ci_unaln: a2", i, a2.get(i), -103);
+ }
+ for (int i=ARRLEN-UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2ci_unaln: a2", i, a2.get(i), -1);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1.set(i, -1);
+ a2.set(i, -1);
+ }
+ test_2vi_unaln(a1, a2, 123, 103);
+ for (int i=0; i<ARRLEN-UNALIGN_OFF; i++) {
+ errn += verify("test_2vi_unaln: a1", i, a1.get(i), 123);
+ }
+ for (int i=ARRLEN-UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2vi_unaln: a1", i, a1.get(i), -1);
+ }
+ for (int i=0; i<UNALIGN_OFF; i++) {
+ errn += verify("test_2vi_unaln: a2", i, a2.get(i), -1);
+ }
+ for (int i=UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2vi_unaln: a2", i, a2.get(i), 103);
+ }
+
+ // Reset for aligned overlap initialization
+ for (int i=0; i<ALIGN_OFF; i++) {
+ a1.set(i, i);
+ }
+ for (int i=ALIGN_OFF; i<ARRLEN; i++) {
+ a1.set(i, -1);
+ }
+ test_cp_alndst(a1, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ int v = i%ALIGN_OFF;
+ errn += verify("test_cp_alndst_overlap: a1", i, a1.get(i), v);
+ }
+ for (int i=0; i<ALIGN_OFF; i++) {
+ a1.set((i+ALIGN_OFF), -1);
+ }
+ test_cp_alnsrc(a1, a1);
+ for (int i=0; i<ALIGN_OFF; i++) {
+ errn += verify("test_cp_alnsrc_overlap: a1", i, a1.get(i), -1);
+ }
+ for (int i=ALIGN_OFF; i<ARRLEN; i++) {
+ int v = i%ALIGN_OFF;
+ errn += verify("test_cp_alnsrc_overlap: a1", i, a1.get(i), v);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1.set(i, -1);
+ }
+ test_2ci_aln(a1, a1);
+ for (int i=0; i<ARRLEN-ALIGN_OFF; i++) {
+ errn += verify("test_2ci_aln_overlap: a1", i, a1.get(i), -103);
+ }
+ for (int i=ARRLEN-ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2ci_aln_overlap: a1", i, a1.get(i), -123);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1.set(i, -1);
+ }
+ test_2vi_aln(a1, a1, 123, 103);
+ for (int i=0; i<ARRLEN-ALIGN_OFF; i++) {
+ errn += verify("test_2vi_aln_overlap: a1", i, a1.get(i), 123);
+ }
+ for (int i=ARRLEN-ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2vi_aln_overlap: a1", i, a1.get(i), 103);
+ }
+
+ // Reset for unaligned overlap initialization
+ for (int i=0; i<UNALIGN_OFF; i++) {
+ a1.set(i, i);
+ }
+ for (int i=UNALIGN_OFF; i<ARRLEN; i++) {
+ a1.set(i, -1);
+ }
+ test_cp_unalndst(a1, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ int v = i%UNALIGN_OFF;
+ errn += verify("test_cp_unalndst_overlap: a1", i, a1.get(i), v);
+ }
+ for (int i=0; i<UNALIGN_OFF; i++) {
+ a1.set((i+UNALIGN_OFF), -1);
+ }
+ test_cp_unalnsrc(a1, a1);
+ for (int i=0; i<UNALIGN_OFF; i++) {
+ errn += verify("test_cp_unalnsrc_overlap: a1", i, a1.get(i), -1);
+ }
+ for (int i=UNALIGN_OFF; i<ARRLEN; i++) {
+ int v = i%UNALIGN_OFF;
+ errn += verify("test_cp_unalnsrc_overlap: a1", i, a1.get(i), v);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1.set(i, -1);
+ }
+ test_2ci_unaln(a1, a1);
+ for (int i=0; i<ARRLEN-UNALIGN_OFF; i++) {
+ errn += verify("test_2ci_unaln_overlap: a1", i, a1.get(i), -103);
+ }
+ for (int i=ARRLEN-UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2ci_unaln_overlap: a1", i, a1.get(i), -123);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1.set(i, -1);
+ }
+ test_2vi_unaln(a1, a1, 123, 103);
+ for (int i=0; i<ARRLEN-UNALIGN_OFF; i++) {
+ errn += verify("test_2vi_unaln_overlap: a1", i, a1.get(i), 123);
+ }
+ for (int i=ARRLEN-UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2vi_unaln_overlap: a1", i, a1.get(i), 103);
+ }
+
+ }
+
+ if (errn > 0 || test_only)
+ return errn;
+
+ // Initialize
+ for (int i=0; i<ARRLEN; i++) {
+ a1.set(i, -1);
+ a2.set(i, -1);
+ }
+ System.out.println("Time");
+ long start, end;
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_ci(a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_ci: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_vi(a2, 123, -1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_vi: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi(a1, a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_ci_neg(a1, 123);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_ci_neg: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_vi_neg(a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_vi_neg: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_neg(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_neg: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci_neg(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci_neg: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi_neg(a1, a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi_neg: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_ci_oppos(a1, 123);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_ci_oppos: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_vi_oppos(a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_vi_oppos: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_oppos(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_oppos: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci_oppos(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci_oppos: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi_oppos(a1, a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi_oppos: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_ci_off(a1, 123);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_ci_off: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_vi_off(a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_vi_off: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_off(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_off: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci_off(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci_off: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi_off(a1, a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi_off: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_ci_inv(a1, OFFSET, 123);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_ci_inv: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_vi_inv(a2, 123, OFFSET, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_vi_inv: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_inv(a1, a2, OFFSET);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_inv: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci_inv(a1, a2, OFFSET);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci_inv: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi_inv(a1, a2, 123, 103, OFFSET);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi_inv: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_ci_scl(a1, 123);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_ci_scl: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_vi_scl(a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_vi_scl: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_scl(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_scl: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci_scl(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci_scl: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi_scl(a1, a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi_scl: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_alndst(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_alndst: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_alnsrc(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_alnsrc: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci_aln(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci_aln: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi_aln(a1, a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi_aln: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_unalndst(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_unalndst: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_unalnsrc(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_unalnsrc: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci_unaln(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci_unaln: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi_unaln(a1, a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi_unaln: " + (end - start));
+
+ return errn;
+ }
+
+ static void test_ci(AtomicIntegerArray a) {
+ for (int i = 0; i < ARRLEN; i+=1) {
+ a.set(i, -123);
+ }
+ }
+ static void test_vi(AtomicIntegerArray a, int b, int old) {
+ for (int i = 0; i < ARRLEN; i+=1) {
+ a.set(i, b);
+ }
+ }
+ static void test_cp(AtomicIntegerArray a, AtomicIntegerArray b) {
+ for (int i = 0; i < ARRLEN; i+=1) {
+ a.set(i, b.get(i));
+ }
+ }
+ static void test_2ci(AtomicIntegerArray a, AtomicIntegerArray b) {
+ for (int i = 0; i < ARRLEN; i+=1) {
+ a.set(i, -123);
+ b.set(i, -103);
+ }
+ }
+ static void test_2vi(AtomicIntegerArray a, AtomicIntegerArray b, int c, int d) {
+ for (int i = 0; i < ARRLEN; i+=1) {
+ a.set(i, c);
+ b.set(i, d);
+ }
+ }
+ static void test_ci_neg(AtomicIntegerArray a, int old) {
+ for (int i = ARRLEN-1; i >= 0; i-=1) {
+ a.set(i,-123);
+ }
+ }
+ static void test_vi_neg(AtomicIntegerArray a, int b, int old) {
+ for (int i = ARRLEN-1; i >= 0; i-=1) {
+ a.set(i, b);
+ }
+ }
+ static void test_cp_neg(AtomicIntegerArray a, AtomicIntegerArray b) {
+ for (int i = ARRLEN-1; i >= 0; i-=1) {
+ a.set(i, b.get(i));
+ }
+ }
+ static void test_2ci_neg(AtomicIntegerArray a, AtomicIntegerArray b) {
+ for (int i = ARRLEN-1; i >= 0; i-=1) {
+ a.set(i, -123);
+ b.set(i, -103);
+ }
+ }
+ static void test_2vi_neg(AtomicIntegerArray a, AtomicIntegerArray b, int c, int d) {
+ for (int i = ARRLEN-1; i >= 0; i-=1) {
+ a.set(i, c);
+ b.set(i, d);
+ }
+ }
+ static void test_ci_oppos(AtomicIntegerArray a, int old) {
+ int limit = ARRLEN-1;
+ for (int i = 0; i < ARRLEN; i+=1) {
+ a.set((limit-i), -123);
+ }
+ }
+ static void test_vi_oppos(AtomicIntegerArray a, int b, int old) {
+ int limit = ARRLEN-1;
+ for (int i = limit; i >= 0; i-=1) {
+ a.set((limit-i), b);
+ }
+ }
+ static void test_cp_oppos(AtomicIntegerArray a, AtomicIntegerArray b) {
+ int limit = ARRLEN-1;
+ for (int i = 0; i < ARRLEN; i+=1) {
+ a.set(i, b.get(limit-i));
+ }
+ }
+ static void test_2ci_oppos(AtomicIntegerArray a, AtomicIntegerArray b) {
+ int limit = ARRLEN-1;
+ for (int i = 0; i < ARRLEN; i+=1) {
+ a.set((limit-i), -123);
+ b.set(i, -103);
+ }
+ }
+ static void test_2vi_oppos(AtomicIntegerArray a, AtomicIntegerArray b, int c, int d) {
+ int limit = ARRLEN-1;
+ for (int i = limit; i >= 0; i-=1) {
+ a.set(i, c);
+ b.set((limit-i), d);
+ }
+ }
+ static void test_ci_off(AtomicIntegerArray a, int old) {
+ for (int i = 0; i < ARRLEN-OFFSET; i+=1) {
+ a.set((i+OFFSET), -123);
+ }
+ }
+ static void test_vi_off(AtomicIntegerArray a, int b, int old) {
+ for (int i = 0; i < ARRLEN-OFFSET; i+=1) {
+ a.set((i+OFFSET), b);
+ }
+ }
+ static void test_cp_off(AtomicIntegerArray a, AtomicIntegerArray b) {
+ for (int i = 0; i < ARRLEN-OFFSET; i+=1) {
+ a.set((i+OFFSET), b.get(i+OFFSET));
+ }
+ }
+ static void test_2ci_off(AtomicIntegerArray a, AtomicIntegerArray b) {
+ for (int i = 0; i < ARRLEN-OFFSET; i+=1) {
+ a.set((i+OFFSET), -123);
+ b.set((i+OFFSET), -103);
+ }
+ }
+ static void test_2vi_off(AtomicIntegerArray a, AtomicIntegerArray b, int c, int d) {
+ for (int i = 0; i < ARRLEN-OFFSET; i+=1) {
+ a.set((i+OFFSET), c);
+ b.set((i+OFFSET), d);
+ }
+ }
+ static void test_ci_inv(AtomicIntegerArray a, int k, int old) {
+ for (int i = 0; i < ARRLEN-k; i+=1) {
+ a.set((i+k),-123);
+ }
+ }
+ static void test_vi_inv(AtomicIntegerArray a, int b, int k, int old) {
+ for (int i = 0; i < ARRLEN-k; i+=1) {
+ a.set((i+k), b);
+ }
+ }
+ static void test_cp_inv(AtomicIntegerArray a, AtomicIntegerArray b, int k) {
+ for (int i = 0; i < ARRLEN-k; i+=1) {
+ a.set((i+k), b.get(i+k));
+ }
+ }
+ static void test_2ci_inv(AtomicIntegerArray a, AtomicIntegerArray b, int k) {
+ for (int i = 0; i < ARRLEN-k; i+=1) {
+ a.set((i+k), -123);
+ b.set((i+k), -103);
+ }
+ }
+ static void test_2vi_inv(AtomicIntegerArray a, AtomicIntegerArray b, int c, int d, int k) {
+ for (int i = 0; i < ARRLEN-k; i+=1) {
+ a.set((i+k), c);
+ b.set((i+k), d);
+ }
+ }
+ static void test_ci_scl(AtomicIntegerArray a, int old) {
+ for (int i = 0; i*SCALE < ARRLEN; i+=1) {
+ a.set((i*SCALE), -123);
+ }
+ }
+ static void test_vi_scl(AtomicIntegerArray a, int b, int old) {
+ for (int i = 0; i*SCALE < ARRLEN; i+=1) {
+ a.set((i*SCALE), b);
+ }
+ }
+ static void test_cp_scl(AtomicIntegerArray a, AtomicIntegerArray b) {
+ for (int i = 0; i*SCALE < ARRLEN; i+=1) {
+ a.set((i*SCALE), b.get(i*SCALE));
+ }
+ }
+ static void test_2ci_scl(AtomicIntegerArray a, AtomicIntegerArray b) {
+ for (int i = 0; i*SCALE < ARRLEN; i+=1) {
+ a.set((i*SCALE), -123);
+ b.set((i*SCALE), -103);
+ }
+ }
+ static void test_2vi_scl(AtomicIntegerArray a, AtomicIntegerArray b, int c, int d) {
+ for (int i = 0; i*SCALE < ARRLEN; i+=1) {
+ a.set((i*SCALE), c);
+ b.set((i*SCALE), d);
+ }
+ }
+ static void test_cp_alndst(AtomicIntegerArray a, AtomicIntegerArray b) {
+ for (int i = 0; i < ARRLEN-ALIGN_OFF; i+=1) {
+ a.set((i+ALIGN_OFF), b.get(i));
+ }
+ }
+ static void test_cp_alnsrc(AtomicIntegerArray a, AtomicIntegerArray b) {
+ for (int i = 0; i < ARRLEN-ALIGN_OFF; i+=1) {
+ a.set(i, b.get(i+ALIGN_OFF));
+ }
+ }
+ static void test_2ci_aln(AtomicIntegerArray a, AtomicIntegerArray b) {
+ for (int i = 0; i < ARRLEN-ALIGN_OFF; i+=1) {
+ a.set((i+ALIGN_OFF), -123);
+ b.set(i, -103);
+ }
+ }
+ static void test_2vi_aln(AtomicIntegerArray a, AtomicIntegerArray b, int c, int d) {
+ for (int i = 0; i < ARRLEN-ALIGN_OFF; i+=1) {
+ a.set(i, c);
+ b.set((i+ALIGN_OFF), d);
+ }
+ }
+ static void test_cp_unalndst(AtomicIntegerArray a, AtomicIntegerArray b) {
+ for (int i = 0; i < ARRLEN-UNALIGN_OFF; i+=1) {
+ a.set((i+UNALIGN_OFF), b.get(i));
+ }
+ }
+ static void test_cp_unalnsrc(AtomicIntegerArray a, AtomicIntegerArray b) {
+ for (int i = 0; i < ARRLEN-UNALIGN_OFF; i+=1) {
+ a.set(i, b.get(i+UNALIGN_OFF));
+ }
+ }
+ static void test_2ci_unaln(AtomicIntegerArray a, AtomicIntegerArray b) {
+ for (int i = 0; i < ARRLEN-UNALIGN_OFF; i+=1) {
+ a.set((i+UNALIGN_OFF), -123);
+ b.set(i, -103);
+ }
+ }
+ static void test_2vi_unaln(AtomicIntegerArray a, AtomicIntegerArray b, int c, int d) {
+ for (int i = 0; i < ARRLEN-UNALIGN_OFF; i+=1) {
+ a.set(i, c);
+ b.set((i+UNALIGN_OFF), d);
+ }
+ }
+
+ static int verify(String text, int i, int elem, int val) {
+ if (elem != val) {
+ System.err.println(text + "[" + i + "] = " + elem + " != " + val);
+ return 1;
+ }
+ return 0;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/8004867/TestIntUnsafeCAS.java Tue Mar 05 11:49:33 2013 -0800
@@ -0,0 +1,998 @@
+/*
+ * Copyright (c) 2013, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/**
+ * @test
+ * @bug 8004867
+ * @summary VM crashing with assert "share/vm/opto/node.hpp:357 - assert(i < _max) failed: oob"
+ *
+ * @run main/othervm/timeout=300 -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation -XX:-OptimizeFill TestIntUnsafeCAS
+ * @run main/othervm/timeout=300 -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation -XX:+OptimizeFill TestIntUnsafeCAS
+ */
+
+import sun.misc.Unsafe;
+import java.lang.reflect.*;
+
+public class TestIntUnsafeCAS {
+ private static final int ARRLEN = 97;
+ private static final int ITERS = 11000;
+ private static final int OFFSET = 3;
+ private static final int SCALE = 2;
+ private static final int ALIGN_OFF = 8;
+ private static final int UNALIGN_OFF = 5;
+
+ private static final Unsafe unsafe;
+ private static final int BASE;
+ static {
+ try {
+ Class c = TestIntUnsafeCAS.class.getClassLoader().loadClass("sun.misc.Unsafe");
+ Field f = c.getDeclaredField("theUnsafe");
+ f.setAccessible(true);
+ unsafe = (Unsafe)f.get(c);
+ BASE = unsafe.arrayBaseOffset(int[].class);
+ } catch (Exception e) {
+ InternalError err = new InternalError();
+ err.initCause(e);
+ throw err;
+ }
+ }
+
+ public static void main(String args[]) {
+ System.out.println("Testing Integer array unsafe CAS operations");
+ int errn = test(false);
+ if (errn > 0) {
+ System.err.println("FAILED: " + errn + " errors");
+ System.exit(97);
+ }
+ System.out.println("PASSED");
+ }
+
+ static int test(boolean test_only) {
+ int[] a1 = new int[ARRLEN];
+ int[] a2 = new int[ARRLEN];
+ // Initialize
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ a2[i] = -1;
+ }
+ System.out.println("Warmup");
+ for (int i=0; i<ITERS; i++) {
+ test_ci(a1);
+ test_vi(a2, 123, -1);
+ test_cp(a1, a2);
+ test_2ci(a1, a2);
+ test_2vi(a1, a2, 123, 103);
+ test_ci_neg(a1, 123);
+ test_vi_neg(a2, 123, 103);
+ test_cp_neg(a1, a2);
+ test_2ci_neg(a1, a2);
+ test_2vi_neg(a1, a2, 123, 103);
+ test_ci_oppos(a1, 123);
+ test_vi_oppos(a2, 123, 103);
+ test_cp_oppos(a1, a2);
+ test_2ci_oppos(a1, a2);
+ test_2vi_oppos(a1, a2, 123, 103);
+ test_ci_off(a1, 123);
+ test_vi_off(a2, 123, 103);
+ test_cp_off(a1, a2);
+ test_2ci_off(a1, a2);
+ test_2vi_off(a1, a2, 123, 103);
+ test_ci_inv(a1, OFFSET, 123);
+ test_vi_inv(a2, 123, OFFSET, 103);
+ test_cp_inv(a1, a2, OFFSET);
+ test_2ci_inv(a1, a2, OFFSET);
+ test_2vi_inv(a1, a2, 123, 103, OFFSET);
+ test_ci_scl(a1, 123);
+ test_vi_scl(a2, 123, 103);
+ test_cp_scl(a1, a2);
+ test_2ci_scl(a1, a2);
+ test_2vi_scl(a1, a2, 123, 103);
+ test_cp_alndst(a1, a2);
+ test_cp_alnsrc(a1, a2);
+ test_2ci_aln(a1, a2);
+ test_2vi_aln(a1, a2, 123, 103);
+ test_cp_unalndst(a1, a2);
+ test_cp_unalnsrc(a1, a2);
+ test_2ci_unaln(a1, a2);
+ test_2vi_unaln(a1, a2, 123, 103);
+ }
+ // Initialize
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ a2[i] = -1;
+ }
+ // Test and verify results
+ System.out.println("Verification");
+ int errn = 0;
+ {
+ test_ci(a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_ci: a1", i, a1[i], -123);
+ }
+ test_vi(a2, 123, -1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_vi: a2", i, a2[i], 123);
+ }
+ test_cp(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_cp: a1", i, a1[i], 123);
+ }
+ test_2ci(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_2ci: a1", i, a1[i], -123);
+ errn += verify("test_2ci: a2", i, a2[i], -103);
+ }
+ test_2vi(a1, a2, 123, 103);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_2vi: a1", i, a1[i], 123);
+ errn += verify("test_2vi: a2", i, a2[i], 103);
+ }
+ // Reset for negative stride
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ a2[i] = -1;
+ }
+ test_ci_neg(a1, -1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_ci_neg: a1", i, a1[i], -123);
+ }
+ test_vi_neg(a2, 123, -1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_vi_neg: a2", i, a2[i], 123);
+ }
+ test_cp_neg(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_cp_neg: a1", i, a1[i], 123);
+ }
+ test_2ci_neg(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_2ci_neg: a1", i, a1[i], -123);
+ errn += verify("test_2ci_neg: a2", i, a2[i], -103);
+ }
+ test_2vi_neg(a1, a2, 123, 103);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_2vi_neg: a1", i, a1[i], 123);
+ errn += verify("test_2vi_neg: a2", i, a2[i], 103);
+ }
+ // Reset for opposite stride
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ a2[i] = -1;
+ }
+ test_ci_oppos(a1, -1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_ci_oppos: a1", i, a1[i], -123);
+ }
+ test_vi_oppos(a2, 123, -1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_vi_oppos: a2", i, a2[i], 123);
+ }
+ test_cp_oppos(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_cp_oppos: a1", i, a1[i], 123);
+ }
+ test_2ci_oppos(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_2ci_oppos: a1", i, a1[i], -123);
+ errn += verify("test_2ci_oppos: a2", i, a2[i], -103);
+ }
+ test_2vi_oppos(a1, a2, 123, 103);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_2vi_oppos: a1", i, a1[i], 123);
+ errn += verify("test_2vi_oppos: a2", i, a2[i], 103);
+ }
+ // Reset for indexing with offset
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ a2[i] = -1;
+ }
+ test_ci_off(a1, -1);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_ci_off: a1", i, a1[i], -123);
+ }
+ test_vi_off(a2, 123, -1);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_vi_off: a2", i, a2[i], 123);
+ }
+ test_cp_off(a1, a2);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_cp_off: a1", i, a1[i], 123);
+ }
+ test_2ci_off(a1, a2);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_2ci_off: a1", i, a1[i], -123);
+ errn += verify("test_2ci_off: a2", i, a2[i], -103);
+ }
+ test_2vi_off(a1, a2, 123, 103);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_2vi_off: a1", i, a1[i], 123);
+ errn += verify("test_2vi_off: a2", i, a2[i], 103);
+ }
+ for (int i=0; i<OFFSET; i++) {
+ errn += verify("test_2vi_off: a1", i, a1[i], -1);
+ errn += verify("test_2vi_off: a2", i, a2[i], -1);
+ }
+ // Reset for indexing with invariant offset
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ a2[i] = -1;
+ }
+ test_ci_inv(a1, OFFSET, -1);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_ci_inv: a1", i, a1[i], -123);
+ }
+ test_vi_inv(a2, 123, OFFSET, -1);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_vi_inv: a2", i, a2[i], 123);
+ }
+ test_cp_inv(a1, a2, OFFSET);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_cp_inv: a1", i, a1[i], 123);
+ }
+ test_2ci_inv(a1, a2, OFFSET);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_2ci_inv: a1", i, a1[i], -123);
+ errn += verify("test_2ci_inv: a2", i, a2[i], -103);
+ }
+ test_2vi_inv(a1, a2, 123, 103, OFFSET);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_2vi_inv: a1", i, a1[i], 123);
+ errn += verify("test_2vi_inv: a2", i, a2[i], 103);
+ }
+ for (int i=0; i<OFFSET; i++) {
+ errn += verify("test_2vi_inv: a1", i, a1[i], -1);
+ errn += verify("test_2vi_inv: a2", i, a2[i], -1);
+ }
+ // Reset for indexing with scale
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ a2[i] = -1;
+ }
+ test_ci_scl(a1, -1);
+ for (int i=0; i<ARRLEN; i++) {
+ int val = (i%SCALE != 0) ? -1 : -123;
+ errn += verify("test_ci_scl: a1", i, a1[i], val);
+ }
+ test_vi_scl(a2, 123, -1);
+ for (int i=0; i<ARRLEN; i++) {
+ int val = (i%SCALE != 0) ? -1 : 123;
+ errn += verify("test_vi_scl: a2", i, a2[i], val);
+ }
+ test_cp_scl(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ int val = (i%SCALE != 0) ? -1 : 123;
+ errn += verify("test_cp_scl: a1", i, a1[i], val);
+ }
+ test_2ci_scl(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ if (i%SCALE != 0) {
+ errn += verify("test_2ci_scl: a1", i, a1[i], -1);
+ } else if (i*SCALE < ARRLEN) {
+ errn += verify("test_2ci_scl: a1", i*SCALE, a1[i*SCALE], -123);
+ }
+ if (i%SCALE != 0) {
+ errn += verify("test_2ci_scl: a2", i, a2[i], -1);
+ } else if (i*SCALE < ARRLEN) {
+ errn += verify("test_2ci_scl: a2", i*SCALE, a2[i*SCALE], -103);
+ }
+ }
+ test_2vi_scl(a1, a2, 123, 103);
+ for (int i=0; i<ARRLEN; i++) {
+ if (i%SCALE != 0) {
+ errn += verify("test_2vi_scl: a1", i, a1[i], -1);
+ } else if (i*SCALE < ARRLEN) {
+ errn += verify("test_2vi_scl: a1", i*SCALE, a1[i*SCALE], 123);
+ }
+ if (i%SCALE != 0) {
+ errn += verify("test_2vi_scl: a2", i, a2[i], -1);
+ } else if (i*SCALE < ARRLEN) {
+ errn += verify("test_2vi_scl: a2", i*SCALE, a2[i*SCALE], 103);
+ }
+ }
+ // Reset for 2 arrays with relative aligned offset
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ a2[i] = -1;
+ }
+ test_vi(a2, 123, -1);
+ test_cp_alndst(a1, a2);
+ for (int i=0; i<ALIGN_OFF; i++) {
+ errn += verify("test_cp_alndst: a1", i, a1[i], -1);
+ }
+ for (int i=ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_cp_alndst: a1", i, a1[i], 123);
+ }
+ for (int i=0; i<ALIGN_OFF; i++) {
+ a1[i] = 123;
+ }
+ test_vi(a2, -123, 123);
+ test_cp_alnsrc(a1, a2);
+ for (int i=0; i<ARRLEN-ALIGN_OFF; i++) {
+ errn += verify("test_cp_alnsrc: a1", i, a1[i], -123);
+ }
+ for (int i=ARRLEN-ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_cp_alnsrc: a1", i, a1[i], 123);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ a2[i] = -1;
+ }
+ test_2ci_aln(a1, a2);
+ for (int i=0; i<ALIGN_OFF; i++) {
+ errn += verify("test_2ci_aln: a1", i, a1[i], -1);
+ }
+ for (int i=ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2ci_aln: a1", i, a1[i], -123);
+ }
+ for (int i=0; i<ARRLEN-ALIGN_OFF; i++) {
+ errn += verify("test_2ci_aln: a2", i, a2[i], -103);
+ }
+ for (int i=ARRLEN-ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2ci_aln: a2", i, a2[i], -1);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ a2[i] = -1;
+ }
+ test_2vi_aln(a1, a2, 123, 103);
+ for (int i=0; i<ARRLEN-ALIGN_OFF; i++) {
+ errn += verify("test_2vi_aln: a1", i, a1[i], 123);
+ }
+ for (int i=ARRLEN-ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2vi_aln: a1", i, a1[i], -1);
+ }
+ for (int i=0; i<ALIGN_OFF; i++) {
+ errn += verify("test_2vi_aln: a2", i, a2[i], -1);
+ }
+ for (int i=ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2vi_aln: a2", i, a2[i], 103);
+ }
+
+ // Reset for 2 arrays with relative unaligned offset
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ a2[i] = -1;
+ }
+ test_vi(a2, 123, -1);
+ test_cp_unalndst(a1, a2);
+ for (int i=0; i<UNALIGN_OFF; i++) {
+ errn += verify("test_cp_unalndst: a1", i, a1[i], -1);
+ }
+ for (int i=UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_cp_unalndst: a1", i, a1[i], 123);
+ }
+ test_vi(a2, -123, 123);
+ test_cp_unalnsrc(a1, a2);
+ for (int i=0; i<ARRLEN-UNALIGN_OFF; i++) {
+ errn += verify("test_cp_unalnsrc: a1", i, a1[i], -123);
+ }
+ for (int i=ARRLEN-UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_cp_unalnsrc: a1", i, a1[i], 123);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ a2[i] = -1;
+ }
+ test_2ci_unaln(a1, a2);
+ for (int i=0; i<UNALIGN_OFF; i++) {
+ errn += verify("test_2ci_unaln: a1", i, a1[i], -1);
+ }
+ for (int i=UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2ci_unaln: a1", i, a1[i], -123);
+ }
+ for (int i=0; i<ARRLEN-UNALIGN_OFF; i++) {
+ errn += verify("test_2ci_unaln: a2", i, a2[i], -103);
+ }
+ for (int i=ARRLEN-UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2ci_unaln: a2", i, a2[i], -1);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ a2[i] = -1;
+ }
+ test_2vi_unaln(a1, a2, 123, 103);
+ for (int i=0; i<ARRLEN-UNALIGN_OFF; i++) {
+ errn += verify("test_2vi_unaln: a1", i, a1[i], 123);
+ }
+ for (int i=ARRLEN-UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2vi_unaln: a1", i, a1[i], -1);
+ }
+ for (int i=0; i<UNALIGN_OFF; i++) {
+ errn += verify("test_2vi_unaln: a2", i, a2[i], -1);
+ }
+ for (int i=UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2vi_unaln: a2", i, a2[i], 103);
+ }
+
+ // Reset for aligned overlap initialization
+ for (int i=0; i<ALIGN_OFF; i++) {
+ a1[i] = i;
+ }
+ for (int i=ALIGN_OFF; i<ARRLEN; i++) {
+ a1[i] = -1;
+ }
+ test_cp_alndst(a1, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ int v = i%ALIGN_OFF;
+ errn += verify("test_cp_alndst_overlap: a1", i, a1[i], v);
+ }
+ for (int i=0; i<ALIGN_OFF; i++) {
+ a1[i+ALIGN_OFF] = -1;
+ }
+ test_cp_alnsrc(a1, a1);
+ for (int i=0; i<ALIGN_OFF; i++) {
+ errn += verify("test_cp_alnsrc_overlap: a1", i, a1[i], -1);
+ }
+ for (int i=ALIGN_OFF; i<ARRLEN; i++) {
+ int v = i%ALIGN_OFF;
+ errn += verify("test_cp_alnsrc_overlap: a1", i, a1[i], v);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ }
+ test_2ci_aln(a1, a1);
+ for (int i=0; i<ARRLEN-ALIGN_OFF; i++) {
+ errn += verify("test_2ci_aln_overlap: a1", i, a1[i], -103);
+ }
+ for (int i=ARRLEN-ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2ci_aln_overlap: a1", i, a1[i], -123);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ }
+ test_2vi_aln(a1, a1, 123, 103);
+ for (int i=0; i<ARRLEN-ALIGN_OFF; i++) {
+ errn += verify("test_2vi_aln_overlap: a1", i, a1[i], 123);
+ }
+ for (int i=ARRLEN-ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2vi_aln_overlap: a1", i, a1[i], 103);
+ }
+
+ // Reset for unaligned overlap initialization
+ for (int i=0; i<UNALIGN_OFF; i++) {
+ a1[i] = i;
+ }
+ for (int i=UNALIGN_OFF; i<ARRLEN; i++) {
+ a1[i] = -1;
+ }
+ test_cp_unalndst(a1, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ int v = i%UNALIGN_OFF;
+ errn += verify("test_cp_unalndst_overlap: a1", i, a1[i], v);
+ }
+ for (int i=0; i<UNALIGN_OFF; i++) {
+ a1[i+UNALIGN_OFF] = -1;
+ }
+ test_cp_unalnsrc(a1, a1);
+ for (int i=0; i<UNALIGN_OFF; i++) {
+ errn += verify("test_cp_unalnsrc_overlap: a1", i, a1[i], -1);
+ }
+ for (int i=UNALIGN_OFF; i<ARRLEN; i++) {
+ int v = i%UNALIGN_OFF;
+ errn += verify("test_cp_unalnsrc_overlap: a1", i, a1[i], v);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ }
+ test_2ci_unaln(a1, a1);
+ for (int i=0; i<ARRLEN-UNALIGN_OFF; i++) {
+ errn += verify("test_2ci_unaln_overlap: a1", i, a1[i], -103);
+ }
+ for (int i=ARRLEN-UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2ci_unaln_overlap: a1", i, a1[i], -123);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ }
+ test_2vi_unaln(a1, a1, 123, 103);
+ for (int i=0; i<ARRLEN-UNALIGN_OFF; i++) {
+ errn += verify("test_2vi_unaln_overlap: a1", i, a1[i], 123);
+ }
+ for (int i=ARRLEN-UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2vi_unaln_overlap: a1", i, a1[i], 103);
+ }
+
+ }
+
+ if (errn > 0 || test_only)
+ return errn;
+
+ // Initialize
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ a2[i] = -1;
+ }
+ System.out.println("Time");
+ long start, end;
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_ci(a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_ci: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_vi(a2, 123, -1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_vi: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi(a1, a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_ci_neg(a1, 123);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_ci_neg: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_vi_neg(a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_vi_neg: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_neg(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_neg: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci_neg(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci_neg: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi_neg(a1, a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi_neg: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_ci_oppos(a1, 123);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_ci_oppos: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_vi_oppos(a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_vi_oppos: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_oppos(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_oppos: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci_oppos(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci_oppos: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi_oppos(a1, a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi_oppos: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_ci_off(a1, 123);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_ci_off: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_vi_off(a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_vi_off: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_off(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_off: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci_off(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci_off: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi_off(a1, a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi_off: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_ci_inv(a1, OFFSET, 123);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_ci_inv: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_vi_inv(a2, 123, OFFSET, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_vi_inv: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_inv(a1, a2, OFFSET);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_inv: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci_inv(a1, a2, OFFSET);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci_inv: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi_inv(a1, a2, 123, 103, OFFSET);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi_inv: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_ci_scl(a1, 123);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_ci_scl: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_vi_scl(a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_vi_scl: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_scl(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_scl: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci_scl(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci_scl: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi_scl(a1, a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi_scl: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_alndst(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_alndst: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_alnsrc(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_alnsrc: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci_aln(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci_aln: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi_aln(a1, a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi_aln: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_unalndst(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_unalndst: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_unalnsrc(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_unalnsrc: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci_unaln(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci_unaln: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi_unaln(a1, a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi_unaln: " + (end - start));
+
+ return errn;
+ }
+
+ private final static long byte_offset(int i) {
+ return ((long)i << 2) + BASE;
+ }
+
+ static void test_ci(int[] a) {
+ for (int i = 0; i < ARRLEN; i+=1) {
+ unsafe.compareAndSwapInt(a, byte_offset(i), -1, -123);
+ }
+ }
+ static void test_vi(int[] a, int b, int old) {
+ for (int i = 0; i < ARRLEN; i+=1) {
+ unsafe.compareAndSwapInt(a, byte_offset(i), old, b);
+ }
+ }
+ static void test_cp(int[] a, int[] b) {
+ for (int i = 0; i < ARRLEN; i+=1) {
+ unsafe.compareAndSwapInt(a, byte_offset(i), -123, b[i]);
+ }
+ }
+ static void test_2ci(int[] a, int[] b) {
+ for (int i = 0; i < ARRLEN; i+=1) {
+ unsafe.compareAndSwapInt(a, byte_offset(i), 123, -123);
+ unsafe.compareAndSwapInt(b, byte_offset(i), 123, -103);
+ }
+ }
+ static void test_2vi(int[] a, int[] b, int c, int d) {
+ for (int i = 0; i < ARRLEN; i+=1) {
+ unsafe.compareAndSwapInt(a, byte_offset(i), -123, c);
+ unsafe.compareAndSwapInt(b, byte_offset(i), -103, d);
+ }
+ }
+ static void test_ci_neg(int[] a, int old) {
+ for (int i = ARRLEN-1; i >= 0; i-=1) {
+ unsafe.compareAndSwapInt(a, byte_offset(i), old, -123);
+ }
+ }
+ static void test_vi_neg(int[] a, int b, int old) {
+ for (int i = ARRLEN-1; i >= 0; i-=1) {
+ unsafe.compareAndSwapInt(a, byte_offset(i), old, b);
+ }
+ }
+ static void test_cp_neg(int[] a, int[] b) {
+ for (int i = ARRLEN-1; i >= 0; i-=1) {
+ unsafe.compareAndSwapInt(a, byte_offset(i), -123, b[i]);
+ }
+ }
+ static void test_2ci_neg(int[] a, int[] b) {
+ for (int i = ARRLEN-1; i >= 0; i-=1) {
+ unsafe.compareAndSwapInt(a, byte_offset(i), 123, -123);
+ unsafe.compareAndSwapInt(b, byte_offset(i), 123, -103);
+ }
+ }
+ static void test_2vi_neg(int[] a, int[] b, int c, int d) {
+ for (int i = ARRLEN-1; i >= 0; i-=1) {
+ unsafe.compareAndSwapInt(a, byte_offset(i), -123, c);
+ unsafe.compareAndSwapInt(b, byte_offset(i), -103, d);
+ }
+ }
+ static void test_ci_oppos(int[] a, int old) {
+ int limit = ARRLEN-1;
+ for (int i = 0; i < ARRLEN; i+=1) {
+ unsafe.compareAndSwapInt(a, byte_offset(limit-i), old, -123);
+ }
+ }
+ static void test_vi_oppos(int[] a, int b, int old) {
+ int limit = ARRLEN-1;
+ for (int i = limit; i >= 0; i-=1) {
+ unsafe.compareAndSwapInt(a, byte_offset(limit-i), old, b);
+ }
+ }
+ static void test_cp_oppos(int[] a, int[] b) {
+ int limit = ARRLEN-1;
+ for (int i = 0; i < ARRLEN; i+=1) {
+ unsafe.compareAndSwapInt(a, byte_offset(i), -123, b[limit-i]);
+ }
+ }
+ static void test_2ci_oppos(int[] a, int[] b) {
+ int limit = ARRLEN-1;
+ for (int i = 0; i < ARRLEN; i+=1) {
+ unsafe.compareAndSwapInt(a, byte_offset(limit-i), 123, -123);
+ unsafe.compareAndSwapInt(b, byte_offset(i), 123, -103);
+ }
+ }
+ static void test_2vi_oppos(int[] a, int[] b, int c, int d) {
+ int limit = ARRLEN-1;
+ for (int i = limit; i >= 0; i-=1) {
+ unsafe.compareAndSwapInt(a, byte_offset(i), -123, c);
+ unsafe.compareAndSwapInt(b, byte_offset(limit-i), -103, d);
+ }
+ }
+ static void test_ci_off(int[] a, int old) {
+ for (int i = 0; i < ARRLEN-OFFSET; i+=1) {
+ unsafe.compareAndSwapInt(a, byte_offset(i+OFFSET), old, -123);
+ }
+ }
+ static void test_vi_off(int[] a, int b, int old) {
+ for (int i = 0; i < ARRLEN-OFFSET; i+=1) {
+ unsafe.compareAndSwapInt(a, byte_offset(i+OFFSET), old, b);
+ }
+ }
+ static void test_cp_off(int[] a, int[] b) {
+ for (int i = 0; i < ARRLEN-OFFSET; i+=1) {
+ unsafe.compareAndSwapInt(a, byte_offset(i+OFFSET), -123, b[i+OFFSET]);
+ }
+ }
+ static void test_2ci_off(int[] a, int[] b) {
+ for (int i = 0; i < ARRLEN-OFFSET; i+=1) {
+ unsafe.compareAndSwapInt(a, byte_offset(i+OFFSET), 123, -123);
+ unsafe.compareAndSwapInt(b, byte_offset(i+OFFSET), 123, -103);
+ }
+ }
+ static void test_2vi_off(int[] a, int[] b, int c, int d) {
+ for (int i = 0; i < ARRLEN-OFFSET; i+=1) {
+ unsafe.compareAndSwapInt(a, byte_offset(i+OFFSET), -123, c);
+ unsafe.compareAndSwapInt(b, byte_offset(i+OFFSET), -103, d);
+ }
+ }
+ static void test_ci_inv(int[] a, int k, int old) {
+ for (int i = 0; i < ARRLEN-k; i+=1) {
+ unsafe.compareAndSwapInt(a, byte_offset(i+k), old, -123);
+ }
+ }
+ static void test_vi_inv(int[] a, int b, int k, int old) {
+ for (int i = 0; i < ARRLEN-k; i+=1) {
+ unsafe.compareAndSwapInt(a, byte_offset(i+k), old, b);
+ }
+ }
+ static void test_cp_inv(int[] a, int[] b, int k) {
+ for (int i = 0; i < ARRLEN-k; i+=1) {
+ unsafe.compareAndSwapInt(a, byte_offset(i+k), -123, b[i+k]);
+ }
+ }
+ static void test_2ci_inv(int[] a, int[] b, int k) {
+ for (int i = 0; i < ARRLEN-k; i+=1) {
+ unsafe.compareAndSwapInt(a, byte_offset(i+k), 123, -123);
+ unsafe.compareAndSwapInt(b, byte_offset(i+k), 123, -103);
+ }
+ }
+ static void test_2vi_inv(int[] a, int[] b, int c, int d, int k) {
+ for (int i = 0; i < ARRLEN-k; i+=1) {
+ unsafe.compareAndSwapInt(a, byte_offset(i+k), -123, c);
+ unsafe.compareAndSwapInt(b, byte_offset(i+k), -103, d);
+ }
+ }
+ static void test_ci_scl(int[] a, int old) {
+ for (int i = 0; i*SCALE < ARRLEN; i+=1) {
+ unsafe.compareAndSwapInt(a, byte_offset(i*SCALE), old, -123);
+ }
+ }
+ static void test_vi_scl(int[] a, int b, int old) {
+ for (int i = 0; i*SCALE < ARRLEN; i+=1) {
+ unsafe.compareAndSwapInt(a, byte_offset(i*SCALE), old, b);
+ }
+ }
+ static void test_cp_scl(int[] a, int[] b) {
+ for (int i = 0; i*SCALE < ARRLEN; i+=1) {
+ unsafe.compareAndSwapInt(a, byte_offset(i*SCALE), -123, b[i*SCALE]);
+ }
+ }
+ static void test_2ci_scl(int[] a, int[] b) {
+ for (int i = 0; i*SCALE < ARRLEN; i+=1) {
+ unsafe.compareAndSwapInt(a, byte_offset(i*SCALE), 123, -123);
+ unsafe.compareAndSwapInt(b, byte_offset(i*SCALE), 123, -103);
+ }
+ }
+ static void test_2vi_scl(int[] a, int[] b, int c, int d) {
+ for (int i = 0; i*SCALE < ARRLEN; i+=1) {
+ unsafe.compareAndSwapInt(a, byte_offset(i*SCALE), -123, c);
+ unsafe.compareAndSwapInt(b, byte_offset(i*SCALE), -103, d);
+ }
+ }
+ static void test_cp_alndst(int[] a, int[] b) {
+ for (int i = 0; i < ARRLEN-ALIGN_OFF; i+=1) {
+ unsafe.compareAndSwapInt(a, byte_offset(i+ALIGN_OFF), -1, b[i]);
+ }
+ }
+ static void test_cp_alnsrc(int[] a, int[] b) {
+ for (int i = 0; i < ARRLEN-ALIGN_OFF; i+=1) {
+ int old = unsafe.getIntVolatile(a, byte_offset(i));
+ unsafe.compareAndSwapInt(a, byte_offset(i), old, b[i+ALIGN_OFF]);
+ }
+ }
+ static void test_2ci_aln(int[] a, int[] b) {
+ for (int i = 0; i < ARRLEN-ALIGN_OFF; i+=1) {
+ unsafe.compareAndSwapInt(a, byte_offset(i+ALIGN_OFF), -1, -123);
+ int old = unsafe.getIntVolatile(b, byte_offset(i));
+ unsafe.compareAndSwapInt(b, byte_offset(i), old, -103);
+ }
+ }
+ static void test_2vi_aln(int[] a, int[] b, int c, int d) {
+ for (int i = 0; i < ARRLEN-ALIGN_OFF; i+=1) {
+ int old = unsafe.getIntVolatile(a, byte_offset(i));
+ unsafe.compareAndSwapInt(a, byte_offset(i), old, c);
+ old = unsafe.getIntVolatile(b, byte_offset(i+ALIGN_OFF));
+ unsafe.compareAndSwapInt(b, byte_offset(i+ALIGN_OFF), old, d);
+ }
+ }
+ static void test_cp_unalndst(int[] a, int[] b) {
+ for (int i = 0; i < ARRLEN-UNALIGN_OFF; i+=1) {
+ unsafe.compareAndSwapInt(a, byte_offset(i+UNALIGN_OFF), -1, b[i]);
+ }
+ }
+ static void test_cp_unalnsrc(int[] a, int[] b) {
+ for (int i = 0; i < ARRLEN-UNALIGN_OFF; i+=1) {
+ int old = unsafe.getIntVolatile(a, byte_offset(i));
+ unsafe.compareAndSwapInt(a, byte_offset(i), old, b[i+UNALIGN_OFF]);
+ }
+ }
+ static void test_2ci_unaln(int[] a, int[] b) {
+ for (int i = 0; i < ARRLEN-UNALIGN_OFF; i+=1) {
+ unsafe.compareAndSwapInt(a, byte_offset(i+UNALIGN_OFF), -1, -123);
+ int old = unsafe.getIntVolatile(b, byte_offset(i));
+ unsafe.compareAndSwapInt(b, byte_offset(i), old, -103);
+ }
+ }
+ static void test_2vi_unaln(int[] a, int[] b, int c, int d) {
+ for (int i = 0; i < ARRLEN-UNALIGN_OFF; i+=1) {
+ int old = unsafe.getIntVolatile(a, byte_offset(i));
+ unsafe.compareAndSwapInt(a, byte_offset(i), old, c);
+ old = unsafe.getIntVolatile(b, byte_offset(i+UNALIGN_OFF));
+ unsafe.compareAndSwapInt(b, byte_offset(i+UNALIGN_OFF), old, d);
+ }
+ }
+
+ static int verify(String text, int i, int elem, int val) {
+ if (elem != val) {
+ System.err.println(text + "[" + i + "] = " + elem + " != " + val);
+ return 1;
+ }
+ return 0;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/8004867/TestIntUnsafeOrdered.java Tue Mar 05 11:49:33 2013 -0800
@@ -0,0 +1,990 @@
+/*
+ * Copyright (c) 2013, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/**
+ * @test
+ * @bug 8004867
+ * @summary VM crashing with assert "share/vm/opto/node.hpp:357 - assert(i < _max) failed: oob"
+ *
+ * @run main/othervm/timeout=300 -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation -XX:-OptimizeFill TestIntUnsafeOrdered
+ * @run main/othervm/timeout=300 -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation -XX:+OptimizeFill TestIntUnsafeOrdered
+ */
+
+import sun.misc.Unsafe;
+import java.lang.reflect.*;
+
+public class TestIntUnsafeOrdered {
+ private static final int ARRLEN = 97;
+ private static final int ITERS = 11000;
+ private static final int OFFSET = 3;
+ private static final int SCALE = 2;
+ private static final int ALIGN_OFF = 8;
+ private static final int UNALIGN_OFF = 5;
+
+ private static final Unsafe unsafe;
+ private static final int BASE;
+ static {
+ try {
+ Class c = TestIntUnsafeOrdered.class.getClassLoader().loadClass("sun.misc.Unsafe");
+ Field f = c.getDeclaredField("theUnsafe");
+ f.setAccessible(true);
+ unsafe = (Unsafe)f.get(c);
+ BASE = unsafe.arrayBaseOffset(int[].class);
+ } catch (Exception e) {
+ InternalError err = new InternalError();
+ err.initCause(e);
+ throw err;
+ }
+ }
+
+ public static void main(String args[]) {
+ System.out.println("Testing Integer array unsafe ordered operations");
+ int errn = test(false);
+ if (errn > 0) {
+ System.err.println("FAILED: " + errn + " errors");
+ System.exit(97);
+ }
+ System.out.println("PASSED");
+ }
+
+ static int test(boolean test_only) {
+ int[] a1 = new int[ARRLEN];
+ int[] a2 = new int[ARRLEN];
+ // Initialize
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ a2[i] = -1;
+ }
+ System.out.println("Warmup");
+ for (int i=0; i<ITERS; i++) {
+ test_ci(a1);
+ test_vi(a2, 123, -1);
+ test_cp(a1, a2);
+ test_2ci(a1, a2);
+ test_2vi(a1, a2, 123, 103);
+ test_ci_neg(a1, 123);
+ test_vi_neg(a2, 123, 103);
+ test_cp_neg(a1, a2);
+ test_2ci_neg(a1, a2);
+ test_2vi_neg(a1, a2, 123, 103);
+ test_ci_oppos(a1, 123);
+ test_vi_oppos(a2, 123, 103);
+ test_cp_oppos(a1, a2);
+ test_2ci_oppos(a1, a2);
+ test_2vi_oppos(a1, a2, 123, 103);
+ test_ci_off(a1, 123);
+ test_vi_off(a2, 123, 103);
+ test_cp_off(a1, a2);
+ test_2ci_off(a1, a2);
+ test_2vi_off(a1, a2, 123, 103);
+ test_ci_inv(a1, OFFSET, 123);
+ test_vi_inv(a2, 123, OFFSET, 103);
+ test_cp_inv(a1, a2, OFFSET);
+ test_2ci_inv(a1, a2, OFFSET);
+ test_2vi_inv(a1, a2, 123, 103, OFFSET);
+ test_ci_scl(a1, 123);
+ test_vi_scl(a2, 123, 103);
+ test_cp_scl(a1, a2);
+ test_2ci_scl(a1, a2);
+ test_2vi_scl(a1, a2, 123, 103);
+ test_cp_alndst(a1, a2);
+ test_cp_alnsrc(a1, a2);
+ test_2ci_aln(a1, a2);
+ test_2vi_aln(a1, a2, 123, 103);
+ test_cp_unalndst(a1, a2);
+ test_cp_unalnsrc(a1, a2);
+ test_2ci_unaln(a1, a2);
+ test_2vi_unaln(a1, a2, 123, 103);
+ }
+ // Initialize
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ a2[i] = -1;
+ }
+ // Test and verify results
+ System.out.println("Verification");
+ int errn = 0;
+ {
+ test_ci(a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_ci: a1", i, a1[i], -123);
+ }
+ test_vi(a2, 123, -1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_vi: a2", i, a2[i], 123);
+ }
+ test_cp(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_cp: a1", i, a1[i], 123);
+ }
+ test_2ci(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_2ci: a1", i, a1[i], -123);
+ errn += verify("test_2ci: a2", i, a2[i], -103);
+ }
+ test_2vi(a1, a2, 123, 103);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_2vi: a1", i, a1[i], 123);
+ errn += verify("test_2vi: a2", i, a2[i], 103);
+ }
+ // Reset for negative stride
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ a2[i] = -1;
+ }
+ test_ci_neg(a1, -1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_ci_neg: a1", i, a1[i], -123);
+ }
+ test_vi_neg(a2, 123, -1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_vi_neg: a2", i, a2[i], 123);
+ }
+ test_cp_neg(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_cp_neg: a1", i, a1[i], 123);
+ }
+ test_2ci_neg(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_2ci_neg: a1", i, a1[i], -123);
+ errn += verify("test_2ci_neg: a2", i, a2[i], -103);
+ }
+ test_2vi_neg(a1, a2, 123, 103);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_2vi_neg: a1", i, a1[i], 123);
+ errn += verify("test_2vi_neg: a2", i, a2[i], 103);
+ }
+ // Reset for opposite stride
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ a2[i] = -1;
+ }
+ test_ci_oppos(a1, -1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_ci_oppos: a1", i, a1[i], -123);
+ }
+ test_vi_oppos(a2, 123, -1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_vi_oppos: a2", i, a2[i], 123);
+ }
+ test_cp_oppos(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_cp_oppos: a1", i, a1[i], 123);
+ }
+ test_2ci_oppos(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_2ci_oppos: a1", i, a1[i], -123);
+ errn += verify("test_2ci_oppos: a2", i, a2[i], -103);
+ }
+ test_2vi_oppos(a1, a2, 123, 103);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_2vi_oppos: a1", i, a1[i], 123);
+ errn += verify("test_2vi_oppos: a2", i, a2[i], 103);
+ }
+ // Reset for indexing with offset
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ a2[i] = -1;
+ }
+ test_ci_off(a1, -1);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_ci_off: a1", i, a1[i], -123);
+ }
+ test_vi_off(a2, 123, -1);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_vi_off: a2", i, a2[i], 123);
+ }
+ test_cp_off(a1, a2);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_cp_off: a1", i, a1[i], 123);
+ }
+ test_2ci_off(a1, a2);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_2ci_off: a1", i, a1[i], -123);
+ errn += verify("test_2ci_off: a2", i, a2[i], -103);
+ }
+ test_2vi_off(a1, a2, 123, 103);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_2vi_off: a1", i, a1[i], 123);
+ errn += verify("test_2vi_off: a2", i, a2[i], 103);
+ }
+ for (int i=0; i<OFFSET; i++) {
+ errn += verify("test_2vi_off: a1", i, a1[i], -1);
+ errn += verify("test_2vi_off: a2", i, a2[i], -1);
+ }
+ // Reset for indexing with invariant offset
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ a2[i] = -1;
+ }
+ test_ci_inv(a1, OFFSET, -1);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_ci_inv: a1", i, a1[i], -123);
+ }
+ test_vi_inv(a2, 123, OFFSET, -1);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_vi_inv: a2", i, a2[i], 123);
+ }
+ test_cp_inv(a1, a2, OFFSET);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_cp_inv: a1", i, a1[i], 123);
+ }
+ test_2ci_inv(a1, a2, OFFSET);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_2ci_inv: a1", i, a1[i], -123);
+ errn += verify("test_2ci_inv: a2", i, a2[i], -103);
+ }
+ test_2vi_inv(a1, a2, 123, 103, OFFSET);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_2vi_inv: a1", i, a1[i], 123);
+ errn += verify("test_2vi_inv: a2", i, a2[i], 103);
+ }
+ for (int i=0; i<OFFSET; i++) {
+ errn += verify("test_2vi_inv: a1", i, a1[i], -1);
+ errn += verify("test_2vi_inv: a2", i, a2[i], -1);
+ }
+ // Reset for indexing with scale
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ a2[i] = -1;
+ }
+ test_ci_scl(a1, -1);
+ for (int i=0; i<ARRLEN; i++) {
+ int val = (i%SCALE != 0) ? -1 : -123;
+ errn += verify("test_ci_scl: a1", i, a1[i], val);
+ }
+ test_vi_scl(a2, 123, -1);
+ for (int i=0; i<ARRLEN; i++) {
+ int val = (i%SCALE != 0) ? -1 : 123;
+ errn += verify("test_vi_scl: a2", i, a2[i], val);
+ }
+ test_cp_scl(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ int val = (i%SCALE != 0) ? -1 : 123;
+ errn += verify("test_cp_scl: a1", i, a1[i], val);
+ }
+ test_2ci_scl(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ if (i%SCALE != 0) {
+ errn += verify("test_2ci_scl: a1", i, a1[i], -1);
+ } else if (i*SCALE < ARRLEN) {
+ errn += verify("test_2ci_scl: a1", i*SCALE, a1[i*SCALE], -123);
+ }
+ if (i%SCALE != 0) {
+ errn += verify("test_2ci_scl: a2", i, a2[i], -1);
+ } else if (i*SCALE < ARRLEN) {
+ errn += verify("test_2ci_scl: a2", i*SCALE, a2[i*SCALE], -103);
+ }
+ }
+ test_2vi_scl(a1, a2, 123, 103);
+ for (int i=0; i<ARRLEN; i++) {
+ if (i%SCALE != 0) {
+ errn += verify("test_2vi_scl: a1", i, a1[i], -1);
+ } else if (i*SCALE < ARRLEN) {
+ errn += verify("test_2vi_scl: a1", i*SCALE, a1[i*SCALE], 123);
+ }
+ if (i%SCALE != 0) {
+ errn += verify("test_2vi_scl: a2", i, a2[i], -1);
+ } else if (i*SCALE < ARRLEN) {
+ errn += verify("test_2vi_scl: a2", i*SCALE, a2[i*SCALE], 103);
+ }
+ }
+ // Reset for 2 arrays with relative aligned offset
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ a2[i] = -1;
+ }
+ test_vi(a2, 123, -1);
+ test_cp_alndst(a1, a2);
+ for (int i=0; i<ALIGN_OFF; i++) {
+ errn += verify("test_cp_alndst: a1", i, a1[i], -1);
+ }
+ for (int i=ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_cp_alndst: a1", i, a1[i], 123);
+ }
+ for (int i=0; i<ALIGN_OFF; i++) {
+ a1[i] = 123;
+ }
+ test_vi(a2, -123, 123);
+ test_cp_alnsrc(a1, a2);
+ for (int i=0; i<ARRLEN-ALIGN_OFF; i++) {
+ errn += verify("test_cp_alnsrc: a1", i, a1[i], -123);
+ }
+ for (int i=ARRLEN-ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_cp_alnsrc: a1", i, a1[i], 123);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ a2[i] = -1;
+ }
+ test_2ci_aln(a1, a2);
+ for (int i=0; i<ALIGN_OFF; i++) {
+ errn += verify("test_2ci_aln: a1", i, a1[i], -1);
+ }
+ for (int i=ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2ci_aln: a1", i, a1[i], -123);
+ }
+ for (int i=0; i<ARRLEN-ALIGN_OFF; i++) {
+ errn += verify("test_2ci_aln: a2", i, a2[i], -103);
+ }
+ for (int i=ARRLEN-ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2ci_aln: a2", i, a2[i], -1);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ a2[i] = -1;
+ }
+ test_2vi_aln(a1, a2, 123, 103);
+ for (int i=0; i<ARRLEN-ALIGN_OFF; i++) {
+ errn += verify("test_2vi_aln: a1", i, a1[i], 123);
+ }
+ for (int i=ARRLEN-ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2vi_aln: a1", i, a1[i], -1);
+ }
+ for (int i=0; i<ALIGN_OFF; i++) {
+ errn += verify("test_2vi_aln: a2", i, a2[i], -1);
+ }
+ for (int i=ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2vi_aln: a2", i, a2[i], 103);
+ }
+
+ // Reset for 2 arrays with relative unaligned offset
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ a2[i] = -1;
+ }
+ test_vi(a2, 123, -1);
+ test_cp_unalndst(a1, a2);
+ for (int i=0; i<UNALIGN_OFF; i++) {
+ errn += verify("test_cp_unalndst: a1", i, a1[i], -1);
+ }
+ for (int i=UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_cp_unalndst: a1", i, a1[i], 123);
+ }
+ test_vi(a2, -123, 123);
+ test_cp_unalnsrc(a1, a2);
+ for (int i=0; i<ARRLEN-UNALIGN_OFF; i++) {
+ errn += verify("test_cp_unalnsrc: a1", i, a1[i], -123);
+ }
+ for (int i=ARRLEN-UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_cp_unalnsrc: a1", i, a1[i], 123);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ a2[i] = -1;
+ }
+ test_2ci_unaln(a1, a2);
+ for (int i=0; i<UNALIGN_OFF; i++) {
+ errn += verify("test_2ci_unaln: a1", i, a1[i], -1);
+ }
+ for (int i=UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2ci_unaln: a1", i, a1[i], -123);
+ }
+ for (int i=0; i<ARRLEN-UNALIGN_OFF; i++) {
+ errn += verify("test_2ci_unaln: a2", i, a2[i], -103);
+ }
+ for (int i=ARRLEN-UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2ci_unaln: a2", i, a2[i], -1);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ a2[i] = -1;
+ }
+ test_2vi_unaln(a1, a2, 123, 103);
+ for (int i=0; i<ARRLEN-UNALIGN_OFF; i++) {
+ errn += verify("test_2vi_unaln: a1", i, a1[i], 123);
+ }
+ for (int i=ARRLEN-UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2vi_unaln: a1", i, a1[i], -1);
+ }
+ for (int i=0; i<UNALIGN_OFF; i++) {
+ errn += verify("test_2vi_unaln: a2", i, a2[i], -1);
+ }
+ for (int i=UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2vi_unaln: a2", i, a2[i], 103);
+ }
+
+ // Reset for aligned overlap initialization
+ for (int i=0; i<ALIGN_OFF; i++) {
+ a1[i] = i;
+ }
+ for (int i=ALIGN_OFF; i<ARRLEN; i++) {
+ a1[i] = -1;
+ }
+ test_cp_alndst(a1, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ int v = i%ALIGN_OFF;
+ errn += verify("test_cp_alndst_overlap: a1", i, a1[i], v);
+ }
+ for (int i=0; i<ALIGN_OFF; i++) {
+ a1[i+ALIGN_OFF] = -1;
+ }
+ test_cp_alnsrc(a1, a1);
+ for (int i=0; i<ALIGN_OFF; i++) {
+ errn += verify("test_cp_alnsrc_overlap: a1", i, a1[i], -1);
+ }
+ for (int i=ALIGN_OFF; i<ARRLEN; i++) {
+ int v = i%ALIGN_OFF;
+ errn += verify("test_cp_alnsrc_overlap: a1", i, a1[i], v);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ }
+ test_2ci_aln(a1, a1);
+ for (int i=0; i<ARRLEN-ALIGN_OFF; i++) {
+ errn += verify("test_2ci_aln_overlap: a1", i, a1[i], -103);
+ }
+ for (int i=ARRLEN-ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2ci_aln_overlap: a1", i, a1[i], -123);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ }
+ test_2vi_aln(a1, a1, 123, 103);
+ for (int i=0; i<ARRLEN-ALIGN_OFF; i++) {
+ errn += verify("test_2vi_aln_overlap: a1", i, a1[i], 123);
+ }
+ for (int i=ARRLEN-ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2vi_aln_overlap: a1", i, a1[i], 103);
+ }
+
+ // Reset for unaligned overlap initialization
+ for (int i=0; i<UNALIGN_OFF; i++) {
+ a1[i] = i;
+ }
+ for (int i=UNALIGN_OFF; i<ARRLEN; i++) {
+ a1[i] = -1;
+ }
+ test_cp_unalndst(a1, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ int v = i%UNALIGN_OFF;
+ errn += verify("test_cp_unalndst_overlap: a1", i, a1[i], v);
+ }
+ for (int i=0; i<UNALIGN_OFF; i++) {
+ a1[i+UNALIGN_OFF] = -1;
+ }
+ test_cp_unalnsrc(a1, a1);
+ for (int i=0; i<UNALIGN_OFF; i++) {
+ errn += verify("test_cp_unalnsrc_overlap: a1", i, a1[i], -1);
+ }
+ for (int i=UNALIGN_OFF; i<ARRLEN; i++) {
+ int v = i%UNALIGN_OFF;
+ errn += verify("test_cp_unalnsrc_overlap: a1", i, a1[i], v);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ }
+ test_2ci_unaln(a1, a1);
+ for (int i=0; i<ARRLEN-UNALIGN_OFF; i++) {
+ errn += verify("test_2ci_unaln_overlap: a1", i, a1[i], -103);
+ }
+ for (int i=ARRLEN-UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2ci_unaln_overlap: a1", i, a1[i], -123);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ }
+ test_2vi_unaln(a1, a1, 123, 103);
+ for (int i=0; i<ARRLEN-UNALIGN_OFF; i++) {
+ errn += verify("test_2vi_unaln_overlap: a1", i, a1[i], 123);
+ }
+ for (int i=ARRLEN-UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2vi_unaln_overlap: a1", i, a1[i], 103);
+ }
+
+ }
+
+ if (errn > 0 || test_only)
+ return errn;
+
+ // Initialize
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ a2[i] = -1;
+ }
+ System.out.println("Time");
+ long start, end;
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_ci(a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_ci: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_vi(a2, 123, -1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_vi: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi(a1, a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_ci_neg(a1, 123);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_ci_neg: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_vi_neg(a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_vi_neg: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_neg(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_neg: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci_neg(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci_neg: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi_neg(a1, a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi_neg: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_ci_oppos(a1, 123);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_ci_oppos: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_vi_oppos(a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_vi_oppos: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_oppos(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_oppos: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci_oppos(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci_oppos: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi_oppos(a1, a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi_oppos: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_ci_off(a1, 123);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_ci_off: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_vi_off(a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_vi_off: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_off(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_off: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci_off(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci_off: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi_off(a1, a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi_off: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_ci_inv(a1, OFFSET, 123);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_ci_inv: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_vi_inv(a2, 123, OFFSET, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_vi_inv: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_inv(a1, a2, OFFSET);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_inv: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci_inv(a1, a2, OFFSET);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci_inv: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi_inv(a1, a2, 123, 103, OFFSET);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi_inv: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_ci_scl(a1, 123);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_ci_scl: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_vi_scl(a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_vi_scl: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_scl(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_scl: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci_scl(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci_scl: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi_scl(a1, a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi_scl: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_alndst(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_alndst: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_alnsrc(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_alnsrc: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci_aln(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci_aln: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi_aln(a1, a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi_aln: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_unalndst(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_unalndst: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_unalnsrc(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_unalnsrc: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci_unaln(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci_unaln: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi_unaln(a1, a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi_unaln: " + (end - start));
+
+ return errn;
+ }
+
+ private final static long byte_offset(int i) {
+ return ((long)i << 2) + BASE;
+ }
+
+ static void test_ci(int[] a) {
+ for (int i = 0; i < ARRLEN; i+=1) {
+ unsafe.putOrderedInt(a, byte_offset(i), -123);
+ }
+ }
+ static void test_vi(int[] a, int b, int old) {
+ for (int i = 0; i < ARRLEN; i+=1) {
+ unsafe.putOrderedInt(a, byte_offset(i), b);
+ }
+ }
+ static void test_cp(int[] a, int[] b) {
+ for (int i = 0; i < ARRLEN; i+=1) {
+ unsafe.putOrderedInt(a, byte_offset(i), b[i]);
+ }
+ }
+ static void test_2ci(int[] a, int[] b) {
+ for (int i = 0; i < ARRLEN; i+=1) {
+ unsafe.putOrderedInt(a, byte_offset(i), -123);
+ unsafe.putOrderedInt(b, byte_offset(i), -103);
+ }
+ }
+ static void test_2vi(int[] a, int[] b, int c, int d) {
+ for (int i = 0; i < ARRLEN; i+=1) {
+ unsafe.putOrderedInt(a, byte_offset(i), c);
+ unsafe.putOrderedInt(b, byte_offset(i), d);
+ }
+ }
+ static void test_ci_neg(int[] a, int old) {
+ for (int i = ARRLEN-1; i >= 0; i-=1) {
+ unsafe.putOrderedInt(a, byte_offset(i), -123);
+ }
+ }
+ static void test_vi_neg(int[] a, int b, int old) {
+ for (int i = ARRLEN-1; i >= 0; i-=1) {
+ unsafe.putOrderedInt(a, byte_offset(i), b);
+ }
+ }
+ static void test_cp_neg(int[] a, int[] b) {
+ for (int i = ARRLEN-1; i >= 0; i-=1) {
+ unsafe.putOrderedInt(a, byte_offset(i), b[i]);
+ }
+ }
+ static void test_2ci_neg(int[] a, int[] b) {
+ for (int i = ARRLEN-1; i >= 0; i-=1) {
+ unsafe.putOrderedInt(a, byte_offset(i), -123);
+ unsafe.putOrderedInt(b, byte_offset(i), -103);
+ }
+ }
+ static void test_2vi_neg(int[] a, int[] b, int c, int d) {
+ for (int i = ARRLEN-1; i >= 0; i-=1) {
+ unsafe.putOrderedInt(a, byte_offset(i), c);
+ unsafe.putOrderedInt(b, byte_offset(i), d);
+ }
+ }
+ static void test_ci_oppos(int[] a, int old) {
+ int limit = ARRLEN-1;
+ for (int i = 0; i < ARRLEN; i+=1) {
+ unsafe.putOrderedInt(a, byte_offset(limit-i), -123);
+ }
+ }
+ static void test_vi_oppos(int[] a, int b, int old) {
+ int limit = ARRLEN-1;
+ for (int i = limit; i >= 0; i-=1) {
+ unsafe.putOrderedInt(a, byte_offset(limit-i), b);
+ }
+ }
+ static void test_cp_oppos(int[] a, int[] b) {
+ int limit = ARRLEN-1;
+ for (int i = 0; i < ARRLEN; i+=1) {
+ unsafe.putOrderedInt(a, byte_offset(i), b[limit-i]);
+ }
+ }
+ static void test_2ci_oppos(int[] a, int[] b) {
+ int limit = ARRLEN-1;
+ for (int i = 0; i < ARRLEN; i+=1) {
+ unsafe.putOrderedInt(a, byte_offset(limit-i), -123);
+ unsafe.putOrderedInt(b, byte_offset(i), -103);
+ }
+ }
+ static void test_2vi_oppos(int[] a, int[] b, int c, int d) {
+ int limit = ARRLEN-1;
+ for (int i = limit; i >= 0; i-=1) {
+ unsafe.putOrderedInt(a, byte_offset(i), c);
+ unsafe.putOrderedInt(b, byte_offset(limit-i), d);
+ }
+ }
+ static void test_ci_off(int[] a, int old) {
+ for (int i = 0; i < ARRLEN-OFFSET; i+=1) {
+ unsafe.putOrderedInt(a, byte_offset(i+OFFSET), -123);
+ }
+ }
+ static void test_vi_off(int[] a, int b, int old) {
+ for (int i = 0; i < ARRLEN-OFFSET; i+=1) {
+ unsafe.putOrderedInt(a, byte_offset(i+OFFSET), b);
+ }
+ }
+ static void test_cp_off(int[] a, int[] b) {
+ for (int i = 0; i < ARRLEN-OFFSET; i+=1) {
+ unsafe.putOrderedInt(a, byte_offset(i+OFFSET), b[i+OFFSET]);
+ }
+ }
+ static void test_2ci_off(int[] a, int[] b) {
+ for (int i = 0; i < ARRLEN-OFFSET; i+=1) {
+ unsafe.putOrderedInt(a, byte_offset(i+OFFSET), -123);
+ unsafe.putOrderedInt(b, byte_offset(i+OFFSET), -103);
+ }
+ }
+ static void test_2vi_off(int[] a, int[] b, int c, int d) {
+ for (int i = 0; i < ARRLEN-OFFSET; i+=1) {
+ unsafe.putOrderedInt(a, byte_offset(i+OFFSET), c);
+ unsafe.putOrderedInt(b, byte_offset(i+OFFSET), d);
+ }
+ }
+ static void test_ci_inv(int[] a, int k, int old) {
+ for (int i = 0; i < ARRLEN-k; i+=1) {
+ unsafe.putOrderedInt(a, byte_offset(i+k), -123);
+ }
+ }
+ static void test_vi_inv(int[] a, int b, int k, int old) {
+ for (int i = 0; i < ARRLEN-k; i+=1) {
+ unsafe.putOrderedInt(a, byte_offset(i+k), b);
+ }
+ }
+ static void test_cp_inv(int[] a, int[] b, int k) {
+ for (int i = 0; i < ARRLEN-k; i+=1) {
+ unsafe.putOrderedInt(a, byte_offset(i+k), b[i+k]);
+ }
+ }
+ static void test_2ci_inv(int[] a, int[] b, int k) {
+ for (int i = 0; i < ARRLEN-k; i+=1) {
+ unsafe.putOrderedInt(a, byte_offset(i+k), -123);
+ unsafe.putOrderedInt(b, byte_offset(i+k), -103);
+ }
+ }
+ static void test_2vi_inv(int[] a, int[] b, int c, int d, int k) {
+ for (int i = 0; i < ARRLEN-k; i+=1) {
+ unsafe.putOrderedInt(a, byte_offset(i+k), c);
+ unsafe.putOrderedInt(b, byte_offset(i+k), d);
+ }
+ }
+ static void test_ci_scl(int[] a, int old) {
+ for (int i = 0; i*SCALE < ARRLEN; i+=1) {
+ unsafe.putOrderedInt(a, byte_offset(i*SCALE), -123);
+ }
+ }
+ static void test_vi_scl(int[] a, int b, int old) {
+ for (int i = 0; i*SCALE < ARRLEN; i+=1) {
+ unsafe.putOrderedInt(a, byte_offset(i*SCALE), b);
+ }
+ }
+ static void test_cp_scl(int[] a, int[] b) {
+ for (int i = 0; i*SCALE < ARRLEN; i+=1) {
+ unsafe.putOrderedInt(a, byte_offset(i*SCALE), b[i*SCALE]);
+ }
+ }
+ static void test_2ci_scl(int[] a, int[] b) {
+ for (int i = 0; i*SCALE < ARRLEN; i+=1) {
+ unsafe.putOrderedInt(a, byte_offset(i*SCALE), -123);
+ unsafe.putOrderedInt(b, byte_offset(i*SCALE), -103);
+ }
+ }
+ static void test_2vi_scl(int[] a, int[] b, int c, int d) {
+ for (int i = 0; i*SCALE < ARRLEN; i+=1) {
+ unsafe.putOrderedInt(a, byte_offset(i*SCALE), c);
+ unsafe.putOrderedInt(b, byte_offset(i*SCALE), d);
+ }
+ }
+ static void test_cp_alndst(int[] a, int[] b) {
+ for (int i = 0; i < ARRLEN-ALIGN_OFF; i+=1) {
+ unsafe.putOrderedInt(a, byte_offset(i+ALIGN_OFF), b[i]);
+ }
+ }
+ static void test_cp_alnsrc(int[] a, int[] b) {
+ for (int i = 0; i < ARRLEN-ALIGN_OFF; i+=1) {
+ unsafe.putOrderedInt(a, byte_offset(i), b[i+ALIGN_OFF]);
+ }
+ }
+ static void test_2ci_aln(int[] a, int[] b) {
+ for (int i = 0; i < ARRLEN-ALIGN_OFF; i+=1) {
+ unsafe.putOrderedInt(a, byte_offset(i+ALIGN_OFF), -123);
+ unsafe.putOrderedInt(b, byte_offset(i), -103);
+ }
+ }
+ static void test_2vi_aln(int[] a, int[] b, int c, int d) {
+ for (int i = 0; i < ARRLEN-ALIGN_OFF; i+=1) {
+ unsafe.putOrderedInt(a, byte_offset(i), c);
+ unsafe.putOrderedInt(b, byte_offset(i+ALIGN_OFF), d);
+ }
+ }
+ static void test_cp_unalndst(int[] a, int[] b) {
+ for (int i = 0; i < ARRLEN-UNALIGN_OFF; i+=1) {
+ unsafe.putOrderedInt(a, byte_offset(i+UNALIGN_OFF), b[i]);
+ }
+ }
+ static void test_cp_unalnsrc(int[] a, int[] b) {
+ for (int i = 0; i < ARRLEN-UNALIGN_OFF; i+=1) {
+ unsafe.putOrderedInt(a, byte_offset(i), b[i+UNALIGN_OFF]);
+ }
+ }
+ static void test_2ci_unaln(int[] a, int[] b) {
+ for (int i = 0; i < ARRLEN-UNALIGN_OFF; i+=1) {
+ unsafe.putOrderedInt(a, byte_offset(i+UNALIGN_OFF), -123);
+ unsafe.putOrderedInt(b, byte_offset(i), -103);
+ }
+ }
+ static void test_2vi_unaln(int[] a, int[] b, int c, int d) {
+ for (int i = 0; i < ARRLEN-UNALIGN_OFF; i+=1) {
+ unsafe.putOrderedInt(a, byte_offset(i), c);
+ unsafe.putOrderedInt(b, byte_offset(i+UNALIGN_OFF), d);
+ }
+ }
+
+ static int verify(String text, int i, int elem, int val) {
+ if (elem != val) {
+ System.err.println(text + "[" + i + "] = " + elem + " != " + val);
+ return 1;
+ }
+ return 0;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/8004867/TestIntUnsafeVolatile.java Tue Mar 05 11:49:33 2013 -0800
@@ -0,0 +1,990 @@
+/*
+ * Copyright (c) 2013, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/**
+ * @test
+ * @bug 8004867
+ * @summary VM crashing with assert "share/vm/opto/node.hpp:357 - assert(i < _max) failed: oob"
+ *
+ * @run main/othervm/timeout=300 -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation -XX:-OptimizeFill TestIntUnsafeVolatile
+ * @run main/othervm/timeout=300 -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation -XX:+OptimizeFill TestIntUnsafeVolatile
+ */
+
+import sun.misc.Unsafe;
+import java.lang.reflect.*;
+
+public class TestIntUnsafeVolatile {
+ private static final int ARRLEN = 97;
+ private static final int ITERS = 11000;
+ private static final int OFFSET = 3;
+ private static final int SCALE = 2;
+ private static final int ALIGN_OFF = 8;
+ private static final int UNALIGN_OFF = 5;
+
+ private static final Unsafe unsafe;
+ private static final int BASE;
+ static {
+ try {
+ Class c = TestIntUnsafeVolatile.class.getClassLoader().loadClass("sun.misc.Unsafe");
+ Field f = c.getDeclaredField("theUnsafe");
+ f.setAccessible(true);
+ unsafe = (Unsafe)f.get(c);
+ BASE = unsafe.arrayBaseOffset(int[].class);
+ } catch (Exception e) {
+ InternalError err = new InternalError();
+ err.initCause(e);
+ throw err;
+ }
+ }
+
+ public static void main(String args[]) {
+ System.out.println("Testing Integer array unsafe volatile operations");
+ int errn = test(false);
+ if (errn > 0) {
+ System.err.println("FAILED: " + errn + " errors");
+ System.exit(97);
+ }
+ System.out.println("PASSED");
+ }
+
+ static int test(boolean test_only) {
+ int[] a1 = new int[ARRLEN];
+ int[] a2 = new int[ARRLEN];
+ // Initialize
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ a2[i] = -1;
+ }
+ System.out.println("Warmup");
+ for (int i=0; i<ITERS; i++) {
+ test_ci(a1);
+ test_vi(a2, 123, -1);
+ test_cp(a1, a2);
+ test_2ci(a1, a2);
+ test_2vi(a1, a2, 123, 103);
+ test_ci_neg(a1, 123);
+ test_vi_neg(a2, 123, 103);
+ test_cp_neg(a1, a2);
+ test_2ci_neg(a1, a2);
+ test_2vi_neg(a1, a2, 123, 103);
+ test_ci_oppos(a1, 123);
+ test_vi_oppos(a2, 123, 103);
+ test_cp_oppos(a1, a2);
+ test_2ci_oppos(a1, a2);
+ test_2vi_oppos(a1, a2, 123, 103);
+ test_ci_off(a1, 123);
+ test_vi_off(a2, 123, 103);
+ test_cp_off(a1, a2);
+ test_2ci_off(a1, a2);
+ test_2vi_off(a1, a2, 123, 103);
+ test_ci_inv(a1, OFFSET, 123);
+ test_vi_inv(a2, 123, OFFSET, 103);
+ test_cp_inv(a1, a2, OFFSET);
+ test_2ci_inv(a1, a2, OFFSET);
+ test_2vi_inv(a1, a2, 123, 103, OFFSET);
+ test_ci_scl(a1, 123);
+ test_vi_scl(a2, 123, 103);
+ test_cp_scl(a1, a2);
+ test_2ci_scl(a1, a2);
+ test_2vi_scl(a1, a2, 123, 103);
+ test_cp_alndst(a1, a2);
+ test_cp_alnsrc(a1, a2);
+ test_2ci_aln(a1, a2);
+ test_2vi_aln(a1, a2, 123, 103);
+ test_cp_unalndst(a1, a2);
+ test_cp_unalnsrc(a1, a2);
+ test_2ci_unaln(a1, a2);
+ test_2vi_unaln(a1, a2, 123, 103);
+ }
+ // Initialize
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ a2[i] = -1;
+ }
+ // Test and verify results
+ System.out.println("Verification");
+ int errn = 0;
+ {
+ test_ci(a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_ci: a1", i, a1[i], -123);
+ }
+ test_vi(a2, 123, -1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_vi: a2", i, a2[i], 123);
+ }
+ test_cp(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_cp: a1", i, a1[i], 123);
+ }
+ test_2ci(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_2ci: a1", i, a1[i], -123);
+ errn += verify("test_2ci: a2", i, a2[i], -103);
+ }
+ test_2vi(a1, a2, 123, 103);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_2vi: a1", i, a1[i], 123);
+ errn += verify("test_2vi: a2", i, a2[i], 103);
+ }
+ // Reset for negative stride
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ a2[i] = -1;
+ }
+ test_ci_neg(a1, -1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_ci_neg: a1", i, a1[i], -123);
+ }
+ test_vi_neg(a2, 123, -1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_vi_neg: a2", i, a2[i], 123);
+ }
+ test_cp_neg(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_cp_neg: a1", i, a1[i], 123);
+ }
+ test_2ci_neg(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_2ci_neg: a1", i, a1[i], -123);
+ errn += verify("test_2ci_neg: a2", i, a2[i], -103);
+ }
+ test_2vi_neg(a1, a2, 123, 103);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_2vi_neg: a1", i, a1[i], 123);
+ errn += verify("test_2vi_neg: a2", i, a2[i], 103);
+ }
+ // Reset for opposite stride
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ a2[i] = -1;
+ }
+ test_ci_oppos(a1, -1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_ci_oppos: a1", i, a1[i], -123);
+ }
+ test_vi_oppos(a2, 123, -1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_vi_oppos: a2", i, a2[i], 123);
+ }
+ test_cp_oppos(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_cp_oppos: a1", i, a1[i], 123);
+ }
+ test_2ci_oppos(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_2ci_oppos: a1", i, a1[i], -123);
+ errn += verify("test_2ci_oppos: a2", i, a2[i], -103);
+ }
+ test_2vi_oppos(a1, a2, 123, 103);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_2vi_oppos: a1", i, a1[i], 123);
+ errn += verify("test_2vi_oppos: a2", i, a2[i], 103);
+ }
+ // Reset for indexing with offset
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ a2[i] = -1;
+ }
+ test_ci_off(a1, -1);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_ci_off: a1", i, a1[i], -123);
+ }
+ test_vi_off(a2, 123, -1);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_vi_off: a2", i, a2[i], 123);
+ }
+ test_cp_off(a1, a2);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_cp_off: a1", i, a1[i], 123);
+ }
+ test_2ci_off(a1, a2);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_2ci_off: a1", i, a1[i], -123);
+ errn += verify("test_2ci_off: a2", i, a2[i], -103);
+ }
+ test_2vi_off(a1, a2, 123, 103);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_2vi_off: a1", i, a1[i], 123);
+ errn += verify("test_2vi_off: a2", i, a2[i], 103);
+ }
+ for (int i=0; i<OFFSET; i++) {
+ errn += verify("test_2vi_off: a1", i, a1[i], -1);
+ errn += verify("test_2vi_off: a2", i, a2[i], -1);
+ }
+ // Reset for indexing with invariant offset
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ a2[i] = -1;
+ }
+ test_ci_inv(a1, OFFSET, -1);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_ci_inv: a1", i, a1[i], -123);
+ }
+ test_vi_inv(a2, 123, OFFSET, -1);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_vi_inv: a2", i, a2[i], 123);
+ }
+ test_cp_inv(a1, a2, OFFSET);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_cp_inv: a1", i, a1[i], 123);
+ }
+ test_2ci_inv(a1, a2, OFFSET);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_2ci_inv: a1", i, a1[i], -123);
+ errn += verify("test_2ci_inv: a2", i, a2[i], -103);
+ }
+ test_2vi_inv(a1, a2, 123, 103, OFFSET);
+ for (int i=OFFSET; i<ARRLEN; i++) {
+ errn += verify("test_2vi_inv: a1", i, a1[i], 123);
+ errn += verify("test_2vi_inv: a2", i, a2[i], 103);
+ }
+ for (int i=0; i<OFFSET; i++) {
+ errn += verify("test_2vi_inv: a1", i, a1[i], -1);
+ errn += verify("test_2vi_inv: a2", i, a2[i], -1);
+ }
+ // Reset for indexing with scale
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ a2[i] = -1;
+ }
+ test_ci_scl(a1, -1);
+ for (int i=0; i<ARRLEN; i++) {
+ int val = (i%SCALE != 0) ? -1 : -123;
+ errn += verify("test_ci_scl: a1", i, a1[i], val);
+ }
+ test_vi_scl(a2, 123, -1);
+ for (int i=0; i<ARRLEN; i++) {
+ int val = (i%SCALE != 0) ? -1 : 123;
+ errn += verify("test_vi_scl: a2", i, a2[i], val);
+ }
+ test_cp_scl(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ int val = (i%SCALE != 0) ? -1 : 123;
+ errn += verify("test_cp_scl: a1", i, a1[i], val);
+ }
+ test_2ci_scl(a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ if (i%SCALE != 0) {
+ errn += verify("test_2ci_scl: a1", i, a1[i], -1);
+ } else if (i*SCALE < ARRLEN) {
+ errn += verify("test_2ci_scl: a1", i*SCALE, a1[i*SCALE], -123);
+ }
+ if (i%SCALE != 0) {
+ errn += verify("test_2ci_scl: a2", i, a2[i], -1);
+ } else if (i*SCALE < ARRLEN) {
+ errn += verify("test_2ci_scl: a2", i*SCALE, a2[i*SCALE], -103);
+ }
+ }
+ test_2vi_scl(a1, a2, 123, 103);
+ for (int i=0; i<ARRLEN; i++) {
+ if (i%SCALE != 0) {
+ errn += verify("test_2vi_scl: a1", i, a1[i], -1);
+ } else if (i*SCALE < ARRLEN) {
+ errn += verify("test_2vi_scl: a1", i*SCALE, a1[i*SCALE], 123);
+ }
+ if (i%SCALE != 0) {
+ errn += verify("test_2vi_scl: a2", i, a2[i], -1);
+ } else if (i*SCALE < ARRLEN) {
+ errn += verify("test_2vi_scl: a2", i*SCALE, a2[i*SCALE], 103);
+ }
+ }
+ // Reset for 2 arrays with relative aligned offset
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ a2[i] = -1;
+ }
+ test_vi(a2, 123, -1);
+ test_cp_alndst(a1, a2);
+ for (int i=0; i<ALIGN_OFF; i++) {
+ errn += verify("test_cp_alndst: a1", i, a1[i], -1);
+ }
+ for (int i=ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_cp_alndst: a1", i, a1[i], 123);
+ }
+ for (int i=0; i<ALIGN_OFF; i++) {
+ a1[i] = 123;
+ }
+ test_vi(a2, -123, 123);
+ test_cp_alnsrc(a1, a2);
+ for (int i=0; i<ARRLEN-ALIGN_OFF; i++) {
+ errn += verify("test_cp_alnsrc: a1", i, a1[i], -123);
+ }
+ for (int i=ARRLEN-ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_cp_alnsrc: a1", i, a1[i], 123);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ a2[i] = -1;
+ }
+ test_2ci_aln(a1, a2);
+ for (int i=0; i<ALIGN_OFF; i++) {
+ errn += verify("test_2ci_aln: a1", i, a1[i], -1);
+ }
+ for (int i=ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2ci_aln: a1", i, a1[i], -123);
+ }
+ for (int i=0; i<ARRLEN-ALIGN_OFF; i++) {
+ errn += verify("test_2ci_aln: a2", i, a2[i], -103);
+ }
+ for (int i=ARRLEN-ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2ci_aln: a2", i, a2[i], -1);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ a2[i] = -1;
+ }
+ test_2vi_aln(a1, a2, 123, 103);
+ for (int i=0; i<ARRLEN-ALIGN_OFF; i++) {
+ errn += verify("test_2vi_aln: a1", i, a1[i], 123);
+ }
+ for (int i=ARRLEN-ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2vi_aln: a1", i, a1[i], -1);
+ }
+ for (int i=0; i<ALIGN_OFF; i++) {
+ errn += verify("test_2vi_aln: a2", i, a2[i], -1);
+ }
+ for (int i=ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2vi_aln: a2", i, a2[i], 103);
+ }
+
+ // Reset for 2 arrays with relative unaligned offset
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ a2[i] = -1;
+ }
+ test_vi(a2, 123, -1);
+ test_cp_unalndst(a1, a2);
+ for (int i=0; i<UNALIGN_OFF; i++) {
+ errn += verify("test_cp_unalndst: a1", i, a1[i], -1);
+ }
+ for (int i=UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_cp_unalndst: a1", i, a1[i], 123);
+ }
+ test_vi(a2, -123, 123);
+ test_cp_unalnsrc(a1, a2);
+ for (int i=0; i<ARRLEN-UNALIGN_OFF; i++) {
+ errn += verify("test_cp_unalnsrc: a1", i, a1[i], -123);
+ }
+ for (int i=ARRLEN-UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_cp_unalnsrc: a1", i, a1[i], 123);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ a2[i] = -1;
+ }
+ test_2ci_unaln(a1, a2);
+ for (int i=0; i<UNALIGN_OFF; i++) {
+ errn += verify("test_2ci_unaln: a1", i, a1[i], -1);
+ }
+ for (int i=UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2ci_unaln: a1", i, a1[i], -123);
+ }
+ for (int i=0; i<ARRLEN-UNALIGN_OFF; i++) {
+ errn += verify("test_2ci_unaln: a2", i, a2[i], -103);
+ }
+ for (int i=ARRLEN-UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2ci_unaln: a2", i, a2[i], -1);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ a2[i] = -1;
+ }
+ test_2vi_unaln(a1, a2, 123, 103);
+ for (int i=0; i<ARRLEN-UNALIGN_OFF; i++) {
+ errn += verify("test_2vi_unaln: a1", i, a1[i], 123);
+ }
+ for (int i=ARRLEN-UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2vi_unaln: a1", i, a1[i], -1);
+ }
+ for (int i=0; i<UNALIGN_OFF; i++) {
+ errn += verify("test_2vi_unaln: a2", i, a2[i], -1);
+ }
+ for (int i=UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2vi_unaln: a2", i, a2[i], 103);
+ }
+
+ // Reset for aligned overlap initialization
+ for (int i=0; i<ALIGN_OFF; i++) {
+ a1[i] = i;
+ }
+ for (int i=ALIGN_OFF; i<ARRLEN; i++) {
+ a1[i] = -1;
+ }
+ test_cp_alndst(a1, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ int v = i%ALIGN_OFF;
+ errn += verify("test_cp_alndst_overlap: a1", i, a1[i], v);
+ }
+ for (int i=0; i<ALIGN_OFF; i++) {
+ a1[i+ALIGN_OFF] = -1;
+ }
+ test_cp_alnsrc(a1, a1);
+ for (int i=0; i<ALIGN_OFF; i++) {
+ errn += verify("test_cp_alnsrc_overlap: a1", i, a1[i], -1);
+ }
+ for (int i=ALIGN_OFF; i<ARRLEN; i++) {
+ int v = i%ALIGN_OFF;
+ errn += verify("test_cp_alnsrc_overlap: a1", i, a1[i], v);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ }
+ test_2ci_aln(a1, a1);
+ for (int i=0; i<ARRLEN-ALIGN_OFF; i++) {
+ errn += verify("test_2ci_aln_overlap: a1", i, a1[i], -103);
+ }
+ for (int i=ARRLEN-ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2ci_aln_overlap: a1", i, a1[i], -123);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ }
+ test_2vi_aln(a1, a1, 123, 103);
+ for (int i=0; i<ARRLEN-ALIGN_OFF; i++) {
+ errn += verify("test_2vi_aln_overlap: a1", i, a1[i], 123);
+ }
+ for (int i=ARRLEN-ALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2vi_aln_overlap: a1", i, a1[i], 103);
+ }
+
+ // Reset for unaligned overlap initialization
+ for (int i=0; i<UNALIGN_OFF; i++) {
+ a1[i] = i;
+ }
+ for (int i=UNALIGN_OFF; i<ARRLEN; i++) {
+ a1[i] = -1;
+ }
+ test_cp_unalndst(a1, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ int v = i%UNALIGN_OFF;
+ errn += verify("test_cp_unalndst_overlap: a1", i, a1[i], v);
+ }
+ for (int i=0; i<UNALIGN_OFF; i++) {
+ a1[i+UNALIGN_OFF] = -1;
+ }
+ test_cp_unalnsrc(a1, a1);
+ for (int i=0; i<UNALIGN_OFF; i++) {
+ errn += verify("test_cp_unalnsrc_overlap: a1", i, a1[i], -1);
+ }
+ for (int i=UNALIGN_OFF; i<ARRLEN; i++) {
+ int v = i%UNALIGN_OFF;
+ errn += verify("test_cp_unalnsrc_overlap: a1", i, a1[i], v);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ }
+ test_2ci_unaln(a1, a1);
+ for (int i=0; i<ARRLEN-UNALIGN_OFF; i++) {
+ errn += verify("test_2ci_unaln_overlap: a1", i, a1[i], -103);
+ }
+ for (int i=ARRLEN-UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2ci_unaln_overlap: a1", i, a1[i], -123);
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ }
+ test_2vi_unaln(a1, a1, 123, 103);
+ for (int i=0; i<ARRLEN-UNALIGN_OFF; i++) {
+ errn += verify("test_2vi_unaln_overlap: a1", i, a1[i], 123);
+ }
+ for (int i=ARRLEN-UNALIGN_OFF; i<ARRLEN; i++) {
+ errn += verify("test_2vi_unaln_overlap: a1", i, a1[i], 103);
+ }
+
+ }
+
+ if (errn > 0 || test_only)
+ return errn;
+
+ // Initialize
+ for (int i=0; i<ARRLEN; i++) {
+ a1[i] = -1;
+ a2[i] = -1;
+ }
+ System.out.println("Time");
+ long start, end;
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_ci(a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_ci: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_vi(a2, 123, -1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_vi: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi(a1, a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_ci_neg(a1, 123);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_ci_neg: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_vi_neg(a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_vi_neg: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_neg(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_neg: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci_neg(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci_neg: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi_neg(a1, a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi_neg: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_ci_oppos(a1, 123);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_ci_oppos: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_vi_oppos(a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_vi_oppos: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_oppos(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_oppos: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci_oppos(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci_oppos: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi_oppos(a1, a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi_oppos: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_ci_off(a1, 123);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_ci_off: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_vi_off(a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_vi_off: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_off(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_off: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci_off(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci_off: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi_off(a1, a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi_off: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_ci_inv(a1, OFFSET, 123);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_ci_inv: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_vi_inv(a2, 123, OFFSET, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_vi_inv: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_inv(a1, a2, OFFSET);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_inv: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci_inv(a1, a2, OFFSET);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci_inv: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi_inv(a1, a2, 123, 103, OFFSET);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi_inv: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_ci_scl(a1, 123);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_ci_scl: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_vi_scl(a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_vi_scl: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_scl(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_scl: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci_scl(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci_scl: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi_scl(a1, a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi_scl: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_alndst(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_alndst: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_alnsrc(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_alnsrc: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci_aln(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci_aln: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi_aln(a1, a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi_aln: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_unalndst(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_unalndst: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_cp_unalnsrc(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_cp_unalnsrc: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2ci_unaln(a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2ci_unaln: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_2vi_unaln(a1, a2, 123, 103);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_2vi_unaln: " + (end - start));
+
+ return errn;
+ }
+
+ private final static long byte_offset(int i) {
+ return ((long)i << 2) + BASE;
+ }
+
+ static void test_ci(int[] a) {
+ for (int i = 0; i < ARRLEN; i+=1) {
+ unsafe.putIntVolatile(a, byte_offset(i), -123);
+ }
+ }
+ static void test_vi(int[] a, int b, int old) {
+ for (int i = 0; i < ARRLEN; i+=1) {
+ unsafe.putIntVolatile(a, byte_offset(i), b);
+ }
+ }
+ static void test_cp(int[] a, int[] b) {
+ for (int i = 0; i < ARRLEN; i+=1) {
+ unsafe.putIntVolatile(a, byte_offset(i), b[i]);
+ }
+ }
+ static void test_2ci(int[] a, int[] b) {
+ for (int i = 0; i < ARRLEN; i+=1) {
+ unsafe.putIntVolatile(a, byte_offset(i), -123);
+ unsafe.putIntVolatile(b, byte_offset(i), -103);
+ }
+ }
+ static void test_2vi(int[] a, int[] b, int c, int d) {
+ for (int i = 0; i < ARRLEN; i+=1) {
+ unsafe.putIntVolatile(a, byte_offset(i), c);
+ unsafe.putIntVolatile(b, byte_offset(i), d);
+ }
+ }
+ static void test_ci_neg(int[] a, int old) {
+ for (int i = ARRLEN-1; i >= 0; i-=1) {
+ unsafe.putIntVolatile(a, byte_offset(i), -123);
+ }
+ }
+ static void test_vi_neg(int[] a, int b, int old) {
+ for (int i = ARRLEN-1; i >= 0; i-=1) {
+ unsafe.putIntVolatile(a, byte_offset(i), b);
+ }
+ }
+ static void test_cp_neg(int[] a, int[] b) {
+ for (int i = ARRLEN-1; i >= 0; i-=1) {
+ unsafe.putIntVolatile(a, byte_offset(i), b[i]);
+ }
+ }
+ static void test_2ci_neg(int[] a, int[] b) {
+ for (int i = ARRLEN-1; i >= 0; i-=1) {
+ unsafe.putIntVolatile(a, byte_offset(i), -123);
+ unsafe.putIntVolatile(b, byte_offset(i), -103);
+ }
+ }
+ static void test_2vi_neg(int[] a, int[] b, int c, int d) {
+ for (int i = ARRLEN-1; i >= 0; i-=1) {
+ unsafe.putIntVolatile(a, byte_offset(i), c);
+ unsafe.putIntVolatile(b, byte_offset(i), d);
+ }
+ }
+ static void test_ci_oppos(int[] a, int old) {
+ int limit = ARRLEN-1;
+ for (int i = 0; i < ARRLEN; i+=1) {
+ unsafe.putIntVolatile(a, byte_offset(limit-i), -123);
+ }
+ }
+ static void test_vi_oppos(int[] a, int b, int old) {
+ int limit = ARRLEN-1;
+ for (int i = limit; i >= 0; i-=1) {
+ unsafe.putIntVolatile(a, byte_offset(limit-i), b);
+ }
+ }
+ static void test_cp_oppos(int[] a, int[] b) {
+ int limit = ARRLEN-1;
+ for (int i = 0; i < ARRLEN; i+=1) {
+ unsafe.putIntVolatile(a, byte_offset(i), b[limit-i]);
+ }
+ }
+ static void test_2ci_oppos(int[] a, int[] b) {
+ int limit = ARRLEN-1;
+ for (int i = 0; i < ARRLEN; i+=1) {
+ unsafe.putIntVolatile(a, byte_offset(limit-i), -123);
+ unsafe.putIntVolatile(b, byte_offset(i), -103);
+ }
+ }
+ static void test_2vi_oppos(int[] a, int[] b, int c, int d) {
+ int limit = ARRLEN-1;
+ for (int i = limit; i >= 0; i-=1) {
+ unsafe.putIntVolatile(a, byte_offset(i), c);
+ unsafe.putIntVolatile(b, byte_offset(limit-i), d);
+ }
+ }
+ static void test_ci_off(int[] a, int old) {
+ for (int i = 0; i < ARRLEN-OFFSET; i+=1) {
+ unsafe.putIntVolatile(a, byte_offset(i+OFFSET), -123);
+ }
+ }
+ static void test_vi_off(int[] a, int b, int old) {
+ for (int i = 0; i < ARRLEN-OFFSET; i+=1) {
+ unsafe.putIntVolatile(a, byte_offset(i+OFFSET), b);
+ }
+ }
+ static void test_cp_off(int[] a, int[] b) {
+ for (int i = 0; i < ARRLEN-OFFSET; i+=1) {
+ unsafe.putIntVolatile(a, byte_offset(i+OFFSET), b[i+OFFSET]);
+ }
+ }
+ static void test_2ci_off(int[] a, int[] b) {
+ for (int i = 0; i < ARRLEN-OFFSET; i+=1) {
+ unsafe.putIntVolatile(a, byte_offset(i+OFFSET), -123);
+ unsafe.putIntVolatile(b, byte_offset(i+OFFSET), -103);
+ }
+ }
+ static void test_2vi_off(int[] a, int[] b, int c, int d) {
+ for (int i = 0; i < ARRLEN-OFFSET; i+=1) {
+ unsafe.putIntVolatile(a, byte_offset(i+OFFSET), c);
+ unsafe.putIntVolatile(b, byte_offset(i+OFFSET), d);
+ }
+ }
+ static void test_ci_inv(int[] a, int k, int old) {
+ for (int i = 0; i < ARRLEN-k; i+=1) {
+ unsafe.putIntVolatile(a, byte_offset(i+k), -123);
+ }
+ }
+ static void test_vi_inv(int[] a, int b, int k, int old) {
+ for (int i = 0; i < ARRLEN-k; i+=1) {
+ unsafe.putIntVolatile(a, byte_offset(i+k), b);
+ }
+ }
+ static void test_cp_inv(int[] a, int[] b, int k) {
+ for (int i = 0; i < ARRLEN-k; i+=1) {
+ unsafe.putIntVolatile(a, byte_offset(i+k), b[i+k]);
+ }
+ }
+ static void test_2ci_inv(int[] a, int[] b, int k) {
+ for (int i = 0; i < ARRLEN-k; i+=1) {
+ unsafe.putIntVolatile(a, byte_offset(i+k), -123);
+ unsafe.putIntVolatile(b, byte_offset(i+k), -103);
+ }
+ }
+ static void test_2vi_inv(int[] a, int[] b, int c, int d, int k) {
+ for (int i = 0; i < ARRLEN-k; i+=1) {
+ unsafe.putIntVolatile(a, byte_offset(i+k), c);
+ unsafe.putIntVolatile(b, byte_offset(i+k), d);
+ }
+ }
+ static void test_ci_scl(int[] a, int old) {
+ for (int i = 0; i*SCALE < ARRLEN; i+=1) {
+ unsafe.putIntVolatile(a, byte_offset(i*SCALE), -123);
+ }
+ }
+ static void test_vi_scl(int[] a, int b, int old) {
+ for (int i = 0; i*SCALE < ARRLEN; i+=1) {
+ unsafe.putIntVolatile(a, byte_offset(i*SCALE), b);
+ }
+ }
+ static void test_cp_scl(int[] a, int[] b) {
+ for (int i = 0; i*SCALE < ARRLEN; i+=1) {
+ unsafe.putIntVolatile(a, byte_offset(i*SCALE), b[i*SCALE]);
+ }
+ }
+ static void test_2ci_scl(int[] a, int[] b) {
+ for (int i = 0; i*SCALE < ARRLEN; i+=1) {
+ unsafe.putIntVolatile(a, byte_offset(i*SCALE), -123);
+ unsafe.putIntVolatile(b, byte_offset(i*SCALE), -103);
+ }
+ }
+ static void test_2vi_scl(int[] a, int[] b, int c, int d) {
+ for (int i = 0; i*SCALE < ARRLEN; i+=1) {
+ unsafe.putIntVolatile(a, byte_offset(i*SCALE), c);
+ unsafe.putIntVolatile(b, byte_offset(i*SCALE), d);
+ }
+ }
+ static void test_cp_alndst(int[] a, int[] b) {
+ for (int i = 0; i < ARRLEN-ALIGN_OFF; i+=1) {
+ unsafe.putIntVolatile(a, byte_offset(i+ALIGN_OFF), b[i]);
+ }
+ }
+ static void test_cp_alnsrc(int[] a, int[] b) {
+ for (int i = 0; i < ARRLEN-ALIGN_OFF; i+=1) {
+ unsafe.putIntVolatile(a, byte_offset(i), b[i+ALIGN_OFF]);
+ }
+ }
+ static void test_2ci_aln(int[] a, int[] b) {
+ for (int i = 0; i < ARRLEN-ALIGN_OFF; i+=1) {
+ unsafe.putIntVolatile(a, byte_offset(i+ALIGN_OFF), -123);
+ unsafe.putIntVolatile(b, byte_offset(i), -103);
+ }
+ }
+ static void test_2vi_aln(int[] a, int[] b, int c, int d) {
+ for (int i = 0; i < ARRLEN-ALIGN_OFF; i+=1) {
+ unsafe.putIntVolatile(a, byte_offset(i), c);
+ unsafe.putIntVolatile(b, byte_offset(i+ALIGN_OFF), d);
+ }
+ }
+ static void test_cp_unalndst(int[] a, int[] b) {
+ for (int i = 0; i < ARRLEN-UNALIGN_OFF; i+=1) {
+ unsafe.putIntVolatile(a, byte_offset(i+UNALIGN_OFF), b[i]);
+ }
+ }
+ static void test_cp_unalnsrc(int[] a, int[] b) {
+ for (int i = 0; i < ARRLEN-UNALIGN_OFF; i+=1) {
+ unsafe.putIntVolatile(a, byte_offset(i), b[i+UNALIGN_OFF]);
+ }
+ }
+ static void test_2ci_unaln(int[] a, int[] b) {
+ for (int i = 0; i < ARRLEN-UNALIGN_OFF; i+=1) {
+ unsafe.putIntVolatile(a, byte_offset(i+UNALIGN_OFF), -123);
+ unsafe.putIntVolatile(b, byte_offset(i), -103);
+ }
+ }
+ static void test_2vi_unaln(int[] a, int[] b, int c, int d) {
+ for (int i = 0; i < ARRLEN-UNALIGN_OFF; i+=1) {
+ unsafe.putIntVolatile(a, byte_offset(i), c);
+ unsafe.putIntVolatile(b, byte_offset(i+UNALIGN_OFF), d);
+ }
+ }
+
+ static int verify(String text, int i, int elem, int val) {
+ if (elem != val) {
+ System.err.println(text + "[" + i + "] = " + elem + " != " + val);
+ return 1;
+ }
+ return 0;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/8007294/Test8007294.java Tue Mar 05 11:49:33 2013 -0800
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2013, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8007294
+ * @summary ReduceFieldZeroing doesn't check for dependent load and can lead to incorrect execution
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+AlwaysIncrementalInline -XX:-UseOnStackReplacement -XX:-BackgroundCompilation Test8007294
+ *
+ */
+
+public class Test8007294 {
+
+ int i1;
+ int i2;
+
+ Test8007294(int i1, int i2) {
+ this.i1 = i1;
+ this.i2 = i2;
+ }
+
+ static int m(int v) {
+ return v;
+ }
+
+ static Test8007294 test1() {
+ Test8007294 obj = new Test8007294(10, 100);
+ int v1 = obj.i1;
+
+ int v3 = m(v1);
+ int v2 = obj.i2;
+ obj.i2 = v3;
+ obj.i1 = v2;
+
+ return obj;
+ }
+
+ static int test2(int i) {
+ int j = 0;
+ if (i > 0) {
+ j = 1;
+ }
+
+ int[] arr = new int[10];
+ arr[0] = 1;
+ arr[1] = 2;
+ int v1 = arr[j];
+ arr[0] = 3;
+ arr[1] = 4;
+
+ return v1;
+ }
+
+ static public void main(String[] args) {
+ boolean failed = false;
+ for (int i = 0; i < 20000; i++) {
+ Test8007294 obj = test1();
+ if (obj.i1 != 100 || obj.i2 != 10) {
+ System.out.println("FAILED test1 obj.i1 = " + obj.i1 +", obj.i2 = " + obj.i2);
+ failed = true;
+ break;
+ }
+ }
+ for (int i = 0; i < 20000; i++) {
+ int res = test2(1);
+ if (res != 2) {
+ System.out.println("FAILED test2 = " + res);
+ failed = true;
+ break;
+ }
+ }
+ if (failed) {
+ System.exit(97);
+ } else {
+ System.out.println("PASSED");
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/8007722/Test8007722.java Tue Mar 05 11:49:33 2013 -0800
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2013, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8007722
+ * @summary GetAndSetP's MachNode should capture bottom type
+ * @run main/othervm -XX:-UseOnStackReplacement -XX:-BackgroundCompilation Test8007722
+ *
+ */
+
+import java.util.concurrent.atomic.*;
+
+public class Test8007722 {
+
+ int i;
+ static AtomicReference<Test8007722> ref;
+
+ static int test(Test8007722 new_obj) {
+ Test8007722 o = ref.getAndSet(new_obj);
+ int ret = o.i;
+ o.i = 5;
+ return ret;
+ }
+
+ static public void main(String[] args) {
+ Test8007722 obj = new Test8007722();
+ ref = new AtomicReference<Test8007722>(obj);
+
+ for (int i = 0; i < 20000; i++) {
+ test(obj);
+ }
+
+ System.out.println("PASSED");
+ }
+}
--- a/hotspot/test/compiler/whitebox/DeoptimizeAllTest.java Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/test/compiler/whitebox/DeoptimizeAllTest.java Tue Mar 05 11:49:33 2013 -0800
@@ -23,9 +23,10 @@
/*
* @test DeoptimizeAllTest
- * @compile -J-XX:+UnlockDiagnosticVMOptions -J-XX:+WhiteBoxAPI CompilerWhiteBoxTest.java
- * @compile -J-XX:+UnlockDiagnosticVMOptions -J-XX:+WhiteBoxAPI DeoptimizeAllTest.java
- * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI DeoptimizeAllTest
+ * @library /testlibrary /testlibrary/whitebox
+ * @build DeoptimizeAllTest
+ * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI DeoptimizeAllTest
* @author igor.ignatyev@oracle.com
*/
public class DeoptimizeAllTest extends CompilerWhiteBoxTest {
--- a/hotspot/test/compiler/whitebox/DeoptimizeMethodTest.java Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/test/compiler/whitebox/DeoptimizeMethodTest.java Tue Mar 05 11:49:33 2013 -0800
@@ -23,9 +23,10 @@
/*
* @test DeoptimizeMethodTest
- * @compile -J-XX:+UnlockDiagnosticVMOptions -J-XX:+WhiteBoxAPI CompilerWhiteBoxTest.java
- * @compile -J-XX:+UnlockDiagnosticVMOptions -J-XX:+WhiteBoxAPI DeoptimizeMethodTest.java
- * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI DeoptimizeMethodTest
+ * @library /testlibrary /testlibrary/whitebox
+ * @build DeoptimizeMethodTest
+ * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI DeoptimizeMethodTest
* @author igor.ignatyev@oracle.com
*/
public class DeoptimizeMethodTest extends CompilerWhiteBoxTest {
--- a/hotspot/test/compiler/whitebox/IsMethodCompilableTest.java Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/test/compiler/whitebox/IsMethodCompilableTest.java Tue Mar 05 11:49:33 2013 -0800
@@ -24,9 +24,10 @@
/*
* @test IsMethodCompilableTest
* @bug 8007270
- * @compile -J-XX:+UnlockDiagnosticVMOptions -J-XX:+WhiteBoxAPI CompilerWhiteBoxTest.java
- * @compile -J-XX:+UnlockDiagnosticVMOptions -J-XX:+WhiteBoxAPI IsMethodCompilableTest.java
- * @run main/othervm/timeout=600 -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI IsMethodCompilableTest
+ * @library /testlibrary /testlibrary/whitebox
+ * @build IsMethodCompilableTest
+ * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI IsMethodCompilableTest
* @author igor.ignatyev@oracle.com
*/
public class IsMethodCompilableTest extends CompilerWhiteBoxTest {
--- a/hotspot/test/compiler/whitebox/MakeMethodNotCompilableTest.java Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/test/compiler/whitebox/MakeMethodNotCompilableTest.java Tue Mar 05 11:49:33 2013 -0800
@@ -23,9 +23,10 @@
/*
* @test MakeMethodNotCompilableTest
- * @compile -J-XX:+UnlockDiagnosticVMOptions -J-XX:+WhiteBoxAPI CompilerWhiteBoxTest.java
- * @compile -J-XX:+UnlockDiagnosticVMOptions -J-XX:+WhiteBoxAPI MakeMethodNotCompilableTest.java
- * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI MakeMethodNotCompilableTest
+ * @library /testlibrary /testlibrary/whitebox
+ * @build MakeMethodNotCompilableTest
+ * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI MakeMethodNotCompilableTest
* @author igor.ignatyev@oracle.com
*/
public class MakeMethodNotCompilableTest extends CompilerWhiteBoxTest {
--- a/hotspot/test/compiler/whitebox/SetDontInlineMethodTest.java Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/test/compiler/whitebox/SetDontInlineMethodTest.java Tue Mar 05 11:49:33 2013 -0800
@@ -23,9 +23,10 @@
/*
* @test SetDontInlineMethodTest
- * @compile -J-XX:+UnlockDiagnosticVMOptions -J-XX:+WhiteBoxAPI CompilerWhiteBoxTest.java
- * @compile -J-XX:+UnlockDiagnosticVMOptions -J-XX:+WhiteBoxAPI SetDontInlineMethodTest.java
- * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI SetDontInlineMethodTest
+ * @library /testlibrary /testlibrary/whitebox
+ * @build SetDontInlineMethodTest
+ * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI SetDontInlineMethodTest
* @author igor.ignatyev@oracle.com
*/
public class SetDontInlineMethodTest extends CompilerWhiteBoxTest {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/gc/8000311/Test8000311.java Tue Mar 05 11:49:33 2013 -0800
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2013, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test Test8000311
+ * @key gc
+ * @bug 8000311
+ * @summary G1: ParallelGCThreads==0 broken
+ * @run main/othervm -XX:+UseG1GC -XX:ParallelGCThreads=0 -XX:+ResizePLAB -XX:+ExplicitGCInvokesConcurrent Test8000311
+ * @author filipp.zhinkin@oracle.com
+ */
+
+import java.util.*;
+
+public class Test8000311 {
+ public static void main(String args[]) {
+ for(int i = 0; i<100; i++) {
+ byte[] garbage = new byte[1000];
+ System.gc();
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/gc/TestG1ZeroPGCTJcmdThreadPrint.java Tue Mar 05 11:49:33 2013 -0800
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2013, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test TestG1ZeroPGCTJcmdThreadPrint
+ * @key gc
+ * @bug 8005875
+ * @summary Use jcmd to generate a thread dump of a Java program being run with PGCT=0 to verify 8005875
+ * @library /testlibrary
+ * @run main/othervm -XX:+UseG1GC -XX:ParallelGCThreads=0 -XX:+IgnoreUnrecognizedVMOptions TestG1ZeroPGCTJcmdThreadPrint
+ */
+
+import com.oracle.java.testlibrary.*;
+
+public class TestG1ZeroPGCTJcmdThreadPrint {
+ public static void main(String args[]) throws Exception {
+
+ // Grab the pid from the current java process
+ String pid = Integer.toString(ProcessTools.getProcessId());
+
+ // Create a ProcessBuilder
+ ProcessBuilder pb = new ProcessBuilder();
+
+ // Run jcmd <pid> Thread.print
+ pb.command(JDKToolFinder.getJDKTool("jcmd"), pid, "Thread.print");
+
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
+
+ // There shouldn't be a work gang for concurrent marking.
+ output.shouldNotContain("G1 Parallel Marking Threads");
+
+ // Make sure we didn't crash
+ output.shouldHaveExitValue(0);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/gc/metaspace/ClassMetaspaceSizeInJmapHeap.java Tue Mar 05 11:49:33 2013 -0800
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2013, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test ClassMetaspaceSizeInJmapHeap
+ * @bug 8004924
+ * @summary Checks that jmap -heap contains the flag ClassMetaspaceSize
+ * @library /testlibrary
+ * @run main/othervm -XX:ClassMetaspaceSize=50m ClassMetaspaceSizeInJmapHeap
+ */
+
+import com.oracle.java.testlibrary.*;
+import java.nio.file.*;
+import java.io.File;
+import java.nio.charset.Charset;
+import java.util.List;
+
+public class ClassMetaspaceSizeInJmapHeap {
+ public static void main(String[] args) throws Exception {
+ String pid = Integer.toString(ProcessTools.getProcessId());
+
+ ProcessBuilder pb = new ProcessBuilder();
+ pb.command(JDKToolFinder.getJDKTool("jmap"), "-heap", pid);
+
+ File out = new File("ClassMetaspaceSizeInJmapHeap.stdout.txt");
+ pb.redirectOutput(out);
+
+ File err = new File("ClassMetaspaceSizeInJmapHeap.stderr.txt");
+ pb.redirectError(err);
+
+ run(pb);
+
+ OutputAnalyzer output = new OutputAnalyzer(read(out));
+ output.shouldContain("ClassMetaspaceSize = 52428800 (50.0MB)");
+ out.delete();
+ }
+
+ private static void run(ProcessBuilder pb) throws Exception {
+ Process p = pb.start();
+ p.waitFor();
+ int exitValue = p.exitValue();
+ if (exitValue != 0) {
+ throw new Exception("jmap -heap exited with error code: " + exitValue);
+ }
+ }
+
+ private static String read(File f) throws Exception {
+ Path p = f.toPath();
+ List<String> lines = Files.readAllLines(p, Charset.defaultCharset());
+
+ StringBuilder sb = new StringBuilder();
+ for (String line : lines) {
+ sb.append(line).append('\n');
+ }
+ return sb.toString();
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/gc/startup_warnings/TestCMS.java Tue Mar 05 11:49:33 2013 -0800
@@ -0,0 +1,46 @@
+/*
+* Copyright (c) 2013, 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
+* under the terms of the GNU General Public License version 2 only, as
+* published by the Free Software Foundation.
+*
+* This code is distributed in the hope that it will be useful, but WITHOUT
+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+* version 2 for more details (a copy is included in the LICENSE file that
+* accompanied this code).
+*
+* You should have received a copy of the GNU General Public License version
+* 2 along with this work; if not, write to the Free Software Foundation,
+* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+*
+* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+* or visit www.oracle.com if you need additional information or have any
+* questions.
+*/
+
+/*
+* @test TestCMS
+* @key gc
+* @bug 8006398
+* @summary Test that CMS does not print a warning message
+* @library /testlibrary
+*/
+
+import com.oracle.java.testlibrary.OutputAnalyzer;
+import com.oracle.java.testlibrary.ProcessTools;
+
+
+public class TestCMS {
+
+ public static void main(String args[]) throws Exception {
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UseConcMarkSweepGC", "-version");
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
+ output.shouldNotContain("warning");
+ output.shouldNotContain("error");
+ output.shouldHaveExitValue(0);
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/gc/startup_warnings/TestCMSIncrementalMode.java Tue Mar 05 11:49:33 2013 -0800
@@ -0,0 +1,46 @@
+
+/*
+* Copyright (c) 2013, 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
+* under the terms of the GNU General Public License version 2 only, as
+* published by the Free Software Foundation.
+*
+* This code is distributed in the hope that it will be useful, but WITHOUT
+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+* version 2 for more details (a copy is included in the LICENSE file that
+* accompanied this code).
+*
+* You should have received a copy of the GNU General Public License version
+* 2 along with this work; if not, write to the Free Software Foundation,
+* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+*
+* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+* or visit www.oracle.com if you need additional information or have any
+* questions.
+*/
+
+/*
+* @test TestCMSIncrementalMode
+* @key gc
+* @bug 8006398
+* @summary Test that the deprecated CMSIncrementalMode print a warning message
+* @library /testlibrary
+*/
+
+import com.oracle.java.testlibrary.OutputAnalyzer;
+import com.oracle.java.testlibrary.ProcessTools;
+
+public class TestCMSIncrementalMode {
+
+ public static void main(String args[]) throws Exception {
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UseConcMarkSweepGC", "-XX:+CMSIncrementalMode", "-version");
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
+ output.shouldContain("warning: Using incremental CMS is deprecated and will likely be removed in a future release");
+ output.shouldNotContain("error");
+ output.shouldHaveExitValue(0);
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/gc/startup_warnings/TestCMSNoIncrementalMode.java Tue Mar 05 11:49:33 2013 -0800
@@ -0,0 +1,45 @@
+/*
+* Copyright (c) 2013, 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
+* under the terms of the GNU General Public License version 2 only, as
+* published by the Free Software Foundation.
+*
+* This code is distributed in the hope that it will be useful, but WITHOUT
+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+* version 2 for more details (a copy is included in the LICENSE file that
+* accompanied this code).
+*
+* You should have received a copy of the GNU General Public License version
+* 2 along with this work; if not, write to the Free Software Foundation,
+* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+*
+* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+* or visit www.oracle.com if you need additional information or have any
+* questions.
+*/
+
+/*
+* @test TestCMSNoIncrementalMode
+* @key gc
+* @bug 8006398
+* @summary Test that CMS with incremental mode turned off does not print a warning message
+* @library /testlibrary
+*/
+
+import com.oracle.java.testlibrary.OutputAnalyzer;
+import com.oracle.java.testlibrary.ProcessTools;
+
+public class TestCMSNoIncrementalMode {
+
+ public static void main(String args[]) throws Exception {
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UseConcMarkSweepGC", "-XX:-CMSIncrementalMode", "-version");
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
+ output.shouldNotContain("warning");
+ output.shouldNotContain("error");
+ output.shouldHaveExitValue(0);
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/gc/startup_warnings/TestDefNewCMS.java Tue Mar 05 11:49:33 2013 -0800
@@ -0,0 +1,45 @@
+/*
+* Copyright (c) 2013, 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
+* under the terms of the GNU General Public License version 2 only, as
+* published by the Free Software Foundation.
+*
+* This code is distributed in the hope that it will be useful, but WITHOUT
+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+* version 2 for more details (a copy is included in the LICENSE file that
+* accompanied this code).
+*
+* You should have received a copy of the GNU General Public License version
+* 2 along with this work; if not, write to the Free Software Foundation,
+* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+*
+* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+* or visit www.oracle.com if you need additional information or have any
+* questions.
+*/
+
+/*
+* @test TestDefNewCMS
+* @key gc
+* @bug 8006398
+* @summary Test that the deprecated DefNew+CMS combination print a warning message
+* @library /testlibrary
+*/
+
+import com.oracle.java.testlibrary.OutputAnalyzer;
+import com.oracle.java.testlibrary.ProcessTools;
+
+public class TestDefNewCMS {
+
+ public static void main(String args[]) throws Exception {
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:-UseParNewGC", "-XX:+UseConcMarkSweepGC", "-version");
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
+ output.shouldContain("warning: Using the DefNew young collector with the CMS collector is deprecated and will likely be removed in a future release");
+ output.shouldNotContain("error");
+ output.shouldHaveExitValue(0);
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/gc/startup_warnings/TestG1.java Tue Mar 05 11:49:33 2013 -0800
@@ -0,0 +1,45 @@
+/*
+* Copyright (c) 2013, 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
+* under the terms of the GNU General Public License version 2 only, as
+* published by the Free Software Foundation.
+*
+* This code is distributed in the hope that it will be useful, but WITHOUT
+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+* version 2 for more details (a copy is included in the LICENSE file that
+* accompanied this code).
+*
+* You should have received a copy of the GNU General Public License version
+* 2 along with this work; if not, write to the Free Software Foundation,
+* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+*
+* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+* or visit www.oracle.com if you need additional information or have any
+* questions.
+*/
+
+/*
+* @test TestG1
+* @key gc
+* @bug 8006398
+* @summary Test that the G1 collector does not print a warning message
+* @library /testlibrary
+*/
+
+import com.oracle.java.testlibrary.OutputAnalyzer;
+import com.oracle.java.testlibrary.ProcessTools;
+
+public class TestG1 {
+
+ public static void main(String args[]) throws Exception {
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UseG1GC", "-version");
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
+ output.shouldNotContain("warning");
+ output.shouldNotContain("error");
+ output.shouldHaveExitValue(0);
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/gc/startup_warnings/TestIncGC.java Tue Mar 05 11:49:33 2013 -0800
@@ -0,0 +1,46 @@
+/*
+* Copyright (c) 2013, 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
+* under the terms of the GNU General Public License version 2 only, as
+* published by the Free Software Foundation.
+*
+* This code is distributed in the hope that it will be useful, but WITHOUT
+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+* version 2 for more details (a copy is included in the LICENSE file that
+* accompanied this code).
+*
+* You should have received a copy of the GNU General Public License version
+* 2 along with this work; if not, write to the Free Software Foundation,
+* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+*
+* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+* or visit www.oracle.com if you need additional information or have any
+* questions.
+*/
+
+/*
+* @test TestIncGC
+* @key gc
+* @bug 8006398
+* @summary Test that the deprecated -Xincgc print a warning message
+* @library /testlibrary
+*/
+
+import com.oracle.java.testlibrary.OutputAnalyzer;
+import com.oracle.java.testlibrary.ProcessTools;
+
+
+public class TestIncGC {
+
+ public static void main(String args[]) throws Exception {
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-Xincgc", "-version");
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
+ output.shouldContain("warning: Using incremental CMS is deprecated and will likely be removed in a future release");
+ output.shouldNotContain("error");
+ output.shouldHaveExitValue(0);
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/gc/startup_warnings/TestParNewCMS.java Tue Mar 05 11:49:33 2013 -0800
@@ -0,0 +1,46 @@
+/*
+* Copyright (c) 2013, 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
+* under the terms of the GNU General Public License version 2 only, as
+* published by the Free Software Foundation.
+*
+* This code is distributed in the hope that it will be useful, but WITHOUT
+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+* version 2 for more details (a copy is included in the LICENSE file that
+* accompanied this code).
+*
+* You should have received a copy of the GNU General Public License version
+* 2 along with this work; if not, write to the Free Software Foundation,
+* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+*
+* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+* or visit www.oracle.com if you need additional information or have any
+* questions.
+*/
+
+/*
+* @test TestParNewCMS
+* @key gc
+* @bug 8006398
+* @summary Test that the combination ParNew+CMS does not print a warning message
+* @library /testlibrary
+*/
+
+import com.oracle.java.testlibrary.OutputAnalyzer;
+import com.oracle.java.testlibrary.ProcessTools;
+
+
+public class TestParNewCMS {
+
+ public static void main(String args[]) throws Exception {
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UseParNewGC", "-XX:+UseConcMarkSweepGC", "-version");
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
+ output.shouldNotContain("warning");
+ output.shouldNotContain("error");
+ output.shouldHaveExitValue(0);
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/gc/startup_warnings/TestParNewSerialOld.java Tue Mar 05 11:49:33 2013 -0800
@@ -0,0 +1,46 @@
+/*
+* Copyright (c) 2013, 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
+* under the terms of the GNU General Public License version 2 only, as
+* published by the Free Software Foundation.
+*
+* This code is distributed in the hope that it will be useful, but WITHOUT
+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+* version 2 for more details (a copy is included in the LICENSE file that
+* accompanied this code).
+*
+* You should have received a copy of the GNU General Public License version
+* 2 along with this work; if not, write to the Free Software Foundation,
+* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+*
+* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+* or visit www.oracle.com if you need additional information or have any
+* questions.
+*/
+
+/*
+* @test TestParNewSerialOld
+* @key gc
+* @bug 8006398
+* @summary Test that the deprecated ParNew+SerialOld combination print a warning message
+* @library /testlibrary
+*/
+
+import com.oracle.java.testlibrary.OutputAnalyzer;
+import com.oracle.java.testlibrary.ProcessTools;
+
+
+public class TestParNewSerialOld {
+
+ public static void main(String args[]) throws Exception {
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UseParNewGC", "-version");
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
+ output.shouldContain("warning: Using the ParNew young collector with the Serial old collector is deprecated and will likely be removed in a future release");
+ output.shouldNotContain("error");
+ output.shouldHaveExitValue(0);
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/gc/startup_warnings/TestParallelGC.java Tue Mar 05 11:49:33 2013 -0800
@@ -0,0 +1,46 @@
+/*
+* Copyright (c) 2013, 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
+* under the terms of the GNU General Public License version 2 only, as
+* published by the Free Software Foundation.
+*
+* This code is distributed in the hope that it will be useful, but WITHOUT
+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+* version 2 for more details (a copy is included in the LICENSE file that
+* accompanied this code).
+*
+* You should have received a copy of the GNU General Public License version
+* 2 along with this work; if not, write to the Free Software Foundation,
+* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+*
+* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+* or visit www.oracle.com if you need additional information or have any
+* questions.
+*/
+
+/*
+* @test TestParallelGC
+* @key gc
+* @bug 8006398
+* @summary Test that ParallelGC does not print a warning message
+* @library /testlibrary
+*/
+
+import com.oracle.java.testlibrary.OutputAnalyzer;
+import com.oracle.java.testlibrary.ProcessTools;
+
+
+public class TestParallelGC {
+
+ public static void main(String args[]) throws Exception {
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UseParallelGC", "-version");
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
+ output.shouldNotContain("warning");
+ output.shouldNotContain("error");
+ output.shouldHaveExitValue(0);
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/gc/startup_warnings/TestParallelScavengeSerialOld.java Tue Mar 05 11:49:33 2013 -0800
@@ -0,0 +1,46 @@
+/*
+* Copyright (c) 2013, 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
+* under the terms of the GNU General Public License version 2 only, as
+* published by the Free Software Foundation.
+*
+* This code is distributed in the hope that it will be useful, but WITHOUT
+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+* version 2 for more details (a copy is included in the LICENSE file that
+* accompanied this code).
+*
+* You should have received a copy of the GNU General Public License version
+* 2 along with this work; if not, write to the Free Software Foundation,
+* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+*
+* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+* or visit www.oracle.com if you need additional information or have any
+* questions.
+*/
+
+/*
+* @test TestParallelScavengeSerialOld
+* @key gc
+* @bug 8006398
+* @summary Test that the ParallelScavenge+SerialOld combination does not print a warning message
+* @library /testlibrary
+*/
+
+import com.oracle.java.testlibrary.OutputAnalyzer;
+import com.oracle.java.testlibrary.ProcessTools;
+
+
+public class TestParallelScavengeSerialOld {
+
+ public static void main(String args[]) throws Exception {
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UseParallelGC", "-XX:-UseParallelOldGC", "-version");
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
+ output.shouldNotContain("warning");
+ output.shouldNotContain("error");
+ output.shouldHaveExitValue(0);
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/gc/startup_warnings/TestSerialGC.java Tue Mar 05 11:49:33 2013 -0800
@@ -0,0 +1,46 @@
+/*
+* Copyright (c) 2013, 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
+* under the terms of the GNU General Public License version 2 only, as
+* published by the Free Software Foundation.
+*
+* This code is distributed in the hope that it will be useful, but WITHOUT
+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+* version 2 for more details (a copy is included in the LICENSE file that
+* accompanied this code).
+*
+* You should have received a copy of the GNU General Public License version
+* 2 along with this work; if not, write to the Free Software Foundation,
+* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+*
+* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+* or visit www.oracle.com if you need additional information or have any
+* questions.
+*/
+
+/*
+* @test TestSerialGC
+* @key gc
+* @bug 8006398
+* @summary Test that SerialGC does not print a warning message
+* @library /testlibrary
+*/
+
+import com.oracle.java.testlibrary.OutputAnalyzer;
+import com.oracle.java.testlibrary.ProcessTools;
+
+
+public class TestSerialGC {
+
+ public static void main(String args[]) throws Exception {
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UseSerialGC", "-version");
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
+ output.shouldNotContain("warning");
+ output.shouldNotContain("error");
+ output.shouldHaveExitValue(0);
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/runtime/8007736/TestStaticIF.java Tue Mar 05 11:49:33 2013 -0800
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2013, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/*
+ * @test
+ * @bug 8007736
+ * @summary Test static interface method.
+ * @run main/othervm -Xverify:all TestStaticIF
+ */
+
+public class TestStaticIF implements StaticMethodInInterface {
+
+ public static void main(String[] args) {
+ System.out.printf("main: %s%n", StaticMethodInInterface.get());
+ }
+}
+
+interface StaticMethodInInterface {
+
+ public static String get() {
+ return "Hello from StaticMethodInInterface.get()";
+ }
+}
--- a/hotspot/test/runtime/NMT/AllocTestType.java Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/test/runtime/NMT/AllocTestType.java Tue Mar 05 11:49:33 2013 -0800
@@ -25,9 +25,10 @@
* @test
* @summary Test consistency of NMT by leaking a few select allocations of the Test type and then verify visibility with jcmd
* @key nmt jcmd
- * @library /testlibrary
- * @run compile -J-XX:+UnlockDiagnosticVMOptions -J-XX:+WhiteBoxAPI AllocTestType.java
- * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail AllocTestType
+ * @library /testlibrary /testlibrary/whitebox
+ * @build AllocTestType
+ * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail AllocTestType
*/
import com.oracle.java.testlibrary.*;
--- a/hotspot/test/runtime/NMT/PrintNMTStatistics.java Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/test/runtime/NMT/PrintNMTStatistics.java Tue Mar 05 11:49:33 2013 -0800
@@ -26,8 +26,8 @@
* @key nmt regression
* @bug 8005936
* @summary Make sure PrintNMTStatistics works on normal JVM exit
- * @library /testlibrary
- * @run compile -J-XX:+UnlockDiagnosticVMOptions -J-XX:+WhiteBoxAPI PrintNMTStatistics.java
+ * @library /testlibrary /testlibrary/whitebox
+ * @run compile PrintNMTStatistics.java
*/
import com.oracle.java.testlibrary.*;
--- a/hotspot/test/runtime/NMT/SummarySanityCheck.java Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/test/runtime/NMT/SummarySanityCheck.java Tue Mar 05 11:49:33 2013 -0800
@@ -25,9 +25,10 @@
* @test
* @key nmt jcmd
* @summary Sanity check the output of NMT
- * @library /testlibrary
- * @run compile -J-XX:+UnlockDiagnosticVMOptions -J-XX:+WhiteBoxAPI SummarySanityCheck.java
- * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:NativeMemoryTracking=summary -XX:+WhiteBoxAPI SummarySanityCheck
+ * @library /testlibrary /testlibrary/whitebox
+ * @build SummarySanityCheck
+ * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:NativeMemoryTracking=summary -XX:+WhiteBoxAPI SummarySanityCheck
*/
import com.oracle.java.testlibrary.*;
--- a/hotspot/test/sanity/WBApi.java Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/test/sanity/WBApi.java Tue Mar 05 11:49:33 2013 -0800
@@ -1,8 +1,33 @@
+/*
+ * Copyright (c) 2012, 2013 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
/*
* @test WBApi
* @summary verify that whitebox functions can be linked and executed
- * @run compile -J-XX:+UnlockDiagnosticVMOptions -J-XX:+WhiteBoxAPI WBApi.java
- * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI WBApi
+ * @library /testlibrary /testlibrary/whitebox
+ * @build WBApi
+ * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI WBApi
*/
import sun.hotspot.WhiteBox;
--- a/hotspot/test/serviceability/ParserTest.java Tue Mar 05 09:50:53 2013 -0500
+++ b/hotspot/test/serviceability/ParserTest.java Tue Mar 05 11:49:33 2013 -0800
@@ -1,8 +1,33 @@
+/*
+ * Copyright (c) 2012, 2013 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
/*
* @test ParserTest
- * @summary verify that whitebox functions can be linked and executed
- * @run compile -J-XX:+UnlockDiagnosticVMOptions -J-XX:+WhiteBoxAPI ParserTest.java
- * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI ParserTest
+ * @summary Test that the diagnostic command arguemnt parser works
+ * @library /testlibrary /testlibrary/whitebox
+ * @build ParserTest
+ * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI ParserTest
*/
import java.math.BigInteger;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/testlibrary/ClassFileInstaller.java Tue Mar 05 11:49:33 2013 -0800
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2013, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+
+/**
+ * Dump a class file for a class on the class path in the current directory
+ */
+public class ClassFileInstaller {
+ /**
+ * @param args The names of the classes to dump
+ * @throws Exception
+ */
+ public static void main(String... args) throws Exception {
+ for (String arg : args) {
+ ClassLoader cl = ClassFileInstaller.class.getClassLoader();
+
+ // Convert dotted class name to a path to a class file
+ String pathName = arg.replace('.', '/').concat(".class");
+ InputStream is = cl.getResourceAsStream(pathName);
+
+ // Create the class file's package directory
+ Path p = Paths.get(pathName);
+ Files.createDirectories(p.getParent());
+ // Create the class file
+ Files.copy(is, p, StandardCopyOption.REPLACE_EXISTING);
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/testlibrary/whitebox/sun/hotspot/WhiteBox.java Tue Mar 05 11:49:33 2013 -0800
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2012, 2013 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package sun.hotspot;
+
+import java.lang.reflect.Method;
+import java.security.BasicPermission;
+import sun.hotspot.parser.DiagnosticCommand;
+
+public class WhiteBox {
+
+ @SuppressWarnings("serial")
+ public static class WhiteBoxPermission extends BasicPermission {
+ public WhiteBoxPermission(String s) {
+ super(s);
+ }
+ }
+
+ private WhiteBox() {}
+ private static final WhiteBox instance = new WhiteBox();
+ private static native void registerNatives();
+
+ /**
+ * Returns the singleton WhiteBox instance.
+ *
+ * The returned WhiteBox object should be carefully guarded
+ * by the caller, since it can be used to read and write data
+ * at arbitrary memory addresses. It must never be passed to
+ * untrusted code.
+ */
+ public synchronized static WhiteBox getWhiteBox() {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null) {
+ sm.checkPermission(new WhiteBoxPermission("getInstance"));
+ }
+ return instance;
+ }
+
+ static {
+ registerNatives();
+ }
+
+ // Memory
+ public native long getObjectAddress(Object o);
+ public native int getHeapOopSize();
+
+ // Runtime
+ // Make sure class name is in the correct format
+ public boolean isClassAlive(String name) {
+ return isClassAlive0(name.replace('.', '/'));
+ }
+ private native boolean isClassAlive0(String name);
+
+ // G1
+ public native boolean g1InConcurrentMark();
+ public native boolean g1IsHumongous(Object o);
+ public native long g1NumFreeRegions();
+ public native int g1RegionSize();
+ public native Object[] parseCommandLine(String commandline, DiagnosticCommand[] args);
+
+ // NMT
+ public native boolean NMTAllocTest();
+ public native boolean NMTFreeTestMemory();
+ public native boolean NMTWaitForDataMerge();
+
+ // Compiler
+ public native void deoptimizeAll();
+ public native boolean isMethodCompiled(Method method);
+ public native boolean isMethodCompilable(Method method);
+ public native boolean isMethodQueuedForCompilation(Method method);
+ public native int deoptimizeMethod(Method method);
+ public native void makeMethodNotCompilable(Method method);
+ public native int getMethodCompilationLevel(Method method);
+ public native boolean setDontInlineMethod(Method method, boolean value);
+ public native int getCompileQueuesSize();
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/testlibrary/whitebox/sun/hotspot/parser/DiagnosticCommand.java Tue Mar 05 11:49:33 2013 -0800
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2012, 2013 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package sun.hotspot.parser;
+
+public class DiagnosticCommand {
+
+ public enum DiagnosticArgumentType {
+ JLONG, BOOLEAN, STRING, NANOTIME, STRINGARRAY, MEMORYSIZE
+ }
+
+ private String name;
+ private String desc;
+ private DiagnosticArgumentType type;
+ private boolean mandatory;
+ private String defaultValue;
+
+ public DiagnosticCommand(String name, String desc, DiagnosticArgumentType type,
+ boolean mandatory, String defaultValue) {
+ this.name = name;
+ this.desc = desc;
+ this.type = type;
+ this.mandatory = mandatory;
+ this.defaultValue = defaultValue;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public String getDesc() {
+ return desc;
+ }
+
+ public DiagnosticArgumentType getType() {
+ return type;
+ }
+
+ public boolean isMandatory() {
+ return mandatory;
+ }
+
+ public String getDefaultValue() {
+ return defaultValue;
+ }
+}
--- a/jaxp/.hgtags Tue Mar 05 09:50:53 2013 -0500
+++ b/jaxp/.hgtags Tue Mar 05 11:49:33 2013 -0800
@@ -199,3 +199,5 @@
ff0b73a6b3f6cea644d37d56d746a37743419fa7 jdk8-b75
0c08593944d0cd30645f6e1e4946c51ff2b10c8c jdk8-b76
573e789c187a69a3ae00bffd26eb35c0f4a60636 jdk8-b77
+00958c5a7070bd578aa8b70773cb3f204a9c1be1 jdk8-b78
+58fa065dd5d663d62f85402461388fb7a92656fa jdk8-b79
--- a/jaxws/.hgtags Tue Mar 05 09:50:53 2013 -0500
+++ b/jaxws/.hgtags Tue Mar 05 11:49:33 2013 -0800
@@ -199,3 +199,5 @@
966bf9f3c41a59ff5d86ff4275291c52f329f984 jdk8-b75
c4853f3f0e89ac60aa5b517f5f224f0f60e08577 jdk8-b76
64dfba1bad16433f609f17a42c3c5990367c5c0b jdk8-b77
+391de4c992d1960a09cdd340362ff936bac69323 jdk8-b78
+70d8658d2a3063bc13127f3452af017d838f1362 jdk8-b79
--- a/jdk/.hgtags Tue Mar 05 09:50:53 2013 -0500
+++ b/jdk/.hgtags Tue Mar 05 11:49:33 2013 -0800
@@ -199,3 +199,5 @@
4a67fdb752b7d6329d9be9c28d3f9d6cf7eb9a3c jdk8-b75
3a263052866137b645ab86498a43693ff5c19e69 jdk8-b76
b2fc8e31cecc35b76188e821d4c5dc0e0b74ac24 jdk8-b77
+00b7535d743f83eda763c10b3c9ea19ba4b67f55 jdk8-b78
+c933505d75c2a0a671f06d6dac5d2237a9228d2d jdk8-b79
--- a/jdk/make/common/Defs-macosx.gmk Tue Mar 05 09:50:53 2013 -0500
+++ b/jdk/make/common/Defs-macosx.gmk Tue Mar 05 11:49:33 2013 -0800
@@ -406,10 +406,16 @@
LIB_LOCATION ?= $(LIBDIR)
-# Adding these macros will make it an error to link to mac APIs newer than OS version 10.7
-ifeq ($(MACOSX_REQUIRED_VERSION),)
- MACOSX_REQUIRED_VERSION:=1070
+# Setting these parameters makes it an error to link to macosx APIs that are
+# newer than the given OS version and makes the linked binaries compatible even
+# if built on a newer version of the OS.
+# The expected format is X.Y.Z
+ifeq ($(MACOSX_VERSION_MIN),)
+ MACOSX_VERSION_MIN=10.7.0
endif
-MACOSX_OS_VERSION_CFLAGS := -DMAC_OS_X_VERSION_MAX_ALLOWED=$(MACOSX_REQUIRED_VERSION) -DMAC_OS_X_VERSION_MIN_REQUIRED=$(MACOSX_REQUIRED_VERSION)
+# The macro takes the version with no dots, ex: 1070
+MACOSX_OS_VERSION_CFLAGS := -DMAC_OS_X_VERSION_MAX_ALLOWED=$(subst .,,$(MACOSX_VERSION_MIN)) \
+ -mmacosx-version-min=$(MACOSX_VERSION_MIN)
OTHER_CFLAGS += $(MACOSX_OS_VERSION_CFLAGS)
OTHER_CXXFLAGS += $(MACOSX_OS_VERSION_CFLAGS)
+OTHER_LDFLAGS += -mmacosx-version-min=$(MACOSX_VERSION_MIN)
--- a/jdk/make/common/shared/Compiler-msvc.gmk Tue Mar 05 09:50:53 2013 -0500
+++ b/jdk/make/common/shared/Compiler-msvc.gmk Tue Mar 05 11:49:33 2013 -0800
@@ -28,6 +28,7 @@
#
ifeq ($(PLATFORM), windows)
+ifndef CONFIGURE_BUILD
CC = $(COMPILER_PATH)cl
CPP = $(COMPILER_PATH)cl
CXX = $(COMPILER_PATH)cl
@@ -36,7 +37,7 @@
LINK = $(COMPILER_PATH)link
LINK32 = $(LINK)
DUMPBIN = $(COMPILER_PATH)dumpbin.exe
-
+
# Fill in unknown values
COMPILER_NAME=Unknown MSVC Compiler
COMPILER_VERSION=
@@ -87,6 +88,6 @@
SHARED_LIBRARY_FLAG = -LD
# RSC is always same as RC (Not sure who uses this RSC variable)
RSC = $(RC)
-
+endif
endif
--- a/jdk/make/common/shared/Defs-utils.gmk Tue Mar 05 09:50:53 2013 -0500
+++ b/jdk/make/common/shared/Defs-utils.gmk Tue Mar 05 11:49:33 2013 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2013, 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
@@ -82,7 +82,9 @@
MCS = $(COMPILER_PATH)mcs
NM = $(COMPILER_PATH)nm
STRIP = $(COMPILER_PATH)strip
-else
+endif
+
+ifeq ($(PLATFORM),solaris)
AR = $(UTILS_CCS_BIN_PATH)ar
AS = $(UTILS_CCS_BIN_PATH)as
LD = $(UTILS_CCS_BIN_PATH)ld
--- a/jdk/make/sun/lwawt/FILES_export_macosx.gmk Tue Mar 05 09:50:53 2013 -0500
+++ b/jdk/make/sun/lwawt/FILES_export_macosx.gmk Tue Mar 05 11:49:33 2013 -0800
@@ -122,7 +122,6 @@
sun/lwawt/macosx/CTextPipe.java \
sun/lwawt/macosx/CDesktopPeer.java \
sun/java2d/CRenderer.java \
- sun/lwawt/macosx/EventDispatchAccess.java \
sun/lwawt/macosx/NSPrintInfo.java \
sun/lwawt/macosx/CAccessibility.java \
sun/lwawt/macosx/CAccessible.java \
--- a/jdk/makefiles/Images.gmk Tue Mar 05 09:50:53 2013 -0500
+++ b/jdk/makefiles/Images.gmk Tue Mar 05 11:49:33 2013 -0800
@@ -59,7 +59,7 @@
$(ECHO) $(LOG_INFO) Processing $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(MKDIR) -p $(@D)
$(RM) $@
- $(SED) 's/$$//g' $< > $@
+ LC_ALL=C $(SED) 's/$$//g' $< > $@
$(CHMOD) 444 $@
endef
--- a/langtools/.hgtags Tue Mar 05 09:50:53 2013 -0500
+++ b/langtools/.hgtags Tue Mar 05 11:49:33 2013 -0800
@@ -199,3 +199,5 @@
c2e11e2ec4a3682513e566849e5562f31ded8c65 jdk8-b75
e81839b3233792415daaab051698edc6067f1a16 jdk8-b76
89c66415168925dffe492356ff893ff248bb5603 jdk8-b77
+af8417e590f4e76e0dfed09e71239fb102ef0d43 jdk8-b78
+56dfafbb9e1ad7548a4415316dc003296fb498cb jdk8-b79