--- a/.hgtags Mon Oct 29 16:51:59 2012 -0700
+++ b/.hgtags Wed Oct 31 08:29:44 2012 -0700
@@ -182,3 +182,4 @@
479d3302a26d7607ba271d66973e59ebf58825b6 jdk8-b58
3bd874584fc01aae92fbc8827e2bd04d8b6ace04 jdk8-b59
5e3adc681779037a2d33b7be6f75680619085492 jdk8-b60
+cdaa6122185f9bf512dcd6600f56bfccc4824e8c jdk8-b61
--- a/.hgtags-top-repo Mon Oct 29 16:51:59 2012 -0700
+++ b/.hgtags-top-repo Wed Oct 31 08:29:44 2012 -0700
@@ -182,3 +182,4 @@
9367024804874faf8e958adeb333682bab1c0c47 jdk8-b58
dae9821589ccd2611bdf7084269b98e819091770 jdk8-b59
e07f499b9dccb529ecf74172cf6ac11a195ec57a jdk8-b60
+20ff117b509075c3aec4ee3a57990ecd5db5df9c jdk8-b61
--- a/README-builds.html Mon Oct 29 16:51:59 2012 -0700
+++ b/README-builds.html Wed Oct 31 08:29:44 2012 -0700
@@ -96,7 +96,8 @@
</li>
<li>Windows only:
<ul>
- <li>Unix Command Tools (<a href="#cygwin">CYGWIN</a>)</li>
+ <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>
@@ -161,7 +162,7 @@
<blockquote>
This file often describes specific requirements for what we call the
"minimum build environments" (MBE) for this
- specific release of the JDK,
+ 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.
@@ -241,16 +242,16 @@
</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.
+ 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
+ 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.
+ 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>
@@ -266,15 +267,15 @@
<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
+ 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:
+ 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>
@@ -283,15 +284,15 @@
<p>
<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
+ 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:
+ 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>
@@ -300,15 +301,15 @@
<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
+ 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:
+ 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>
@@ -360,16 +361,16 @@
<h4>Debian 5.0 (Lenny)</h4>
<p>
<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>:
+ 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:
+ 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>
@@ -380,52 +381,52 @@
<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.
+ 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.
+ 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:
+ 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:
+ 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:
+ 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:
+ 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:
+ 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:
+ 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>
@@ -436,20 +437,20 @@
<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:
+ 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:
+ 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:
+ Finally, you need to unset the <code>JAVA_HOME</code> environment variable:
<p/>
<code>export -n JAVA_HOME</code>
</blockquote>
@@ -460,14 +461,14 @@
<h4>Mandriva Linux One 2009 Spring</h4>
<p>
<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>:
+ 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:
+ 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>
@@ -478,18 +479,18 @@
<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:
+ 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:
+ 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:
+ 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>
</blockquote>
@@ -687,31 +688,20 @@
</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 (a cygwin <tt>make.exe</tt> is not the same
- as a <tt>make.exe</tt> built for something like
- <a href="http://www.mkssoftware.com/">MKS</a>).
- <br>
- <b>WARNING:</b> Watch out on some make 3.81 versions, it may
- not work due to a lack of support for MS-DOS drive letter paths
- like <tt>C:/</tt> or <tt>C:\</tt>.
- <br>
- You may be able to use the information at the
- <a href="http://developer.mozilla.org/en/docs/Windows_build_prerequisites_using_cygwin#make" target="_blank">
- mozilla developer center</a>
- on this topic.
- <br>
- It's hoped that when make 3.82 starts shipping in a future cygwin
- release that this MS-DOS path issue will be fixed.
- <br>
- It may be possible to download the version at
- <a href="http://www.cmake.org/files/cygwin/make.exe">
- www.cmake.org make.exe</a>.
- <br>
- It might be necessary for you to build your own GNU make 3.81,
- see the <a href="#buildgmake">"Building GNU make"</a> section
- in that case.
+ 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.
</li>
</ul>
<p>
@@ -727,7 +717,7 @@
<!-- ------------------------------------------------------ -->
<h4><a name="buildgmake">Building GNU make</a></h4>
<blockquote>
- First step is to get the GNU make 3.81 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
@@ -742,12 +732,24 @@
<tt>./configure && gmake CC=gcc</tt>
</li>
<li>
- <strong>Windows for CYGWIN:</strong>
- <tt>./configure && make</tt>
+ <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: (CYGWIN is recommended)</strong>
- <tt>./configure && make -f Makefile.win32</tt>
+ <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>
@@ -894,39 +896,135 @@
<h4><a name="paths">Windows Paths</a></h4>
<blockquote>
<strong>Windows:</strong>
- Note that GNU make is a historic utility and is based very
- heavily on shell scripting, so it does not tolerate the Windows habit
+ 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 \, and
- there is always a 'short' pathname without spaces for any path that
- contains spaces.
- Unfortunately, this short pathname can be somewhat dynamic and the
- formula is difficult to explain.
- You can use <tt>cygpath</tt> utility to map pathnames with spaces
- or the <tt>\</tt>character into the <tt>C:/</tt> style of pathname
- (called 'mixed'), e.g.
- <tt>cygpath -s -m "<i>path</i>"</tt>.
+ 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>
- Note that use of CYGWIN creates a unique problem with regards to
+ 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 uses ":").
+ 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.
- So be careful with paths on Windows.
+ </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 the
- <a href="#cygwin">CYGWIN product</a>.
+ 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
@@ -1097,9 +1195,9 @@
<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.
+ including specific patches.
<p>
- The Solaris SPARC patch list is:
+ The Solaris SPARC patch list is:
<ul>
<li>
118683-05: SunOS 5.10: Patch for profiling libraries and assembler
@@ -1286,7 +1384,8 @@
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>
+ <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
@@ -1456,7 +1555,9 @@
<td>Devel</td>
<td>make</td>
<td>The GNU version of the 'make' utility built for CYGWIN.<br>
- <b>NOTE</b>: See <a href="#gmake">the GNU make section</a></td>
+ <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>
@@ -1521,6 +1622,21 @@
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)
@@ -1781,10 +1897,10 @@
</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>
+ 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>
@@ -1792,9 +1908,9 @@
<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
+ 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>
@@ -1823,17 +1939,17 @@
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.
+ 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.
+ Used to pass cross-compilation options to the cross-compiler.
These are added to the <tt>CFLAGS</tt> and <tt>CXXFLAGS</tt> variables.
- </dd>
+ </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)
@@ -1868,23 +1984,23 @@
<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.
+ 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.
+ 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.
+ 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.
+ If set to true, causes certain jar files that would otherwise be built without
+ compression, to use compression.
</dd>
</dl>
</dd>
--- a/corba/.hgtags Mon Oct 29 16:51:59 2012 -0700
+++ b/corba/.hgtags Wed Oct 31 08:29:44 2012 -0700
@@ -182,3 +182,4 @@
18462a19f7bd66d38015f61ea549a5e0c0c889a3 jdk8-b58
d54dc53e223ed9ce7d5f4d2cd02ad9d5def3c2db jdk8-b59
207ef43ba69ead6cbbab415d81834545e4d46747 jdk8-b60
+0e08ba7648fb3faa0986cb217887d7c4990977f3 jdk8-b61
--- a/corba/make/common/shared/Defs-utils.gmk Mon Oct 29 16:51:59 2012 -0700
+++ b/corba/make/common/shared/Defs-utils.gmk Wed Oct 31 08:29:44 2012 -0700
@@ -151,16 +151,26 @@
ifeq ($(PLATFORM),windows)
ifdef USING_CYGWIN
# Intrinsic unix command, with backslash-escaped character interpretation
- ECHO = $(UNIXCOMMAND_PATH)echo -e
- ZIPEXE = $(UNIXCOMMAND_PATH)zip
- UNZIP = $(UNIXCOMMAND_PATH)unzip
+ ECHO = $(UNIXCOMMAND_PATH)echo -e
+ ZIPEXE = $(UNIXCOMMAND_PATH)zip
+ UNZIP = $(UNIXCOMMAND_PATH)unzip
+ # Some CYGWIN nawk versions require BINMODE=w for proper '\r' interpretation
+ NAWK = $(UNIXCOMMAND_PATH)awk -v BINMODE=w
else
- ZIPEXE = $(UTILS_DEVTOOL_PATH)zip
- UNZIP = $(UTILS_DEVTOOL_PATH)unzip
+ ifdef USING_MSYS
+ ECHO = $(UTILS_COMMAND_PATH)echo -e
+ ZIPEXE = $(UTILS_DEVTOOL_PATH)zip
+ UNZIP = $(UTILS_DEVTOOL_PATH)unzip
+ NAWK = $(UNIXCOMMAND_PATH)awk
+ else
+ ZIPEXE = $(UTILS_DEVTOOL_PATH)zip
+ UNZIP = $(UTILS_DEVTOOL_PATH)unzip
+ NAWK = $(UNIXCOMMAND_PATH)awk
+ endif
endif
# Re-define some utilities
LEX =# override GNU Make intrinsic: no lex on windows
- NAWK = $(UNIXCOMMAND_PATH)awk
+ SHA1SUM = $(UNIXCOMMAND_PATH)openssl sha1
endif
# Linux specific
--- a/corba/make/common/shared/Defs-windows.gmk Mon Oct 29 16:51:59 2012 -0700
+++ b/corba/make/common/shared/Defs-windows.gmk Wed Oct 31 08:29:44 2012 -0700
@@ -91,6 +91,15 @@
$(shell if [ "$1" != "" -a -d "$1" ]; then $(CYGPATH_CMD) "$1"; else echo "$1"; fi)
endef
else
+ifdef USING_MSYS
+DOSPATH_CMD:=$(shell cd $(JDK_TOPDIR) 2> $(DEV_NULL) && pwd)/make/tools/msys_build_scripts/dospath.sh
+define FullPath
+$(subst \,/,$(shell $(DOSPATH_CMD) $1))
+endef
+define OptFullPath
+$(shell if [ "$1" != "" -a -d "$1" ]; then (cd $1 && pwd); else echo "$1"; fi)
+endef
+else
# Temporary until we upgrade to MKS 8.7, MKS pwd returns mixed mode path
define FullPath
$(shell cd $1 2> $(DEV_NULL) && pwd)
@@ -99,6 +108,7 @@
$(shell if [ "$1" != "" -a -d "$1" ]; then (cd $1 && pwd); else echo "$1"; fi)
endef
endif
+endif
# System drive
ifdef SYSTEMDRIVE
@@ -112,14 +122,21 @@
# UNIXCOMMAND_PATH: path to where the most common Unix commands are.
# NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifndef UNIXCOMMAND_PATH
- ifdef ALT_UNIXCOMMAND_PATH
+# With cygwin, use this as is; don't use FullPath on it.
+ifdef ALT_UNIXCOMMAND_PATH
+ ifdef USING_CYGWIN
+ UNIXCOMMAND_PATH :=$(call PrefixPath,$(ALT_UNIXCOMMAND_PATH))
+ else
xALT_UNIXCOMMAND_PATH :="$(subst \,/,$(ALT_UNIXCOMMAND_PATH))"
fxALT_UNIXCOMMAND_PATH :=$(call FullPath,$(xALT_UNIXCOMMAND_PATH))
UNIXCOMMAND_PATH :=$(call PrefixPath,$(fxALT_UNIXCOMMAND_PATH))
+ endif
+else
+ ifdef USING_CYGWIN
+ UNIXCOMMAND_PATH :=$(call PrefixPath,/usr/bin)
else
- ifdef USING_CYGWIN
- UNIXCOMMAND_PATH :=$(call PrefixPath,/usr/bin)
+ ifdef USING_MSYS
+ UNIXCOMMAND_PATH :=$(call PrefixPath,/bin)
else
ifdef ROOTDIR
xROOTDIR :="$(subst \,/,$(ROOTDIR))"
@@ -131,41 +148,35 @@
ifneq ($(_rootdir),)
UNIXCOMMAND_PATH :=$(call PrefixPath,$(_rootdir)/mksnt)
endif
- endif
- endif
- UNIXCOMMAND_PATH:=$(call AltCheckSpaces,UNIXCOMMAND_PATH)
- export UNIXCOMMAND_PATH
+ endif # USING_MSYS
+ endif # USING_CYGWIN
endif
+UNIXCOMMAND_PATH:=$(call AltCheckSpaces,UNIXCOMMAND_PATH)
+export UNIXCOMMAND_PATH
# Get version of MKS or CYGWIN
-ifdef USING_CYGWIN
- ifndef CYGWIN_VER
- _CYGWIN_VER :=$(shell $(UNAME))
- CYGWIN_VER :=$(call GetVersion,$(_CYGWIN_VER))
- export CYGWIN_VER
+ifdef USING_MKS
+ _MKS_VER :=$(shell $(MKSINFO) 2>&1 | $(GREP) Release | $(TAIL) -1 | $(SED) -e 's@.*\(Release.*\)@\1@')
+ MKS_VER :=$(call GetVersion,$(_MKS_VER))
+ # At this point, we can re-define FullPath to use DOSNAME_CMD
+ CHECK_MKS87:=$(call CheckVersions,$(MKS_VER),8.7)
+ TRY_DOSNAME:=false
+ ifeq ($(CHECK_MKS87),same)
+ TRY_DOSNAME:=true
endif
-else # MKS
-_MKS_VER :=$(shell $(MKSINFO) 2>&1 | $(GREP) Release | $(TAIL) -1 | $(SED) -e 's@.*\(Release.*\)@\1@')
-MKS_VER :=$(call GetVersion,$(_MKS_VER))
-# At this point, we can re-define FullPath to use DOSNAME_CMD
-CHECK_MKS87:=$(call CheckVersions,$(MKS_VER),8.7)
-TRY_DOSNAME:=false
-ifeq ($(CHECK_MKS87),same)
-TRY_DOSNAME:=true
-endif
-# Newer should be ok
-ifeq ($(CHECK_MKS87),newer)
-TRY_DOSNAME:=true
-endif
-ifeq ($(TRY_DOSNAME),true)
-ifeq ($(shell $(UNIXCOMMAND_PATH)dosname -s $(_system_drive)/ 2> $(DEV_NULL)),$(_system_drive)/)
-_DOSNAME=$(UNIXCOMMAND_PATH)dosname
-DOSNAME_CMD:=$(_DOSNAME) -s
+ # Newer should be ok
+ ifeq ($(CHECK_MKS87),newer)
+ TRY_DOSNAME:=true
+ endif
+ ifeq ($(TRY_DOSNAME),true)
+ ifeq ($(shell $(UNIXCOMMAND_PATH)dosname -s $(_system_drive)/ 2> $(DEV_NULL)),$(_system_drive)/)
+ _DOSNAME=$(UNIXCOMMAND_PATH)dosname
+ DOSNAME_CMD:=$(_DOSNAME) -s
define FullPath
$(subst //,/,$(shell echo $1 | $(DOSNAME_CMD) 2> $(DEV_NULL)))
endef
-endif # test dosname -s
-endif # TRY_DOSNAME
+ endif # test dosname -s
+ endif # TRY_DOSNAME
endif # MKS
# We try to get references to what we need via the default component
@@ -240,6 +251,8 @@
# DEVTOOLS_PATH: for other tools required for building (such as zip, etc.)
# NOTE: Must end with / so that it could be empty, allowing PATH usage.
ifndef DEVTOOLS_PATH
+ # DEVTOOLS_PATH: for other tools required for building (such as zip, etc.)
+ # NOTE: Must end with / so that it could be empty, allowing PATH usage.
ifdef ALT_DEVTOOLS_PATH
xALT_DEVTOOLS_PATH :="$(subst \,/,$(ALT_DEVTOOLS_PATH))"
fxALT_DEVTOOLS_PATH :=$(call FullPath,$(xALT_DEVTOOLS_PATH))
@@ -248,10 +261,14 @@
ifdef USING_CYGWIN
DEVTOOLS_PATH :=$(UNIXCOMMAND_PATH)
else
- xDEVTOOLS_PATH :="$(_system_drive)/utils"
- fxDEVTOOLS_PATH :=$(call FullPath,$(xDEVTOOLS_PATH))
- DEVTOOLS_PATH :=$(call PrefixPath,$(fxDEVTOOLS_PATH))
- endif
+ ifdef USING_MSYS
+ DEVTOOLS_PATH :=$(UNIXCOMMAND_PATH)
+ else
+ xDEVTOOLS_PATH :="$(_system_drive)/utils"
+ fxDEVTOOLS_PATH :=$(call FullPath,$(xDEVTOOLS_PATH))
+ DEVTOOLS_PATH :=$(call PrefixPath,$(fxDEVTOOLS_PATH))
+ endif # USING_MSYS
+ endif # USING_CYGWIN
endif
DEVTOOLS_PATH:=$(call AltCheckSpaces,DEVTOOLS_PATH)
export DEVTOOLS_PATH
--- a/corba/make/common/shared/Platform.gmk Mon Oct 29 16:51:59 2012 -0700
+++ b/corba/make/common/shared/Platform.gmk Wed Oct 31 08:29:44 2012 -0700
@@ -65,6 +65,8 @@
# REQUIRED_WINDOWS_NAME windows only: basic name of windows
# REQUIRED_WINDOWS_VERSION windows only: specific version of windows
# USING_CYGWIN windows only: true or false
+# USING_MSYS windows only: true or false
+# USING_MKS windows only: true or false
# WINDOWS_NT_VERSION_STRING windows only: long version name
# REQUIRED_OS_VERSION required OS version, e.g. 5.10, 2.4
# REQUIRED_FREE_SPACE minimum disk space needed for outputdir
@@ -327,6 +329,8 @@
# Windows with and without CYGWIN will be slightly different
ifeq ($(SYSTEM_UNAME), Windows_NT)
PLATFORM = windows
+ USING_MKS = true
+ export USING_MKS
OS_VERSION := $(shell uname -r)
WINDOWS_NT_VERSION_STRING=Windows_NT
REQUIRED_MKS_VER=6.1
@@ -339,6 +343,11 @@
WINDOWS_NT_VERSION_STRING=CYGWIN_NT
REQUIRED_CYGWIN_VER=4.0
endif
+ifneq (,$(findstring MINGW,$(SYSTEM_UNAME)))
+ PLATFORM = windows
+ USING_MSYS = true
+ export USING_MSYS
+endif
# Platform settings specific to Windows
ifeq ($(PLATFORM), windows)
--- a/hotspot/.hgtags Mon Oct 29 16:51:59 2012 -0700
+++ b/hotspot/.hgtags Wed Oct 31 08:29:44 2012 -0700
@@ -285,3 +285,5 @@
1cc7a2a11d00832e3d07f81f3744a6883422db7e hs25-b04
3cfd05b2219a29649741a52637696f06acf24a4e jdk8-b60
b261523fe66c40a02968f0aa7e73602491bb3386 hs25-b05
+4547dc71db765276e027b0c2780b724bae0a07d3 jdk8-b61
+d0337c31c8be7716369b4e7c3bd5f352983c6a06 hs25-b06
--- a/hotspot/make/hotspot_version Mon Oct 29 16:51:59 2012 -0700
+++ b/hotspot/make/hotspot_version Wed Oct 31 08:29:44 2012 -0700
@@ -35,7 +35,7 @@
HS_MAJOR_VER=25
HS_MINOR_VER=0
-HS_BUILD_NUMBER=05
+HS_BUILD_NUMBER=06
JDK_MAJOR_VER=1
JDK_MINOR_VER=8
--- a/hotspot/src/share/vm/classfile/classFileParser.cpp Mon Oct 29 16:51:59 2012 -0700
+++ b/hotspot/src/share/vm/classfile/classFileParser.cpp Wed Oct 31 08:29:44 2012 -0700
@@ -67,7 +67,7 @@
#define JAVA_CLASSFILE_MAGIC 0xCAFEBABE
#define JAVA_MIN_SUPPORTED_VERSION 45
-#define JAVA_MAX_SUPPORTED_VERSION 51
+#define JAVA_MAX_SUPPORTED_VERSION 52
#define JAVA_MAX_SUPPORTED_MINOR_VERSION 0
// Used for two backward compatibility reasons:
--- a/hotspot/src/share/vm/classfile/javaClasses.cpp Mon Oct 29 16:51:59 2012 -0700
+++ b/hotspot/src/share/vm/classfile/javaClasses.cpp Wed Oct 31 08:29:44 2012 -0700
@@ -413,8 +413,7 @@
}
bool java_lang_String::equals(oop java_string, jchar* chars, int len) {
- assert(SharedSkipVerify ||
- java_string->klass() == SystemDictionary::String_klass(),
+ assert(java_string->klass() == SystemDictionary::String_klass(),
"must be java_string");
typeArrayOop value = java_lang_String::value(java_string);
int offset = java_lang_String::offset(java_string);
--- a/hotspot/src/share/vm/classfile/systemDictionary.cpp Mon Oct 29 16:51:59 2012 -0700
+++ b/hotspot/src/share/vm/classfile/systemDictionary.cpp Wed Oct 31 08:29:44 2012 -0700
@@ -1699,6 +1699,9 @@
blk->do_oop(&_system_loader_lock_obj);
dictionary()->always_strong_oops_do(blk);
+
+ // Visit extra methods
+ invoke_method_table()->oops_do(blk);
}
void SystemDictionary::always_strong_classes_do(KlassClosure* closure) {
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp Mon Oct 29 16:51:59 2012 -0700
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp Wed Oct 31 08:29:44 2012 -0700
@@ -2395,7 +2395,7 @@
if (VerifyBeforeGC &&
GenCollectedHeap::heap()->total_collections() >= VerifyGCStartAt) {
- Universe::verify(true);
+ Universe::verify();
}
// Snapshot the soft reference policy to be used in this collection cycle.
@@ -2419,7 +2419,7 @@
if (VerifyDuringGC &&
GenCollectedHeap::heap()->total_collections() >= VerifyGCStartAt) {
gclog_or_tty->print("Verify before initial mark: ");
- Universe::verify(true);
+ Universe::verify();
}
{
bool res = markFromRoots(false);
@@ -2431,7 +2431,7 @@
if (VerifyDuringGC &&
GenCollectedHeap::heap()->total_collections() >= VerifyGCStartAt) {
gclog_or_tty->print("Verify before re-mark: ");
- Universe::verify(true);
+ Universe::verify();
}
checkpointRootsFinal(false, clear_all_soft_refs,
init_mark_was_synchronous);
@@ -2443,7 +2443,7 @@
if (VerifyDuringGC &&
GenCollectedHeap::heap()->total_collections() >= VerifyGCStartAt) {
gclog_or_tty->print("Verify before sweep: ");
- Universe::verify(true);
+ Universe::verify();
}
sweep(false);
assert(_collectorState == Resizing, "Incorrect state");
@@ -2459,7 +2459,7 @@
if (VerifyDuringGC &&
GenCollectedHeap::heap()->total_collections() >= VerifyGCStartAt) {
gclog_or_tty->print("Verify before reset: ");
- Universe::verify(true);
+ Universe::verify();
}
reset(false);
assert(_collectorState == Idling, "Collector state should "
@@ -2486,7 +2486,7 @@
if (VerifyAfterGC &&
GenCollectedHeap::heap()->total_collections() >= VerifyGCStartAt) {
- Universe::verify(true);
+ Universe::verify();
}
if (TraceCMSState) {
gclog_or_tty->print_cr("CMS Thread " INTPTR_FORMAT
@@ -5668,7 +5668,7 @@
if (VerifyDuringGC &&
GenCollectedHeap::heap()->total_collections() >= VerifyGCStartAt) {
HandleMark hm; // Discard invalid handles created during verification
- Universe::verify(true);
+ Universe::verify();
}
{
TraceTime t("root rescan", PrintGCDetails, false, gclog_or_tty);
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp Mon Oct 29 16:51:59 2012 -0700
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp Wed Oct 31 08:29:44 2012 -0700
@@ -64,7 +64,7 @@
FreelistLocker x(_collector);
MutexLockerEx y(_collector->bitMapLock(), Mutex::_no_safepoint_check_flag);
Universe::heap()->prepare_for_verify();
- Universe::verify(true);
+ Universe::verify();
}
}
@@ -74,7 +74,7 @@
HandleMark hm;
FreelistLocker x(_collector);
MutexLockerEx y(_collector->bitMapLock(), Mutex::_no_safepoint_check_flag);
- Universe::verify(true);
+ Universe::verify();
}
}
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp Mon Oct 29 16:51:59 2012 -0700
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp Wed Oct 31 08:29:44 2012 -0700
@@ -426,11 +426,11 @@
_markStack(this),
// _finger set in set_non_marking_state
- _max_task_num(MAX2((uint)ParallelGCThreads, 1U)),
+ _max_worker_id(MAX2((uint)ParallelGCThreads, 1U)),
// _active_tasks set in set_non_marking_state
// _tasks set inside the constructor
- _task_queues(new CMTaskQueueSet((int) _max_task_num)),
- _terminator(ParallelTaskTerminator((int) _max_task_num, _task_queues)),
+ _task_queues(new CMTaskQueueSet((int) _max_worker_id)),
+ _terminator(ParallelTaskTerminator((int) _max_worker_id, _task_queues)),
_has_overflown(false),
_concurrent(false),
@@ -481,17 +481,17 @@
_root_regions.init(_g1h, this);
- _tasks = NEW_C_HEAP_ARRAY(CMTask*, _max_task_num, mtGC);
- _accum_task_vtime = NEW_C_HEAP_ARRAY(double, _max_task_num, mtGC);
-
- _count_card_bitmaps = NEW_C_HEAP_ARRAY(BitMap, _max_task_num, mtGC);
- _count_marked_bytes = NEW_C_HEAP_ARRAY(size_t*, _max_task_num, mtGC);
+ _tasks = NEW_C_HEAP_ARRAY(CMTask*, _max_worker_id, mtGC);
+ _accum_task_vtime = NEW_C_HEAP_ARRAY(double, _max_worker_id, mtGC);
+
+ _count_card_bitmaps = NEW_C_HEAP_ARRAY(BitMap, _max_worker_id, mtGC);
+ _count_marked_bytes = NEW_C_HEAP_ARRAY(size_t*, _max_worker_id, mtGC);
BitMap::idx_t card_bm_size = _card_bm.size();
// so that the assertion in MarkingTaskQueue::task_queue doesn't fail
- _active_tasks = _max_task_num;
- for (int i = 0; i < (int) _max_task_num; ++i) {
+ _active_tasks = _max_worker_id;
+ for (uint i = 0; i < _max_worker_id; ++i) {
CMTaskQueue* task_queue = new CMTaskQueue();
task_queue->initialize();
_task_queues->register_queue(i, task_queue);
@@ -638,7 +638,7 @@
// We do reset all of them, since different phases will use
// different number of active threads. So, it's easiest to have all
// of them ready.
- for (int i = 0; i < (int) _max_task_num; ++i) {
+ for (uint i = 0; i < _max_worker_id; ++i) {
_tasks[i]->reset(_nextMarkBitMap);
}
@@ -648,7 +648,7 @@
}
void ConcurrentMark::set_phase(uint active_tasks, bool concurrent) {
- assert(active_tasks <= _max_task_num, "we should not have more");
+ assert(active_tasks <= _max_worker_id, "we should not have more");
_active_tasks = active_tasks;
// Need to update the three data structures below according to the
@@ -659,7 +659,7 @@
_concurrent = concurrent;
// We propagate this to all tasks, not just the active ones.
- for (int i = 0; i < (int) _max_task_num; ++i)
+ for (uint i = 0; i < _max_worker_id; ++i)
_tasks[i]->set_concurrent(concurrent);
if (concurrent) {
@@ -818,9 +818,9 @@
* doesn't manipulate any data structures afterwards.
*/
-void ConcurrentMark::enter_first_sync_barrier(int task_num) {
+void ConcurrentMark::enter_first_sync_barrier(uint worker_id) {
if (verbose_low()) {
- gclog_or_tty->print_cr("[%d] entering first barrier", task_num);
+ gclog_or_tty->print_cr("[%u] entering first barrier", worker_id);
}
if (concurrent()) {
@@ -834,11 +834,11 @@
// more work
if (verbose_low()) {
- gclog_or_tty->print_cr("[%d] leaving first barrier", task_num);
+ gclog_or_tty->print_cr("[%u] leaving first barrier", worker_id);
}
- // let task 0 do this
- if (task_num == 0) {
+ // let the task associated with with worker 0 do this
+ if (worker_id == 0) {
// task 0 is responsible for clearing the global data structures
// We should be here because of an overflow. During STW we should
// not clear the overflow flag since we rely on it being true when
@@ -858,9 +858,9 @@
// then go into the second barrier
}
-void ConcurrentMark::enter_second_sync_barrier(int task_num) {
+void ConcurrentMark::enter_second_sync_barrier(uint worker_id) {
if (verbose_low()) {
- gclog_or_tty->print_cr("[%d] entering second barrier", task_num);
+ gclog_or_tty->print_cr("[%u] entering second barrier", worker_id);
}
if (concurrent()) {
@@ -873,7 +873,7 @@
// at this point everything should be re-initialised and ready to go
if (verbose_low()) {
- gclog_or_tty->print_cr("[%d] leaving second barrier", task_num);
+ gclog_or_tty->print_cr("[%u] leaving second barrier", worker_id);
}
}
@@ -1120,8 +1120,8 @@
HandleMark hm; // handle scope
gclog_or_tty->print(" VerifyDuringGC:(before)");
Universe::heap()->prepare_for_verify();
- Universe::verify(/* silent */ false,
- /* option */ VerifyOption_G1UsePrevMarking);
+ Universe::verify(/* silent */ false,
+ /* option */ VerifyOption_G1UsePrevMarking);
}
G1CollectorPolicy* g1p = g1h->g1_policy();
@@ -1159,8 +1159,8 @@
HandleMark hm; // handle scope
gclog_or_tty->print(" VerifyDuringGC:(after)");
Universe::heap()->prepare_for_verify();
- Universe::verify(/* silent */ false,
- /* option */ VerifyOption_G1UseNextMarking);
+ Universe::verify(/* silent */ false,
+ /* option */ VerifyOption_G1UseNextMarking);
}
assert(!restart_for_overflow(), "sanity");
}
@@ -1811,8 +1811,8 @@
HandleMark hm; // handle scope
gclog_or_tty->print(" VerifyDuringGC:(before)");
Universe::heap()->prepare_for_verify();
- Universe::verify(/* silent */ false,
- /* option */ VerifyOption_G1UsePrevMarking);
+ Universe::verify(/* silent */ false,
+ /* option */ VerifyOption_G1UsePrevMarking);
}
G1CollectorPolicy* g1p = G1CollectedHeap::heap()->g1_policy();
@@ -1966,8 +1966,8 @@
HandleMark hm; // handle scope
gclog_or_tty->print(" VerifyDuringGC:(after)");
Universe::heap()->prepare_for_verify();
- Universe::verify(/* silent */ false,
- /* option */ VerifyOption_G1UsePrevMarking);
+ Universe::verify(/* silent */ false,
+ /* option */ VerifyOption_G1UsePrevMarking);
}
g1h->verify_region_sets_optional();
@@ -2113,9 +2113,9 @@
if (!_cm->has_overflown()) {
oop obj = oopDesc::load_decode_heap_oop(p);
if (_cm->verbose_high()) {
- gclog_or_tty->print_cr("\t[%d] we're looking at location "
+ gclog_or_tty->print_cr("\t[%u] we're looking at location "
"*"PTR_FORMAT" = "PTR_FORMAT,
- _task->task_id(), p, (void*) obj);
+ _task->worker_id(), p, (void*) obj);
}
_task->deal_with_reference(obj);
@@ -2144,7 +2144,7 @@
}
} else {
if (_cm->verbose_high()) {
- gclog_or_tty->print_cr("\t[%d] CM Overflow", _task->task_id());
+ gclog_or_tty->print_cr("\t[%u] CM Overflow", _task->worker_id());
}
}
}
@@ -2160,8 +2160,8 @@
void do_void() {
do {
if (_cm->verbose_high()) {
- gclog_or_tty->print_cr("\t[%d] Drain: Calling do marking_step",
- _task->task_id());
+ gclog_or_tty->print_cr("\t[%u] Drain: Calling do marking_step",
+ _task->worker_id());
}
// We call CMTask::do_marking_step() to completely drain the local and
@@ -2300,7 +2300,7 @@
// We use the work gang from the G1CollectedHeap and we utilize all
// the worker threads.
uint active_workers = g1h->workers() ? g1h->workers()->active_workers() : 1U;
- active_workers = MAX2(MIN2(active_workers, _max_task_num), 1U);
+ active_workers = MAX2(MIN2(active_workers, _max_worker_id), 1U);
G1CMRefProcTaskExecutor par_task_executor(g1h, this,
g1h->workers(), active_workers);
@@ -2619,7 +2619,7 @@
}
HeapRegion*
-ConcurrentMark::claim_region(int task_num) {
+ConcurrentMark::claim_region(uint worker_id) {
// "checkpoint" the finger
HeapWord* finger = _finger;
@@ -2657,10 +2657,10 @@
HeapWord* limit = curr_region->next_top_at_mark_start();
if (verbose_low()) {
- gclog_or_tty->print_cr("[%d] curr_region = "PTR_FORMAT" "
+ gclog_or_tty->print_cr("[%u] curr_region = "PTR_FORMAT" "
"["PTR_FORMAT", "PTR_FORMAT"), "
"limit = "PTR_FORMAT,
- task_num, curr_region, bottom, end, limit);
+ worker_id, curr_region, bottom, end, limit);
}
// Is the gap between reading the finger and doing the CAS too long?
@@ -2673,22 +2673,22 @@
assert(_finger >= end, "the finger should have moved forward");
if (verbose_low()) {
- gclog_or_tty->print_cr("[%d] we were successful with region = "
- PTR_FORMAT, task_num, curr_region);
+ gclog_or_tty->print_cr("[%u] we were successful with region = "
+ PTR_FORMAT, worker_id, curr_region);
}
if (limit > bottom) {
if (verbose_low()) {
- gclog_or_tty->print_cr("[%d] region "PTR_FORMAT" is not empty, "
- "returning it ", task_num, curr_region);
+ gclog_or_tty->print_cr("[%u] region "PTR_FORMAT" is not empty, "
+ "returning it ", worker_id, curr_region);
}
return curr_region;
} else {
assert(limit == bottom,
"the region limit should be at bottom");
if (verbose_low()) {
- gclog_or_tty->print_cr("[%d] region "PTR_FORMAT" is empty, "
- "returning NULL", task_num, curr_region);
+ gclog_or_tty->print_cr("[%u] region "PTR_FORMAT" is empty, "
+ "returning NULL", worker_id, curr_region);
}
// we return NULL and the caller should try calling
// claim_region() again.
@@ -2697,10 +2697,10 @@
} else {
assert(_finger > finger, "the finger should have moved forward");
if (verbose_low()) {
- gclog_or_tty->print_cr("[%d] somebody else moved the finger, "
+ gclog_or_tty->print_cr("[%u] somebody else moved the finger, "
"global finger = "PTR_FORMAT", "
"our finger = "PTR_FORMAT,
- task_num, _finger, finger);
+ worker_id, _finger, finger);
}
// read it again
@@ -2783,7 +2783,7 @@
_markStack.oops_do(&cl);
// Verify entries on the task queues
- for (int i = 0; i < (int) _max_task_num; i += 1) {
+ for (uint i = 0; i < _max_worker_id; i += 1) {
cl.set_phase(VerifyNoCSetOopsQueues, i);
OopTaskQueue* queue = _task_queues->queue(i);
queue->oops_do(&cl);
@@ -2822,7 +2822,7 @@
}
// Verify the task fingers
- assert(parallel_marking_threads() <= _max_task_num, "sanity");
+ assert(parallel_marking_threads() <= _max_worker_id, "sanity");
for (int i = 0; i < (int) parallel_marking_threads(); i += 1) {
CMTask* task = _tasks[i];
HeapWord* task_finger = task->finger();
@@ -2849,7 +2849,7 @@
}
_finger = _heap_start;
- for (int i = 0; i < (int)_max_task_num; ++i) {
+ for (uint i = 0; i < _max_worker_id; ++i) {
OopTaskQueue* queue = _task_queues->queue(i);
queue->set_empty();
}
@@ -2862,15 +2862,15 @@
ConcurrentMark* _cm;
CardTableModRefBS* _ct_bs;
BitMap* _cm_card_bm;
- size_t _max_task_num;
+ uint _max_worker_id;
public:
AggregateCountDataHRClosure(G1CollectedHeap* g1h,
BitMap* cm_card_bm,
- size_t max_task_num) :
+ uint max_worker_id) :
_g1h(g1h), _cm(g1h->concurrent_mark()),
_ct_bs((CardTableModRefBS*) (g1h->barrier_set())),
- _cm_card_bm(cm_card_bm), _max_task_num(max_task_num) { }
+ _cm_card_bm(cm_card_bm), _max_worker_id(max_worker_id) { }
bool doHeapRegion(HeapRegion* hr) {
if (hr->continuesHumongous()) {
@@ -2927,7 +2927,7 @@
uint hrs_index = hr->hrs_index();
size_t marked_bytes = 0;
- for (int i = 0; (size_t)i < _max_task_num; i += 1) {
+ for (uint i = 0; i < _max_worker_id; i += 1) {
size_t* marked_bytes_array = _cm->count_marked_bytes_array_for(i);
BitMap* task_card_bm = _cm->count_card_bitmap_for(i);
@@ -2935,7 +2935,7 @@
// add it to the running total for this region.
marked_bytes += marked_bytes_array[hrs_index];
- // Now union the bitmaps[0,max_task_num)[start_idx..limit_idx)
+ // Now union the bitmaps[0,max_worker_id)[start_idx..limit_idx)
// into the global card bitmap.
BitMap::idx_t scan_idx = task_card_bm->get_next_one_offset(start_idx, limit_idx);
@@ -2967,22 +2967,22 @@
G1CollectedHeap* _g1h;
ConcurrentMark* _cm;
BitMap* _cm_card_bm;
- size_t _max_task_num;
+ uint _max_worker_id;
int _active_workers;
public:
G1AggregateCountDataTask(G1CollectedHeap* g1h,
ConcurrentMark* cm,
BitMap* cm_card_bm,
- size_t max_task_num,
+ uint max_worker_id,
int n_workers) :
AbstractGangTask("Count Aggregation"),
_g1h(g1h), _cm(cm), _cm_card_bm(cm_card_bm),
- _max_task_num(max_task_num),
+ _max_worker_id(max_worker_id),
_active_workers(n_workers) { }
void work(uint worker_id) {
- AggregateCountDataHRClosure cl(_g1h, _cm_card_bm, _max_task_num);
+ AggregateCountDataHRClosure cl(_g1h, _cm_card_bm, _max_worker_id);
if (G1CollectedHeap::use_parallel_gc_threads()) {
_g1h->heap_region_par_iterate_chunked(&cl, worker_id,
@@ -3001,7 +3001,7 @@
1);
G1AggregateCountDataTask g1_par_agg_task(_g1h, this, &_card_bm,
- _max_task_num, n_workers);
+ _max_worker_id, n_workers);
if (G1CollectedHeap::use_parallel_gc_threads()) {
assert(_g1h->check_heap_region_claim_values(HeapRegion::InitialClaimValue),
@@ -3030,9 +3030,9 @@
_region_bm.clear();
uint max_regions = _g1h->max_regions();
- assert(_max_task_num != 0, "unitialized");
-
- for (int i = 0; (size_t) i < _max_task_num; i += 1) {
+ assert(_max_worker_id > 0, "uninitialized");
+
+ for (uint i = 0; i < _max_worker_id; i += 1) {
BitMap* task_card_bm = count_card_bitmap_for(i);
size_t* marked_bytes_array = count_marked_bytes_array_for(i);
@@ -3062,7 +3062,7 @@
clear_all_count_data();
// Empty mark stack
clear_marking_state();
- for (int i = 0; i < (int)_max_task_num; ++i) {
+ for (uint i = 0; i < _max_worker_id; ++i) {
_tasks[i]->clear_region_fields();
}
_has_aborted = true;
@@ -3154,8 +3154,8 @@
void ConcurrentMark::print_finger() {
gclog_or_tty->print_cr("heap ["PTR_FORMAT", "PTR_FORMAT"), global finger = "PTR_FORMAT,
_heap_start, _heap_end, _finger);
- for (int i = 0; i < (int) _max_task_num; ++i) {
- gclog_or_tty->print(" %d: "PTR_FORMAT, i, _tasks[i]->finger());
+ for (uint i = 0; i < _max_worker_id; ++i) {
+ gclog_or_tty->print(" %u: "PTR_FORMAT, i, _tasks[i]->finger());
}
gclog_or_tty->print_cr("");
}
@@ -3165,8 +3165,8 @@
assert(_nextMarkBitMap->isMarked((HeapWord*) obj), "invariant");
if (_cm->verbose_high()) {
- gclog_or_tty->print_cr("[%d] we're scanning object "PTR_FORMAT,
- _task_id, (void*) obj);
+ gclog_or_tty->print_cr("[%u] we're scanning object "PTR_FORMAT,
+ _worker_id, (void*) obj);
}
size_t obj_size = obj->size();
@@ -3245,8 +3245,8 @@
"claim_region() should have filtered out continues humongous regions");
if (_cm->verbose_low()) {
- gclog_or_tty->print_cr("[%d] setting up for region "PTR_FORMAT,
- _task_id, hr);
+ gclog_or_tty->print_cr("[%u] setting up for region "PTR_FORMAT,
+ _worker_id, hr);
}
_curr_region = hr;
@@ -3261,9 +3261,9 @@
if (limit == bottom) {
if (_cm->verbose_low()) {
- gclog_or_tty->print_cr("[%d] found an empty region "
+ gclog_or_tty->print_cr("[%u] found an empty region "
"["PTR_FORMAT", "PTR_FORMAT")",
- _task_id, bottom, limit);
+ _worker_id, bottom, limit);
}
// The region was collected underneath our feet.
// We set the finger to bottom to ensure that the bitmap
@@ -3294,8 +3294,8 @@
void CMTask::giveup_current_region() {
assert(_curr_region != NULL, "invariant");
if (_cm->verbose_low()) {
- gclog_or_tty->print_cr("[%d] giving up region "PTR_FORMAT,
- _task_id, _curr_region);
+ gclog_or_tty->print_cr("[%u] giving up region "PTR_FORMAT,
+ _worker_id, _curr_region);
}
clear_region_fields();
}
@@ -3321,7 +3321,7 @@
guarantee(nextMarkBitMap != NULL, "invariant");
if (_cm->verbose_low()) {
- gclog_or_tty->print_cr("[%d] resetting", _task_id);
+ gclog_or_tty->print_cr("[%u] resetting", _worker_id);
}
_nextMarkBitMap = nextMarkBitMap;
@@ -3415,9 +3415,9 @@
_all_clock_intervals_ms.add(last_interval_ms);
if (_cm->verbose_medium()) {
- gclog_or_tty->print_cr("[%d] regular clock, interval = %1.2lfms, "
+ gclog_or_tty->print_cr("[%u] regular clock, interval = %1.2lfms, "
"scanned = %d%s, refs reached = %d%s",
- _task_id, last_interval_ms,
+ _worker_id, last_interval_ms,
_words_scanned,
(_words_scanned >= _words_scanned_limit) ? " (*)" : "",
_refs_reached,
@@ -3449,8 +3449,8 @@
SATBMarkQueueSet& satb_mq_set = JavaThread::satb_mark_queue_set();
if (!_draining_satb_buffers && satb_mq_set.process_completed_buffers()) {
if (_cm->verbose_low()) {
- gclog_or_tty->print_cr("[%d] aborting to deal with pending SATB buffers",
- _task_id);
+ gclog_or_tty->print_cr("[%u] aborting to deal with pending SATB buffers",
+ _worker_id);
}
// we do need to process SATB buffers, we'll abort and restart
// the marking task to do so
@@ -3475,7 +3475,7 @@
// scanning limit so that the clock is called earlier.
if (_cm->verbose_medium()) {
- gclog_or_tty->print_cr("[%d] decreasing limits", _task_id);
+ gclog_or_tty->print_cr("[%u] decreasing limits", _worker_id);
}
_words_scanned_limit = _real_words_scanned_limit -
@@ -3503,16 +3503,16 @@
if (!_cm->mark_stack_push(buffer, n)) {
if (_cm->verbose_low()) {
- gclog_or_tty->print_cr("[%d] aborting due to global stack overflow",
- _task_id);
+ gclog_or_tty->print_cr("[%u] aborting due to global stack overflow",
+ _worker_id);
}
set_has_aborted();
} else {
// the transfer was successful
if (_cm->verbose_medium()) {
- gclog_or_tty->print_cr("[%d] pushed %d entries to the global stack",
- _task_id, n);
+ gclog_or_tty->print_cr("[%u] pushed %d entries to the global stack",
+ _worker_id, n);
}
statsOnly( int tmp_size = _cm->mark_stack_size();
if (tmp_size > _global_max_size) {
@@ -3539,8 +3539,8 @@
statsOnly( ++_global_transfers_from; _global_pops += n );
if (_cm->verbose_medium()) {
- gclog_or_tty->print_cr("[%d] popped %d entries from the global stack",
- _task_id, n);
+ gclog_or_tty->print_cr("[%u] popped %d entries from the global stack",
+ _worker_id, n);
}
for (int i = 0; i < n; ++i) {
bool success = _task_queue->push(buffer[i]);
@@ -3575,8 +3575,8 @@
if (_task_queue->size() > target_size) {
if (_cm->verbose_high()) {
- gclog_or_tty->print_cr("[%d] draining local queue, target size = %d",
- _task_id, target_size);
+ gclog_or_tty->print_cr("[%u] draining local queue, target size = %d",
+ _worker_id, target_size);
}
oop obj;
@@ -3585,7 +3585,7 @@
statsOnly( ++_local_pops );
if (_cm->verbose_high()) {
- gclog_or_tty->print_cr("[%d] popped "PTR_FORMAT, _task_id,
+ gclog_or_tty->print_cr("[%u] popped "PTR_FORMAT, _worker_id,
(void*) obj);
}
@@ -3603,8 +3603,8 @@
}
if (_cm->verbose_high()) {
- gclog_or_tty->print_cr("[%d] drained local queue, size = %d",
- _task_id, _task_queue->size());
+ gclog_or_tty->print_cr("[%u] drained local queue, size = %d",
+ _worker_id, _task_queue->size());
}
}
}
@@ -3631,8 +3631,8 @@
if (_cm->mark_stack_size() > target_size) {
if (_cm->verbose_low()) {
- gclog_or_tty->print_cr("[%d] draining global_stack, target size %d",
- _task_id, target_size);
+ gclog_or_tty->print_cr("[%u] draining global_stack, target size %d",
+ _worker_id, target_size);
}
while (!has_aborted() && _cm->mark_stack_size() > target_size) {
@@ -3641,8 +3641,8 @@
}
if (_cm->verbose_low()) {
- gclog_or_tty->print_cr("[%d] drained global stack, size = %d",
- _task_id, _cm->mark_stack_size());
+ gclog_or_tty->print_cr("[%u] drained global stack, size = %d",
+ _worker_id, _cm->mark_stack_size());
}
}
}
@@ -3663,7 +3663,7 @@
CMObjectClosure oc(this);
SATBMarkQueueSet& satb_mq_set = JavaThread::satb_mark_queue_set();
if (G1CollectedHeap::use_parallel_gc_threads()) {
- satb_mq_set.set_par_closure(_task_id, &oc);
+ satb_mq_set.set_par_closure(_worker_id, &oc);
} else {
satb_mq_set.set_closure(&oc);
}
@@ -3672,9 +3672,9 @@
// until we run out of buffers or we need to abort.
if (G1CollectedHeap::use_parallel_gc_threads()) {
while (!has_aborted() &&
- satb_mq_set.par_apply_closure_to_completed_buffer(_task_id)) {
+ satb_mq_set.par_apply_closure_to_completed_buffer(_worker_id)) {
if (_cm->verbose_medium()) {
- gclog_or_tty->print_cr("[%d] processed an SATB buffer", _task_id);
+ gclog_or_tty->print_cr("[%u] processed an SATB buffer", _worker_id);
}
statsOnly( ++_satb_buffers_processed );
regular_clock_call();
@@ -3683,7 +3683,7 @@
while (!has_aborted() &&
satb_mq_set.apply_closure_to_completed_buffer()) {
if (_cm->verbose_medium()) {
- gclog_or_tty->print_cr("[%d] processed an SATB buffer", _task_id);
+ gclog_or_tty->print_cr("[%u] processed an SATB buffer", _worker_id);
}
statsOnly( ++_satb_buffers_processed );
regular_clock_call();
@@ -3693,7 +3693,7 @@
if (!concurrent() && !has_aborted()) {
// We should only do this during remark.
if (G1CollectedHeap::use_parallel_gc_threads()) {
- satb_mq_set.par_iterate_closure_all_threads(_task_id);
+ satb_mq_set.par_iterate_closure_all_threads(_worker_id);
} else {
satb_mq_set.iterate_closure_all_threads();
}
@@ -3706,7 +3706,7 @@
satb_mq_set.completed_buffers_num() == 0, "invariant");
if (G1CollectedHeap::use_parallel_gc_threads()) {
- satb_mq_set.set_par_closure(_task_id, NULL);
+ satb_mq_set.set_par_closure(_worker_id, NULL);
} else {
satb_mq_set.set_closure(NULL);
}
@@ -3717,8 +3717,8 @@
}
void CMTask::print_stats() {
- gclog_or_tty->print_cr("Marking Stats, task = %d, calls = %d",
- _task_id, _calls);
+ gclog_or_tty->print_cr("Marking Stats, task = %u, calls = %d",
+ _worker_id, _calls);
gclog_or_tty->print_cr(" Elapsed time = %1.2lfms, Termination time = %1.2lfms",
_elapsed_time_ms, _termination_time_ms);
gclog_or_tty->print_cr(" Step Times (cum): num = %d, avg = %1.2lfms, sd = %1.2lfms",
@@ -3866,7 +3866,7 @@
G1CollectorPolicy* g1_policy = _g1h->g1_policy();
assert(_task_queues != NULL, "invariant");
assert(_task_queue != NULL, "invariant");
- assert(_task_queues->queue(_task_id) == _task_queue, "invariant");
+ assert(_task_queues->queue(_worker_id) == _task_queue, "invariant");
assert(!_claimed,
"only one thread should claim this task at any one time");
@@ -3898,9 +3898,9 @@
++_calls;
if (_cm->verbose_low()) {
- gclog_or_tty->print_cr("[%d] >>>>>>>>>> START, call = %d, "
+ gclog_or_tty->print_cr("[%u] >>>>>>>>>> START, call = %d, "
"target = %1.2lfms >>>>>>>>>>",
- _task_id, _calls, _time_target_ms);
+ _worker_id, _calls, _time_target_ms);
}
// Set up the bitmap and oop closures. Anything that uses them is
@@ -3948,10 +3948,10 @@
MemRegion mr = MemRegion(_finger, _region_limit);
if (_cm->verbose_low()) {
- gclog_or_tty->print_cr("[%d] we're scanning part "
+ gclog_or_tty->print_cr("[%u] we're scanning part "
"["PTR_FORMAT", "PTR_FORMAT") "
"of region "PTR_FORMAT,
- _task_id, _finger, _region_limit, _curr_region);
+ _worker_id, _finger, _region_limit, _curr_region);
}
// Let's iterate over the bitmap of the part of the
@@ -4007,17 +4007,17 @@
assert(_finger == NULL, "invariant");
assert(_region_limit == NULL, "invariant");
if (_cm->verbose_low()) {
- gclog_or_tty->print_cr("[%d] trying to claim a new region", _task_id);
+ gclog_or_tty->print_cr("[%u] trying to claim a new region", _worker_id);
}
- HeapRegion* claimed_region = _cm->claim_region(_task_id);
+ HeapRegion* claimed_region = _cm->claim_region(_worker_id);
if (claimed_region != NULL) {
// Yes, we managed to claim one
statsOnly( ++_regions_claimed );
if (_cm->verbose_low()) {
- gclog_or_tty->print_cr("[%d] we successfully claimed "
+ gclog_or_tty->print_cr("[%u] we successfully claimed "
"region "PTR_FORMAT,
- _task_id, claimed_region);
+ _worker_id, claimed_region);
}
setup_for_region(claimed_region);
@@ -4044,7 +4044,7 @@
"at this point we should be out of regions");
if (_cm->verbose_low()) {
- gclog_or_tty->print_cr("[%d] all regions claimed", _task_id);
+ gclog_or_tty->print_cr("[%u] all regions claimed", _worker_id);
}
// Try to reduce the number of available SATB buffers so that
@@ -4068,17 +4068,17 @@
"only way to reach here");
if (_cm->verbose_low()) {
- gclog_or_tty->print_cr("[%d] starting to steal", _task_id);
+ gclog_or_tty->print_cr("[%u] starting to steal", _worker_id);
}
while (!has_aborted()) {
oop obj;
statsOnly( ++_steal_attempts );
- if (_cm->try_stealing(_task_id, &_hash_seed, obj)) {
+ if (_cm->try_stealing(_worker_id, &_hash_seed, obj)) {
if (_cm->verbose_medium()) {
- gclog_or_tty->print_cr("[%d] stolen "PTR_FORMAT" successfully",
- _task_id, (void*) obj);
+ gclog_or_tty->print_cr("[%u] stolen "PTR_FORMAT" successfully",
+ _worker_id, (void*) obj);
}
statsOnly( ++_steals );
@@ -4116,7 +4116,7 @@
assert(_task_queue->size() == 0, "only way to reach here");
if (_cm->verbose_low()) {
- gclog_or_tty->print_cr("[%d] starting termination protocol", _task_id);
+ gclog_or_tty->print_cr("[%u] starting termination protocol", _worker_id);
}
_termination_start_time_ms = os::elapsedVTime() * 1000.0;
@@ -4131,7 +4131,7 @@
if (finished) {
// We're all done.
- if (_task_id == 0) {
+ if (_worker_id == 0) {
// let's allow task 0 to do this
if (concurrent()) {
assert(_cm->concurrent_marking_in_progress(), "invariant");
@@ -4153,15 +4153,15 @@
guarantee(!_cm->mark_stack_overflow(), "only way to reach here");
if (_cm->verbose_low()) {
- gclog_or_tty->print_cr("[%d] all tasks terminated", _task_id);
+ gclog_or_tty->print_cr("[%u] all tasks terminated", _worker_id);
}
} else {
// Apparently there's more work to do. Let's abort this task. It
// will restart it and we can hopefully find more things to do.
if (_cm->verbose_low()) {
- gclog_or_tty->print_cr("[%d] apparently there is more work to do",
- _task_id);
+ gclog_or_tty->print_cr("[%u] apparently there is more work to do",
+ _worker_id);
}
set_has_aborted();
@@ -4200,10 +4200,10 @@
// will achieve this with the use of two barrier sync points.
if (_cm->verbose_low()) {
- gclog_or_tty->print_cr("[%d] detected overflow", _task_id);
+ gclog_or_tty->print_cr("[%u] detected overflow", _worker_id);
}
- _cm->enter_first_sync_barrier(_task_id);
+ _cm->enter_first_sync_barrier(_worker_id);
// When we exit this sync barrier we know that all tasks have
// stopped doing marking work. So, it's now safe to
// re-initialise our data structures. At the end of this method,
@@ -4215,39 +4215,39 @@
clear_region_fields();
// ...and enter the second barrier.
- _cm->enter_second_sync_barrier(_task_id);
+ _cm->enter_second_sync_barrier(_worker_id);
// At this point everything has bee re-initialised and we're
// ready to restart.
}
if (_cm->verbose_low()) {
- gclog_or_tty->print_cr("[%d] <<<<<<<<<< ABORTING, target = %1.2lfms, "
+ gclog_or_tty->print_cr("[%u] <<<<<<<<<< ABORTING, target = %1.2lfms, "
"elapsed = %1.2lfms <<<<<<<<<<",
- _task_id, _time_target_ms, elapsed_time_ms);
+ _worker_id, _time_target_ms, elapsed_time_ms);
if (_cm->has_aborted()) {
- gclog_or_tty->print_cr("[%d] ========== MARKING ABORTED ==========",
- _task_id);
+ gclog_or_tty->print_cr("[%u] ========== MARKING ABORTED ==========",
+ _worker_id);
}
}
} else {
if (_cm->verbose_low()) {
- gclog_or_tty->print_cr("[%d] <<<<<<<<<< FINISHED, target = %1.2lfms, "
+ gclog_or_tty->print_cr("[%u] <<<<<<<<<< FINISHED, target = %1.2lfms, "
"elapsed = %1.2lfms <<<<<<<<<<",
- _task_id, _time_target_ms, elapsed_time_ms);
+ _worker_id, _time_target_ms, elapsed_time_ms);
}
}
_claimed = false;
}
-CMTask::CMTask(int task_id,
+CMTask::CMTask(uint worker_id,
ConcurrentMark* cm,
size_t* marked_bytes,
BitMap* card_bm,
CMTaskQueue* task_queue,
CMTaskQueueSet* task_queues)
: _g1h(G1CollectedHeap::heap()),
- _task_id(task_id), _cm(cm),
+ _worker_id(worker_id), _cm(cm),
_claimed(false),
_nextMarkBitMap(NULL), _hash_seed(17),
_task_queue(task_queue),
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp Mon Oct 29 16:51:59 2012 -0700
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp Wed Oct 31 08:29:44 2012 -0700
@@ -399,9 +399,9 @@
// last claimed region
// marking tasks
- uint _max_task_num; // maximum task number
+ uint _max_worker_id;// maximum worker id
uint _active_tasks; // task num currently active
- CMTask** _tasks; // task queue array (max_task_num len)
+ CMTask** _tasks; // task queue array (max_worker_id len)
CMTaskQueueSet* _task_queues; // task queue set
ParallelTaskTerminator _terminator; // for termination
@@ -492,10 +492,10 @@
ParallelTaskTerminator* terminator() { return &_terminator; }
// It claims the next available region to be scanned by a marking
- // task. It might return NULL if the next region is empty or we have
- // run out of regions. In the latter case, out_of_regions()
+ // task/thread. It might return NULL if the next region is empty or
+ // we have run out of regions. In the latter case, out_of_regions()
// determines whether we've really run out of regions or the task
- // should call claim_region() again. This might seem a bit
+ // should call claim_region() again. This might seem a bit
// awkward. Originally, the code was written so that claim_region()
// either successfully returned with a non-empty region or there
// were no more regions to be claimed. The problem with this was
@@ -505,7 +505,7 @@
// method. So, this way, each task will spend very little time in
// claim_region() and is allowed to call the regular clock method
// frequently.
- HeapRegion* claim_region(int task);
+ HeapRegion* claim_region(uint worker_id);
// It determines whether we've run out of regions to scan.
bool out_of_regions() { return _finger == _heap_end; }
@@ -537,8 +537,8 @@
bool has_aborted() { return _has_aborted; }
// Methods to enter the two overflow sync barriers
- void enter_first_sync_barrier(int task_num);
- void enter_second_sync_barrier(int task_num);
+ void enter_first_sync_barrier(uint worker_id);
+ void enter_second_sync_barrier(uint worker_id);
ForceOverflowSettings* force_overflow_conc() {
return &_force_overflow_conc;
@@ -626,14 +626,14 @@
double all_task_accum_vtime() {
double ret = 0.0;
- for (int i = 0; i < (int)_max_task_num; ++i)
+ for (uint i = 0; i < _max_worker_id; ++i)
ret += _accum_task_vtime[i];
return ret;
}
// Attempts to steal an object from the task queues of other tasks
- bool try_stealing(int task_num, int* hash_seed, oop& obj) {
- return _task_queues->steal(task_num, hash_seed, obj);
+ bool try_stealing(uint worker_id, int* hash_seed, oop& obj) {
+ return _task_queues->steal(worker_id, hash_seed, obj);
}
ConcurrentMark(ReservedSpace rs, uint max_regions);
@@ -823,7 +823,7 @@
// Returns the card bitmap for a given task or worker id.
BitMap* count_card_bitmap_for(uint worker_id) {
- assert(0 <= worker_id && worker_id < _max_task_num, "oob");
+ assert(0 <= worker_id && worker_id < _max_worker_id, "oob");
assert(_count_card_bitmaps != NULL, "uninitialized");
BitMap* task_card_bm = &_count_card_bitmaps[worker_id];
assert(task_card_bm->size() == _card_bm.size(), "size mismatch");
@@ -833,7 +833,7 @@
// Returns the array containing the marked bytes for each region,
// for the given worker or task id.
size_t* count_marked_bytes_array_for(uint worker_id) {
- assert(0 <= worker_id && worker_id < _max_task_num, "oob");
+ assert(0 <= worker_id && worker_id < _max_worker_id, "oob");
assert(_count_marked_bytes != NULL, "uninitialized");
size_t* marked_bytes_array = _count_marked_bytes[worker_id];
assert(marked_bytes_array != NULL, "uninitialized");
@@ -939,7 +939,7 @@
global_stack_transfer_size = 16
};
- int _task_id;
+ uint _worker_id;
G1CollectedHeap* _g1h;
ConcurrentMark* _cm;
CMBitMap* _nextMarkBitMap;
@@ -1115,8 +1115,8 @@
_elapsed_time_ms = os::elapsedTime() * 1000.0 - _elapsed_time_ms;
}
- // returns the task ID
- int task_id() { return _task_id; }
+ // returns the worker ID associated with this task.
+ uint worker_id() { return _worker_id; }
// From TerminatorTerminator. It determines whether this task should
// exit the termination protocol after it's entered it.
@@ -1170,7 +1170,7 @@
_finger = new_finger;
}
- CMTask(int task_num, ConcurrentMark *cm,
+ CMTask(uint worker_id, ConcurrentMark *cm,
size_t* marked_bytes, BitMap* card_bm,
CMTaskQueue* task_queue, CMTaskQueueSet* task_queues);
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp Mon Oct 29 16:51:59 2012 -0700
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp Wed Oct 31 08:29:44 2012 -0700
@@ -279,7 +279,7 @@
assert(_nextMarkBitMap->isMarked(objAddr), "invariant");
if (_cm->verbose_high()) {
- gclog_or_tty->print_cr("[%d] pushing "PTR_FORMAT, _task_id, (void*) obj);
+ gclog_or_tty->print_cr("[%u] pushing "PTR_FORMAT, _worker_id, (void*) obj);
}
if (!_task_queue->push(obj)) {
@@ -287,9 +287,9 @@
// to the global stack.
if (_cm->verbose_medium()) {
- gclog_or_tty->print_cr("[%d] task queue overflow, "
+ gclog_or_tty->print_cr("[%u] task queue overflow, "
"moving entries to the global stack",
- _task_id);
+ _worker_id);
}
move_entries_to_global_stack();
@@ -318,8 +318,8 @@
inline void CMTask::deal_with_reference(oop obj) {
if (_cm->verbose_high()) {
- gclog_or_tty->print_cr("[%d] we're dealing with reference = "PTR_FORMAT,
- _task_id, (void*) obj);
+ gclog_or_tty->print_cr("[%u] we're dealing with reference = "PTR_FORMAT,
+ _worker_id, (void*) obj);
}
++_refs_reached;
@@ -335,8 +335,8 @@
HeapRegion* hr = _g1h->heap_region_containing_raw(obj);
if (!hr->obj_allocated_since_next_marking(obj)) {
if (_cm->verbose_high()) {
- gclog_or_tty->print_cr("[%d] "PTR_FORMAT" is not considered marked",
- _task_id, (void*) obj);
+ gclog_or_tty->print_cr("[%u] "PTR_FORMAT" is not considered marked",
+ _worker_id, (void*) obj);
}
// we need to mark it first
@@ -350,8 +350,8 @@
if (_finger != NULL && objAddr < _finger) {
if (_cm->verbose_high()) {
- gclog_or_tty->print_cr("[%d] below the local finger ("PTR_FORMAT"), "
- "pushing it", _task_id, _finger);
+ gclog_or_tty->print_cr("[%u] below the local finger ("PTR_FORMAT"), "
+ "pushing it", _worker_id, _finger);
}
push(obj);
} else if (_curr_region != NULL && objAddr < _region_limit) {
@@ -367,9 +367,9 @@
// correctness problems.
if (_cm->verbose_high()) {
- gclog_or_tty->print_cr("[%d] below the global finger "
+ gclog_or_tty->print_cr("[%u] below the global finger "
"("PTR_FORMAT"), pushing it",
- _task_id, global_finger);
+ _worker_id, global_finger);
}
push(obj);
} else {
@@ -382,9 +382,9 @@
// see long comment above
if (_cm->verbose_high()) {
- gclog_or_tty->print_cr("[%d] below the global finger "
+ gclog_or_tty->print_cr("[%u] below the global finger "
"("PTR_FORMAT"), pushing it",
- _task_id, global_finger);
+ _worker_id, global_finger);
}
push(obj);
}
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Mon Oct 29 16:51:59 2012 -0700
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Wed Oct 31 08:29:44 2012 -0700
@@ -3388,6 +3388,7 @@
st->print("%u survivors (" SIZE_FORMAT "K)", survivor_regions,
(size_t) survivor_regions * HeapRegion::GrainBytes / K);
st->cr();
+ MetaspaceAux::print_on(st);
}
void G1CollectedHeap::print_extended_on(outputStream* st) const {
--- a/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp Mon Oct 29 16:51:59 2012 -0700
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp Wed Oct 31 08:29:44 2012 -0700
@@ -111,9 +111,9 @@
oop obj = oopDesc::load_decode_heap_oop(p);
if (_cm->verbose_high()) {
- gclog_or_tty->print_cr("[%d] we're looking at location "
+ gclog_or_tty->print_cr("[%u] we're looking at location "
"*"PTR_FORMAT" = "PTR_FORMAT,
- _task->task_id(), p, (void*) obj);
+ _task->worker_id(), p, (void*) obj);
}
_task->deal_with_reference(obj);
}
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp Mon Oct 29 16:51:59 2012 -0700
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp Wed Oct 31 08:29:44 2012 -0700
@@ -139,7 +139,7 @@
if (VerifyBeforeGC && heap->total_collections() >= VerifyGCStartAt) {
HandleMark hm; // Discard invalid handles created during verification
gclog_or_tty->print(" VerifyBeforeGC:");
- Universe::verify(true);
+ Universe::verify();
}
// Verify object start arrays
@@ -341,7 +341,7 @@
if (VerifyAfterGC && heap->total_collections() >= VerifyGCStartAt) {
HandleMark hm; // Discard invalid handles created during verification
gclog_or_tty->print(" VerifyAfterGC:");
- Universe::verify(false);
+ Universe::verify();
}
// Re-verify object start arrays
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp Mon Oct 29 16:51:59 2012 -0700
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp Wed Oct 31 08:29:44 2012 -0700
@@ -983,7 +983,7 @@
if (VerifyBeforeGC && heap->total_collections() >= VerifyGCStartAt) {
HandleMark hm; // Discard invalid handles created during verification
gclog_or_tty->print(" VerifyBeforeGC:");
- Universe::verify(true);
+ Universe::verify();
}
// Verify object start arrays
@@ -2184,7 +2184,7 @@
if (VerifyAfterGC && heap->total_collections() >= VerifyGCStartAt) {
HandleMark hm; // Discard invalid handles created during verification
gclog_or_tty->print(" VerifyAfterGC:");
- Universe::verify(false);
+ Universe::verify();
}
// Re-verify object start arrays
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp Mon Oct 29 16:51:59 2012 -0700
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp Wed Oct 31 08:29:44 2012 -0700
@@ -315,7 +315,7 @@
if (VerifyBeforeGC && heap->total_collections() >= VerifyGCStartAt) {
HandleMark hm; // Discard invalid handles created during verification
gclog_or_tty->print(" VerifyBeforeGC:");
- Universe::verify(true);
+ Universe::verify();
}
{
@@ -639,7 +639,7 @@
if (VerifyAfterGC && heap->total_collections() >= VerifyGCStartAt) {
HandleMark hm; // Discard invalid handles created during verification
gclog_or_tty->print(" VerifyAfterGC:");
- Universe::verify(false);
+ Universe::verify();
}
heap->print_heap_after_gc();
--- a/hotspot/src/share/vm/memory/allocation.cpp Mon Oct 29 16:51:59 2012 -0700
+++ b/hotspot/src/share/vm/memory/allocation.cpp Wed Oct 31 08:29:44 2012 -0700
@@ -92,6 +92,26 @@
return res;
}
+void* ResourceObj::operator new(size_t size, const std::nothrow_t& nothrow_constant,
+ allocation_type type, MEMFLAGS flags) {
+ //should only call this with std::nothrow, use other operator new() otherwise
+ address res;
+ switch (type) {
+ case C_HEAP:
+ res = (address)AllocateHeap(size, flags, CALLER_PC, AllocFailStrategy::RETURN_NULL);
+ DEBUG_ONLY(if (res!= NULL) set_allocation_type(res, C_HEAP);)
+ break;
+ case RESOURCE_AREA:
+ // new(size) sets allocation type RESOURCE_AREA.
+ res = (address)operator new(size, std::nothrow);
+ break;
+ default:
+ ShouldNotReachHere();
+ }
+ return res;
+}
+
+
void ResourceObj::operator delete(void* p) {
assert(((ResourceObj *)p)->allocated_on_C_heap(),
"delete only allowed for C_HEAP objects");
@@ -506,7 +526,7 @@
}
// Grow a new Chunk
-void* Arena::grow( size_t x ) {
+void* Arena::grow(size_t x, AllocFailType alloc_failmode) {
// Get minimal required size. Either real big, or even bigger for giant objs
size_t len = MAX2(x, (size_t) Chunk::size);
@@ -514,7 +534,10 @@
_chunk = new (len) Chunk(len);
if (_chunk == NULL) {
- signal_out_of_memory(len * Chunk::aligned_overhead_size(), "Arena::grow");
+ if (alloc_failmode == AllocFailStrategy::EXIT_OOM) {
+ signal_out_of_memory(len * Chunk::aligned_overhead_size(), "Arena::grow");
+ }
+ return NULL;
}
if (k) k->set_next(_chunk); // Append new chunk to end of linked list
else _first = _chunk;
@@ -529,13 +552,16 @@
// Reallocate storage in Arena.
-void *Arena::Arealloc(void* old_ptr, size_t old_size, size_t new_size) {
+void *Arena::Arealloc(void* old_ptr, size_t old_size, size_t new_size, AllocFailType alloc_failmode) {
assert(new_size >= 0, "bad size");
if (new_size == 0) return NULL;
#ifdef ASSERT
if (UseMallocOnly) {
// always allocate a new object (otherwise we'll free this one twice)
- char* copy = (char*)Amalloc(new_size);
+ char* copy = (char*)Amalloc(new_size, alloc_failmode);
+ if (copy == NULL) {
+ return NULL;
+ }
size_t n = MIN2(old_size, new_size);
if (n > 0) memcpy(copy, old_ptr, n);
Afree(old_ptr,old_size); // Mostly done to keep stats accurate
@@ -561,7 +587,10 @@
}
// Oops, got to relocate guts
- void *new_ptr = Amalloc(new_size);
+ void *new_ptr = Amalloc(new_size, alloc_failmode);
+ if (new_ptr == NULL) {
+ return NULL;
+ }
memcpy( new_ptr, c_old, old_size );
Afree(c_old,old_size); // Mostly done to keep stats accurate
return new_ptr;
--- a/hotspot/src/share/vm/memory/allocation.hpp Mon Oct 29 16:51:59 2012 -0700
+++ b/hotspot/src/share/vm/memory/allocation.hpp Wed Oct 31 08:29:44 2012 -0700
@@ -53,6 +53,12 @@
#endif
#endif
+class AllocFailStrategy {
+public:
+ enum AllocFailEnum { EXIT_OOM, RETURN_NULL };
+};
+typedef AllocFailStrategy::AllocFailEnum AllocFailType;
+
// All classes in the virtual machine must be subclassed
// by one of the following allocation classes:
//
@@ -315,7 +321,8 @@
Chunk *_first; // First chunk
Chunk *_chunk; // current chunk
char *_hwm, *_max; // High water mark and max in current chunk
- void* grow(size_t x); // Get a new Chunk of at least size x
+ // Get a new Chunk of at least size x
+ void* grow(size_t x, AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM);
size_t _size_in_bytes; // Size of arena (used for native memory tracking)
NOT_PRODUCT(static julong _bytes_allocated;) // total #bytes allocated since start
@@ -350,14 +357,14 @@
void operator delete(void* p);
// Fast allocate in the arena. Common case is: pointer test + increment.
- void* Amalloc(size_t x) {
+ void* Amalloc(size_t x, AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM) {
assert(is_power_of_2(ARENA_AMALLOC_ALIGNMENT) , "should be a power of 2");
x = ARENA_ALIGN(x);
debug_only(if (UseMallocOnly) return malloc(x);)
check_for_overflow(x, "Arena::Amalloc");
NOT_PRODUCT(inc_bytes_allocated(x);)
if (_hwm + x > _max) {
- return grow(x);
+ return grow(x, alloc_failmode);
} else {
char *old = _hwm;
_hwm += x;
@@ -365,13 +372,13 @@
}
}
// Further assume size is padded out to words
- void *Amalloc_4(size_t x) {
+ void *Amalloc_4(size_t x, AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM) {
assert( (x&(sizeof(char*)-1)) == 0, "misaligned size" );
debug_only(if (UseMallocOnly) return malloc(x);)
check_for_overflow(x, "Arena::Amalloc_4");
NOT_PRODUCT(inc_bytes_allocated(x);)
if (_hwm + x > _max) {
- return grow(x);
+ return grow(x, alloc_failmode);
} else {
char *old = _hwm;
_hwm += x;
@@ -381,7 +388,7 @@
// Allocate with 'double' alignment. It is 8 bytes on sparc.
// In other cases Amalloc_D() should be the same as Amalloc_4().
- void* Amalloc_D(size_t x) {
+ void* Amalloc_D(size_t x, AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM) {
assert( (x&(sizeof(char*)-1)) == 0, "misaligned size" );
debug_only(if (UseMallocOnly) return malloc(x);)
#if defined(SPARC) && !defined(_LP64)
@@ -392,7 +399,7 @@
check_for_overflow(x, "Arena::Amalloc_D");
NOT_PRODUCT(inc_bytes_allocated(x);)
if (_hwm + x > _max) {
- return grow(x); // grow() returns a result aligned >= 8 bytes.
+ return grow(x, alloc_failmode); // grow() returns a result aligned >= 8 bytes.
} else {
char *old = _hwm;
_hwm += x;
@@ -412,7 +419,8 @@
if (((char*)ptr) + size == _hwm) _hwm = (char*)ptr;
}
- void *Arealloc( void *old_ptr, size_t old_size, size_t new_size );
+ void *Arealloc( void *old_ptr, size_t old_size, size_t new_size,
+ AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM);
// Move contents of this arena into an empty arena
Arena *move_contents(Arena *empty_arena);
@@ -458,9 +466,12 @@
//%note allocation_1
-extern char* resource_allocate_bytes(size_t size);
-extern char* resource_allocate_bytes(Thread* thread, size_t size);
-extern char* resource_reallocate_bytes( char *old, size_t old_size, size_t new_size);
+extern char* resource_allocate_bytes(size_t size,
+ AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM);
+extern char* resource_allocate_bytes(Thread* thread, size_t size,
+ AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM);
+extern char* resource_reallocate_bytes( char *old, size_t old_size, size_t new_size,
+ AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM);
extern void resource_free_bytes( char *old, size_t size );
//----------------------------------------------------------------------
@@ -496,6 +507,8 @@
public:
void* operator new(size_t size, allocation_type type, MEMFLAGS flags);
+ void* operator new(size_t size, const std::nothrow_t& nothrow_constant,
+ allocation_type type, MEMFLAGS flags);
void* operator new(size_t size, Arena *arena) {
address res = (address)arena->Amalloc(size);
DEBUG_ONLY(set_allocation_type(res, ARENA);)
@@ -506,6 +519,13 @@
DEBUG_ONLY(set_allocation_type(res, RESOURCE_AREA);)
return res;
}
+
+ void* operator new(size_t size, const std::nothrow_t& nothrow_constant) {
+ address res = (address)resource_allocate_bytes(size, AllocFailStrategy::RETURN_NULL);
+ DEBUG_ONLY(if (res != NULL) set_allocation_type(res, RESOURCE_AREA);)
+ return res;
+ }
+
void operator delete(void* p);
};
--- a/hotspot/src/share/vm/memory/allocation.inline.hpp Mon Oct 29 16:51:59 2012 -0700
+++ b/hotspot/src/share/vm/memory/allocation.inline.hpp Wed Oct 31 08:29:44 2012 -0700
@@ -48,7 +48,8 @@
#endif
// allocate using malloc; will fail if no memory available
-inline char* AllocateHeap(size_t size, MEMFLAGS flags, address pc = 0) {
+inline char* AllocateHeap(size_t size, MEMFLAGS flags, address pc = 0,
+ AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM) {
if (pc == 0) {
pc = CURRENT_PC;
}
@@ -56,16 +57,17 @@
#ifdef ASSERT
if (PrintMallocFree) trace_heap_malloc(size, "AllocateHeap", p);
#endif
- if (p == NULL) vm_exit_out_of_memory(size, "AllocateHeap");
+ if (p == NULL && alloc_failmode == AllocFailStrategy::EXIT_OOM) vm_exit_out_of_memory(size, "AllocateHeap");
return p;
}
-inline char* ReallocateHeap(char *old, size_t size, MEMFLAGS flags) {
+inline char* ReallocateHeap(char *old, size_t size, MEMFLAGS flags,
+ AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM) {
char* p = (char*) os::realloc(old, size, flags, CURRENT_PC);
#ifdef ASSERT
if (PrintMallocFree) trace_heap_malloc(size, "ReallocateHeap", p);
#endif
- if (p == NULL) vm_exit_out_of_memory(size, "ReallocateHeap");
+ if (p == NULL && alloc_failmode == AllocFailStrategy::EXIT_OOM) vm_exit_out_of_memory(size, "ReallocateHeap");
return p;
}
@@ -91,11 +93,13 @@
template <MEMFLAGS F> void* CHeapObj<F>::operator new (size_t size,
const std::nothrow_t& nothrow_constant, address caller_pc) {
#ifdef ASSERT
- void* p = os::malloc(size, F, (caller_pc != 0 ? caller_pc : CALLER_PC));
+ void* p = (void*)AllocateHeap(size, F, (caller_pc != 0 ? caller_pc : CALLER_PC),
+ AllocFailStrategy::RETURN_NULL);
if (PrintMallocFree) trace_heap_malloc(size, "CHeapObj-new", p);
return p;
#else
- return os::malloc(size, F, (caller_pc != 0 ? caller_pc : CALLER_PC));
+ return (void *) AllocateHeap(size, F, (caller_pc != 0 ? caller_pc : CALLER_PC),
+ AllocFailStrategy::RETURN_NULL);
#endif
}
--- a/hotspot/src/share/vm/memory/genCollectedHeap.cpp Mon Oct 29 16:51:59 2012 -0700
+++ b/hotspot/src/share/vm/memory/genCollectedHeap.cpp Wed Oct 31 08:29:44 2012 -0700
@@ -447,7 +447,7 @@
prepared_for_verification = true;
}
gclog_or_tty->print(" VerifyBeforeGC:");
- Universe::verify(true);
+ Universe::verify();
}
COMPILER2_PRESENT(DerivedPointerTable::clear());
@@ -519,7 +519,7 @@
total_collections() >= VerifyGCStartAt) {
HandleMark hm; // Discard invalid handles created during verification
gclog_or_tty->print(" VerifyAfterGC:");
- Universe::verify(false);
+ Universe::verify();
}
if (PrintGCDetails) {
--- a/hotspot/src/share/vm/memory/resourceArea.cpp Mon Oct 29 16:51:59 2012 -0700
+++ b/hotspot/src/share/vm/memory/resourceArea.cpp Wed Oct 31 08:29:44 2012 -0700
@@ -45,15 +45,15 @@
// The following routines are declared in allocation.hpp and used everywhere:
// Allocation in thread-local resource area
-extern char* resource_allocate_bytes(size_t size) {
- return Thread::current()->resource_area()->allocate_bytes(size);
+extern char* resource_allocate_bytes(size_t size, AllocFailType alloc_failmode) {
+ return Thread::current()->resource_area()->allocate_bytes(size, alloc_failmode);
}
-extern char* resource_allocate_bytes(Thread* thread, size_t size) {
- return thread->resource_area()->allocate_bytes(size);
+extern char* resource_allocate_bytes(Thread* thread, size_t size, AllocFailType alloc_failmode) {
+ return thread->resource_area()->allocate_bytes(size, alloc_failmode);
}
-extern char* resource_reallocate_bytes( char *old, size_t old_size, size_t new_size){
- return (char*)Thread::current()->resource_area()->Arealloc(old, old_size, new_size);
+extern char* resource_reallocate_bytes( char *old, size_t old_size, size_t new_size, AllocFailType alloc_failmode){
+ return (char*)Thread::current()->resource_area()->Arealloc(old, old_size, new_size, alloc_failmode);
}
extern void resource_free_bytes( char *old, size_t size ) {
--- a/hotspot/src/share/vm/memory/resourceArea.hpp Mon Oct 29 16:51:59 2012 -0700
+++ b/hotspot/src/share/vm/memory/resourceArea.hpp Wed Oct 31 08:29:44 2012 -0700
@@ -68,7 +68,7 @@
debug_only(_nesting = 0;);
}
- char* allocate_bytes(size_t size) {
+ char* allocate_bytes(size_t size, AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM) {
#ifdef ASSERT
if (_nesting < 1 && !_warned++)
fatal("memory leak: allocating without ResourceMark");
@@ -78,7 +78,7 @@
return (*save = (char*)os::malloc(size, mtThread));
}
#endif
- return (char*)Amalloc(size);
+ return (char*)Amalloc(size, alloc_failmode);
}
debug_only(int nesting() const { return _nesting; });
--- a/hotspot/src/share/vm/memory/universe.cpp Mon Oct 29 16:51:59 2012 -0700
+++ b/hotspot/src/share/vm/memory/universe.cpp Wed Oct 31 08:29:44 2012 -0700
@@ -1268,10 +1268,6 @@
}
void Universe::verify(bool silent, VerifyOption option) {
- if (SharedSkipVerify) {
- return;
- }
-
// The use of _verify_in_progress is a temporary work around for
// 6320749. Don't bother with a creating a class to set and clear
// it since it is only used in this method and the control flow is
--- a/hotspot/src/share/vm/memory/universe.hpp Mon Oct 29 16:51:59 2012 -0700
+++ b/hotspot/src/share/vm/memory/universe.hpp Wed Oct 31 08:29:44 2012 -0700
@@ -435,8 +435,14 @@
// Debugging
static bool verify_in_progress() { return _verify_in_progress; }
- static void verify(bool silent = false,
- VerifyOption option = VerifyOption_Default );
+ static void verify(bool silent, VerifyOption option);
+ static void verify(bool silent) {
+ verify(silent, VerifyOption_Default /* option */);
+ }
+ static void verify() {
+ verify(false /* silent */);
+ }
+
static int verify_count() { return _verify_count; }
// The default behavior is to call print_on() on gclog_or_tty.
static void print();
--- a/hotspot/src/share/vm/oops/klass.cpp Mon Oct 29 16:51:59 2012 -0700
+++ b/hotspot/src/share/vm/oops/klass.cpp Wed Oct 31 08:29:44 2012 -0700
@@ -356,12 +356,11 @@
}
void Klass::append_to_sibling_list() {
- debug_only(if (!SharedSkipVerify) verify();)
+ debug_only(verify();)
// add ourselves to superklass' subklass list
InstanceKlass* super = superklass();
if (super == NULL) return; // special case: class Object
- assert(SharedSkipVerify ||
- (!super->is_interface() // interfaces cannot be supers
+ assert((!super->is_interface() // interfaces cannot be supers
&& (super->superklass() == NULL || !is_interface())),
"an interface can only be a subklass of Object");
Klass* prev_first_subklass = super->subklass_oop();
@@ -371,7 +370,7 @@
}
// make ourselves the superklass' first subklass
super->set_subklass(this);
- debug_only(if (!SharedSkipVerify) verify();)
+ debug_only(verify();)
}
void Klass::remove_from_sibling_list() {
--- a/hotspot/src/share/vm/prims/jvmtiTagMap.cpp Mon Oct 29 16:51:59 2012 -0700
+++ b/hotspot/src/share/vm/prims/jvmtiTagMap.cpp Wed Oct 31 08:29:44 2012 -0700
@@ -1135,7 +1135,7 @@
// get offset and field value
int offset = field->field_offset();
- address addr = (address)klass + offset;
+ address addr = (address)klass->java_mirror() + offset;
jvalue value;
copy_to_jvalue(&value, addr, value_type);
--- a/hotspot/src/share/vm/runtime/globals.hpp Mon Oct 29 16:51:59 2012 -0700
+++ b/hotspot/src/share/vm/runtime/globals.hpp Wed Oct 31 08:29:44 2012 -0700
@@ -3539,10 +3539,6 @@
product(uintx, SharedDummyBlockSize, 0, \
"Size of dummy block used to shift heap addresses (in bytes)") \
\
- diagnostic(bool, SharedSkipVerify, false, \
- "Skip assert() and verify() which page-in unwanted shared " \
- "objects. ") \
- \
diagnostic(bool, EnableInvokeDynamic, true, \
"support JSR 292 (method handles, invokedynamic, " \
"anonymous classes") \
--- a/hotspot/src/share/vm/runtime/handles.cpp Mon Oct 29 16:51:59 2012 -0700
+++ b/hotspot/src/share/vm/runtime/handles.cpp Wed Oct 31 08:29:44 2012 -0700
@@ -48,7 +48,7 @@
oop* HandleArea::allocate_handle(oop obj) {
assert(_handle_mark_nesting > 1, "memory leak: allocating handle outside HandleMark");
assert(_no_handle_mark_nesting == 0, "allocating handle inside NoHandleMark");
- assert(SharedSkipVerify || obj->is_oop(), "sanity check");
+ assert(obj->is_oop(), "sanity check");
return real_allocate_handle(obj);
}
--- a/hotspot/src/share/vm/runtime/handles.hpp Mon Oct 29 16:51:59 2012 -0700
+++ b/hotspot/src/share/vm/runtime/handles.hpp Wed Oct 31 08:29:44 2012 -0700
@@ -110,11 +110,11 @@
/* Constructors */ \
type##Handle () : Handle() {} \
type##Handle (type##Oop obj) : Handle((oop)obj) { \
- assert(SharedSkipVerify || is_null() || ((oop)obj)->is_a(), \
+ assert(is_null() || ((oop)obj)->is_a(), \
"illegal type"); \
} \
type##Handle (Thread* thread, type##Oop obj) : Handle(thread, (oop)obj) { \
- assert(SharedSkipVerify || is_null() || ((oop)obj)->is_a(), "illegal type"); \
+ assert(is_null() || ((oop)obj)->is_a(), "illegal type"); \
} \
\
/* Operators for ease of use */ \
@@ -201,11 +201,11 @@
/* Constructors */
instanceKlassHandle () : KlassHandle() {}
instanceKlassHandle (const Klass* k) : KlassHandle(k) {
- assert(SharedSkipVerify || k == NULL || k->oop_is_instance(),
+ assert(k == NULL || k->oop_is_instance(),
"illegal type");
}
instanceKlassHandle (Thread* thread, const Klass* k) : KlassHandle(thread, k) {
- assert(SharedSkipVerify || k == NULL || k->oop_is_instance(),
+ assert(k == NULL || k->oop_is_instance(),
"illegal type");
}
/* Access to klass part */
--- a/hotspot/src/share/vm/runtime/thread.cpp Mon Oct 29 16:51:59 2012 -0700
+++ b/hotspot/src/share/vm/runtime/thread.cpp Wed Oct 31 08:29:44 2012 -0700
@@ -177,7 +177,8 @@
const int alignment = markOopDesc::biased_lock_alignment;
size_t aligned_size = size + (alignment - sizeof(intptr_t));
void* real_malloc_addr = throw_excpt? AllocateHeap(aligned_size, flags, CURRENT_PC)
- : os::malloc(aligned_size, flags, CURRENT_PC);
+ : AllocateHeap(aligned_size, flags, CURRENT_PC,
+ AllocFailStrategy::RETURN_NULL);
void* aligned_addr = (void*) align_size_up((intptr_t) real_malloc_addr, alignment);
assert(((uintptr_t) aligned_addr + (uintptr_t) size) <=
((uintptr_t) real_malloc_addr + (uintptr_t) aligned_size),
@@ -191,7 +192,7 @@
return aligned_addr;
} else {
return throw_excpt? AllocateHeap(size, flags, CURRENT_PC)
- : os::malloc(size, flags, CURRENT_PC);
+ : AllocateHeap(size, flags, CURRENT_PC, AllocFailStrategy::RETURN_NULL);
}
}
--- a/hotspot/src/share/vm/runtime/thread.hpp Mon Oct 29 16:51:59 2012 -0700
+++ b/hotspot/src/share/vm/runtime/thread.hpp Wed Oct 31 08:29:44 2012 -0700
@@ -110,7 +110,7 @@
void* _real_malloc_address;
public:
void* operator new(size_t size) { return allocate(size, true); }
- void* operator new(size_t size, std::nothrow_t& nothrow_constant) { return allocate(size, false); }
+ void* operator new(size_t size, const std::nothrow_t& nothrow_constant) { return allocate(size, false); }
void operator delete(void* p);
protected:
--- a/hotspot/src/share/vm/utilities/debug.cpp Mon Oct 29 16:51:59 2012 -0700
+++ b/hotspot/src/share/vm/utilities/debug.cpp Wed Oct 31 08:29:44 2012 -0700
@@ -477,7 +477,7 @@
}
// Ensure Eden top is correct before verification
Universe::heap()->prepare_for_verify();
- Universe::verify(true);
+ Universe::verify();
if (!safe) SafepointSynchronize::set_is_not_at_safepoint();
}
--- a/hotspot/test/runtime/6929067/Test6929067.sh Mon Oct 29 16:51:59 2012 -0700
+++ b/hotspot/test/runtime/6929067/Test6929067.sh Wed Oct 31 08:29:44 2012 -0700
@@ -4,6 +4,7 @@
## @test Test6929067.sh
## @bug 6929067
## @summary Stack guard pages should be removed when thread is detached
+## @compile T.java
## @run shell Test6929067.sh
##
@@ -33,31 +34,97 @@
;;
esac
-# Choose arch: i386 or amd64 (test is Linux-specific)
+${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -Xinternalversion > vm_version.out 2>&1
+
+# Bitness:
# Cannot simply look at TESTVMOPTS as -d64 is not
# passed if there is only a 64-bit JVM available.
-${TESTJAVA}/bin/java ${TESTVMOPTS} -version 2>1 | grep "64-Bit" >/dev/null
+grep "64-Bit" vm_version.out > ${NULL}
if [ "$?" = "0" ]
then
- ARCH=amd64
+ COMP_FLAG="-m64"
else
- ARCH=i386
+ COMP_FLAG="-m32"
fi
-LD_LIBRARY_PATH=.:${TESTJAVA}/jre/lib/${ARCH}/client:/usr/openwin/lib:/usr/dt/lib:/usr/lib:$LD_LIBRARY_PATH
+
+# Architecture:
+# Translate uname output to JVM directory name, but permit testing
+# 32-bit x86 on an x64 platform.
+ARCH=`uname -m`
+case "$ARCH" in
+ x86_64)
+ if [ "$COMP_FLAG" = "-m32" ]; then
+ ARCH=i386
+ else
+ ARCH=amd64
+ fi
+ ;;
+ ppc64)
+ if [ "$COMP_FLAG" = "-m32" ]; then
+ ARCH=ppc
+ else
+ ARCH=ppc64
+ fi
+ ;;
+ sparc64)
+ if [ "$COMP_FLAG" = "-m32" ]; then
+ ARCH=sparc
+ else
+ ARCH=sparc64
+ fi
+ ;;
+ arm*)
+ # 32-bit ARM machine: compiler may not recognise -m32
+ COMP_FLAG=""
+ ARCH=arm
+ ;;
+ aarch64)
+ # 64-bit arm machine, could be testing 32 or 64-bit:
+ if [ "$COMP_FLAG" = "-m32" ]; then
+ ARCH=arm
+ else
+ ARCH=aarch64
+ fi
+ ;;
+ i586)
+ ARCH=i386
+ ;;
+ i686)
+ ARCH=i386
+ ;;
+ # Assuming other ARCH values need no translation
+esac
+
+
+# VM type: need to know server or client
+VMTYPE=client
+grep Server vm_version.out > ${NULL}
+if [ "$?" = "0" ]
+then
+ VMTYPE=server
+fi
+
+
+LD_LIBRARY_PATH=.:${TESTJAVA}/jre/lib/${ARCH}/${VMTYPE}:/usr/lib:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH
-THIS_DIR=`pwd`
+cp ${TESTSRC}${FS}invoke.c .
-cp ${TESTSRC}${FS}invoke.c ${THIS_DIR}
-cp ${TESTSRC}${FS}T.java ${THIS_DIR}
-
+# Copy the result of our @compile action:
+cp ${TESTCLASSES}${FS}T.class .
${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -fullversion
-${TESTJAVA}${FS}bin${FS}javac T.java
+echo "Architecture: ${ARCH}"
+echo "Compilation flag: ${COMP_FLAG}"
+echo "VM type: ${VMTYPE}"
-gcc -o invoke -I${TESTJAVA}/include -I${TESTJAVA}/include/linux invoke.c ${TESTJAVA}/jre/lib/${ARCH}/client/libjvm.so
+gcc -DLINUX ${COMP_FLAG} -o invoke \
+ -I${TESTJAVA}/include -I${TESTJAVA}/include/linux \
+ -L${TESTJAVA}/jre/lib/${ARCH}/${VMTYPE} \
+ -ljvm -lpthread invoke.c
+
./invoke
exit $?
--- a/jaxp/.hgtags Mon Oct 29 16:51:59 2012 -0700
+++ b/jaxp/.hgtags Wed Oct 31 08:29:44 2012 -0700
@@ -182,3 +182,4 @@
1cb19abb3f7b40bf233b349cd2f51f02d37a9f5b jdk8-b58
af9e8b0f1900b631a8a0fcccff9f1514fe58c808 jdk8-b59
2d1dff5310daaf226421a8c92823cb8afcf35f31 jdk8-b60
+6b1db0b41d2f6e2a7b3bdbc8a8db823b47752906 jdk8-b61
--- a/jaxws/.hgtags Mon Oct 29 16:51:59 2012 -0700
+++ b/jaxws/.hgtags Wed Oct 31 08:29:44 2012 -0700
@@ -182,3 +182,4 @@
cac4c393706343df778a13dc6c84cad0f8c237c9 jdk8-b58
ae107401be116f9e384d3a23192f543828e03da5 jdk8-b59
5c5a65ad5291b7cefcdc308f627cf2b195cf2b69 jdk8-b60
+97e5e74e2a341d9142ce28043912a3c255e28e03 jdk8-b61
--- a/jdk/.hgtags Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/.hgtags Wed Oct 31 08:29:44 2012 -0700
@@ -182,3 +182,5 @@
d94613ac03d8de375ef60493e2bb76dbd30d875d jdk8-b58
abad1f417bd3df4296631fc943cd3b7f5062c88a jdk8-b59
cec8fa02f15634acd7d02d04b0b2d8c044cdbaaa jdk8-b60
+61ddb3fd000a09ab05bff1940b0ac211661e94cf jdk8-b61
+50b8b17449d200c66bfd68fb4f3a9197432c9e2b jdk8-b62
--- a/jdk/make/com/sun/java/pack/Makefile Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/make/com/sun/java/pack/Makefile Wed Oct 31 08:29:44 2012 -0700
@@ -94,9 +94,9 @@
LDOUTPUT = -Fe
# JDK name required here
- RC_FLAGS += /D "JDK_FNAME=$(PGRM).exe" \
- /D "JDK_INTERNAL_NAME=$(PGRM)" \
- /D "JDK_FTYPE=0x1L"
+ RC_FLAGS += -D "JDK_FNAME=$(PGRM).exe" \
+ -D "JDK_INTERNAL_NAME=$(PGRM)" \
+ -D "JDK_FTYPE=0x1L"
RES = $(OBJDIR)/$(PGRM).res
else
@@ -161,7 +161,7 @@
$(CP) mapfile-vers-unpack200 $(TEMPDIR)/mapfile-vers
$(LINKER) $(LDDFLAGS) $(sort $(UNPACK_EXE_FILES_o)) $(RES) $(LIBCXX) $(LDOUTPUT)$(TEMPDIR)/unpack200$(EXE_SUFFIX)
ifdef MT
- $(MT) /manifest $(OBJDIR)/unpack200$(EXE_SUFFIX).manifest /outputresource:$(TEMPDIR)/unpack200$(EXE_SUFFIX);#1
+ $(MT) -manifest $(OBJDIR)/unpack200$(EXE_SUFFIX).manifest -outputresource:$(TEMPDIR)/unpack200$(EXE_SUFFIX);#1
endif
$(CP) $(TEMPDIR)/unpack200$(EXE_SUFFIX) $(UNPACK_EXE)
@$(call binary_file_verification,$@)
--- a/jdk/make/common/Defs-windows.gmk Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/make/common/Defs-windows.gmk Wed Oct 31 08:29:44 2012 -0700
@@ -78,7 +78,7 @@
MS_RUNTIME_LIBRARIES = $(MSVCRNN_DLL)
endif
-EXTRA_LFLAGS += /LIBPATH:$(DXSDK_LIB_PATH)
+EXTRA_LFLAGS += -LIBPATH:$(DXSDK_LIB_PATH)
# Full Debug Symbols has been enabled on Windows since JDK1.4.1.
# The Full Debug Symbols (FDS) default for VARIANT == OPT builds is
@@ -198,7 +198,7 @@
# -MTd Use static debug version (better than -MDd, no runtime issues)
# -D_DEBUG Change use of malloc/free/etc to use special debug ones (-MTd)
#
-# NOTE: We also will use /D _STATIC_CPPLIB so we don't need msvcpnn.dll
+# NOTE: We also will use -D _STATIC_CPPLIB so we don't need msvcpnn.dll
#
# If MS_RUNTIME_STATIC is requested we may have a problem, it is no longer
# supported by VS2010
@@ -223,12 +223,12 @@
endif
# Always add _STATIC_CPPLIB definition
-STATIC_CPPLIB_OPTION = /D _STATIC_CPPLIB
+STATIC_CPPLIB_OPTION = -D _STATIC_CPPLIB
# Silence the warning about using _STATIC_CPPLIB
ifneq ($(SHOW_ALL_WARNINGS),true)
# Needed with VS2010 to turn off the deprecated warning.
- STATIC_CPPLIB_OPTION += /D _DISABLE_DEPRECATE_STATIC_CPPLIB
+ STATIC_CPPLIB_OPTION += -D _DISABLE_DEPRECATE_STATIC_CPPLIB
endif
MS_RUNTIME_OPTION += $(STATIC_CPPLIB_OPTION)
@@ -242,7 +242,7 @@
# -Od Turns off optimization and speeds compilation
# -YX -Fp/.../foobar.pch Use precompiled headers (try someday?)
# -nologo Don't print out startup message
- # /D _STATIC_CPPLIB
+ # -D _STATIC_CPPLIB
# Use static link for the C++ runtime (so msvcpnn.dll not needed)
#
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
@@ -258,12 +258,12 @@
CFLAGS_COMMON += $(MS_RUNTIME_OPTION) $(CFLAGS_$(COMPILER_VERSION))
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- LDEBUG = /debug
+ LDEBUG = -debug
endif
ifeq ($(VTUNE_SUPPORT), true)
OTHER_CFLAGS = -Z7 -Ox
- LDEBUG += /pdb:NONE
+ LDEBUG += -pdb:NONE
endif
# VS2010, always need safe exception handlers, not needed on 64bit
@@ -272,7 +272,7 @@
endif
# LFLAGS are the flags given to $(LINK) and used to build the actual DLL file
- BASELFLAGS = -nologo /opt:REF /incremental:no
+ BASELFLAGS = -nologo -opt:REF -incremental:no
LFLAGS = $(BASELFLAGS) $(LDEBUG) $(EXTRA_LFLAGS) $(LFLAGS_$(COMPILER_VERSION))
LDDFLAGS += $(LFLAGS_$(COMPILER_VERSION))
@@ -404,7 +404,7 @@
JDK_UPDATE_VER := 0
endif
-RC_FLAGS = /l 0x409 /r
+RC_FLAGS = -l 0x409 -r
ifeq ($(VARIANT), OPT)
RC_FLAGS += -d NDEBUG
--- a/jdk/make/common/Demo.gmk Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/make/common/Demo.gmk Wed Oct 31 08:29:44 2012 -0700
@@ -292,9 +292,9 @@
ifeq ($(PLATFORM),windows)
# JDK name required here
-RC_FLAGS += /D "JDK_FNAME=$(LIBRARY).dll" \
- /D "JDK_INTERNAL_NAME=$(LIBRARY)" \
- /D "JDK_FTYPE=0x2L"
+RC_FLAGS += -D "JDK_FNAME=$(LIBRARY).dll" \
+ -D "JDK_INTERNAL_NAME=$(LIBRARY)" \
+ -D "JDK_FTYPE=0x2L"
endif
# Native library building
--- a/jdk/make/common/Library.gmk Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/make/common/Library.gmk Wed Oct 31 08:29:44 2012 -0700
@@ -206,9 +206,9 @@
@$(ECHO) Created $@
# JDK name required here
-RC_FLAGS += /D "JDK_FNAME=$(LIBRARY).dll" \
- /D "JDK_INTERNAL_NAME=$(LIBRARY)" \
- /D "JDK_FTYPE=0x2L"
+RC_FLAGS += -D "JDK_FNAME=$(LIBRARY).dll" \
+ -D "JDK_INTERNAL_NAME=$(LIBRARY)" \
+ -D "JDK_FTYPE=0x2L"
$(OBJDIR)/$(LIBRARY).res: $(VERSIONINFO_RESOURCE)
ifndef LOCAL_RESOURCE_FILE
--- a/jdk/make/common/Program.gmk Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/make/common/Program.gmk Wed Oct 31 08:29:44 2012 -0700
@@ -157,9 +157,9 @@
#
ifeq ($(PLATFORM), windows)
# JDK name required here
- RC_FLAGS += /D "JDK_FNAME=$(PROGRAM)$(EXE_SUFFIX)" \
- /D "JDK_INTERNAL_NAME=$(PROGRAM)" \
- /D "JDK_FTYPE=0x1L"
+ RC_FLAGS += -D "JDK_FNAME=$(PROGRAM)$(EXE_SUFFIX)" \
+ -D "JDK_INTERNAL_NAME=$(PROGRAM)" \
+ -D "JDK_FTYPE=0x1L"
$(OBJDIR)/$(PROGRAM).res: $(VERSIONINFO_RESOURCE)
@$(prep-target)
@@ -201,11 +201,11 @@
@$(prep-target)
@set -- $?; \
$(ECHO) Rebuilding $@ because of $$1 $$2 $$3 $$4 $$5 $$6 $${7:+...};
- $(LINK) -out:$@ /STACK:$(STACK_SIZE) \
+ $(LINK) -out:$@ -STACK:$(STACK_SIZE) \
$(MAP_OPTION) $(LFLAGS) $(LDFLAGS) \
@$(OBJDIR)/$(PROGRAM).lcf $(LDLIBS)
ifdef MT
- $(MT) /manifest $(OBJDIR)/$(PROGRAM).exe.manifest /outputresource:$@;#1
+ $(MT) -manifest $(OBJDIR)/$(PROGRAM).exe.manifest /outputresource:$@;#1
endif
@$(call binary_file_verification,$@)
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
--- a/jdk/make/common/Release.gmk Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/make/common/Release.gmk Wed Oct 31 08:29:44 2012 -0700
@@ -784,11 +784,22 @@
$(RT_JAR) $(RESOURCES_JAR) $(JSSE_JAR) $(JFR_JAR) \
$(BUILDMETAINDEX_JARFILE)
@# Copy in bin directory
+ifeq ($(USING_MSYS),true)
+ # No cpio in MinGW/MSYS
+ $(CD) $(OUTPUTDIR) && $(TAR) -cf - bin | ($(CD) $(JRE_IMAGE_DIR) && $(TAR) -xpf -)
+else
$(CD) $(OUTPUTDIR) && $(FIND) bin -depth | $(CPIO) -pdum $(JRE_IMAGE_DIR)
+endif
@# CTE plugin security change require new empty directory lib/applet
$(MKDIR) -p $(JRE_IMAGE_DIR)/lib/applet
@# Copy in lib directory
+ifeq ($(USING_MSYS),true)
+ # No cpio in MinGW/MSYS
+ $(CD) $(OUTPUTDIR) && $(TAR) -cf - lib | ($(CD) $(JRE_IMAGE_DIR) && $(TAR) -xpf -)
+else
$(CD) $(OUTPUTDIR) && $(FIND) lib -depth | $(CPIO) -pdum $(JRE_IMAGE_DIR)
+endif
+
ifeq ($(USING_CYGWIN),true)
$(RM) -rf $(JRE_IMAGE_DIR)/[A-Za-z]:
$(RM) -rf $(OUTPUTDIR)/[A-Za-z]:
@@ -919,11 +930,17 @@
# only places from which we copy everything), but because the presence
# of this file causes cygwin's find to bomb out, thus breaking the build
# in "install".
+
initial-image-jdk-setup:
$(RM) -r $(JDK_IMAGE_DIR)
$(MKDIR) -p $(JDK_IMAGE_DIR)/jre
+ifeq ($(USING_MSYS),true)
+ ($(CD) $(JRE_IMAGE_DIR) && $(TAR) -cf - . \
+ | ($(CD) $(JDK_IMAGE_DIR)/jre && $(TAR) -xpf -))
+else
($(CD) $(JRE_IMAGE_DIR) && $(FIND) . -depth -print \
| $(CPIO) -pdum $(JDK_IMAGE_DIR)/jre )
+endif
ifeq ($(USING_CYGWIN),true)
$(RM) -rf $(JRE_IMAGE_DIR)/[A-Za-z]:
$(RM) -rf $(JDK_IMAGE_DIR)/jre/[A-Za-z]:
--- a/jdk/make/common/shared/Defs-utils.gmk Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/make/common/shared/Defs-utils.gmk Wed Oct 31 08:29:44 2012 -0700
@@ -169,15 +169,19 @@
ifeq ($(PLATFORM),windows)
ifdef USING_CYGWIN
# Intrinsic unix command, with backslash-escaped character interpretation
- ECHO = $(UNIXCOMMAND_PATH)echo -e
- ZIPEXE = $(UNIXCOMMAND_PATH)zip
- UNZIP = $(UNIXCOMMAND_PATH)unzip
+ ECHO = $(UNIXCOMMAND_PATH)echo -e
+ ZIPEXE = $(UNIXCOMMAND_PATH)zip
+ UNZIP = $(UNIXCOMMAND_PATH)unzip
# Some CYGWIN nawk versions require BINMODE=w for proper '\r' interpretation
- NAWK = $(UNIXCOMMAND_PATH)awk -v BINMODE=w
+ NAWK = $(UNIXCOMMAND_PATH)awk -v BINMODE=w
else
ZIPEXE = $(UTILS_DEVTOOL_PATH)zip
UNZIP = $(UTILS_DEVTOOL_PATH)unzip
NAWK = $(UNIXCOMMAND_PATH)awk
+ ifdef USING_MSYS
+ ECHO = $(UTILS_COMMAND_PATH)echo -e
+ AR = $(UTILS_DEVTOOL_PATH)ar
+ endif
endif
# Re-define some utilities
LEX =# override GNU Make intrinsic: no lex on windows
--- a/jdk/make/common/shared/Defs-windows.gmk Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/make/common/shared/Defs-windows.gmk Wed Oct 31 08:29:44 2012 -0700
@@ -112,6 +112,15 @@
$(shell if [ "$1" != "" -a -d "$1" ]; then $(CYGPATH_CMD) "$1" 2> $(DEV_NULL); else echo "$1"; fi)
endef
else
+ifdef USING_MSYS
+DOSPATH_CMD:=$(shell cd $(JDK_TOPDIR) 2> $(DEV_NULL) && pwd)/make/tools/msys_build_scripts/dospath.sh
+define FullPath
+$(subst \,/,$(shell $(DOSPATH_CMD) $1))
+endef
+define OptFullPath
+$(shell if [ "$1" != "" -a -d "$1" ]; then (cd $1 && pwd); else echo "$1"; fi)
+endef
+else
# Temporary until we upgrade to MKS 8.7, MKS pwd returns mixed mode path
define FullPath
$(shell cd $1 2> $(DEV_NULL) && pwd)
@@ -120,6 +129,7 @@
$(shell if [ "$1" != "" -a -d "$1" ]; then (cd $1 && pwd); else echo "$1"; fi)
endef
endif
+endif
# System drive
ifdef SYSTEMDRIVE
@@ -146,43 +156,47 @@
ifdef USING_CYGWIN
UNIXCOMMAND_PATH :=$(call PrefixPath,/usr/bin)
else
- ifdef ROOTDIR
- xROOTDIR :="$(subst \,/,$(ROOTDIR))"
- _rootdir :=$(call FullPath,$(xROOTDIR))
+ ifdef USING_MSYS
+ UNIXCOMMAND_PATH :=$(call PrefixPath,/bin)
else
- xROOTDIR :="$(_system_drive)/mksnt"
- _rootdir :=$(call FullPath,$(xROOTDIR))
- endif
- ifneq ($(_rootdir),)
- UNIXCOMMAND_PATH :=$(call PrefixPath,$(_rootdir)/mksnt)
- endif
- endif
+ ifdef ROOTDIR
+ xROOTDIR :="$(subst \,/,$(ROOTDIR))"
+ _rootdir :=$(call FullPath,$(xROOTDIR))
+ else
+ xROOTDIR :="$(_system_drive)/mksnt"
+ _rootdir :=$(call FullPath,$(xROOTDIR))
+ endif
+ ifneq ($(_rootdir),)
+ UNIXCOMMAND_PATH :=$(call PrefixPath,$(_rootdir)/mksnt)
+ endif
+ endif # USING_MSYS
+ endif # USING_CYGWIN
endif
UNIXCOMMAND_PATH:=$(call AltCheckSpaces,UNIXCOMMAND_PATH)
# Get version of MKS or CYGWIN
-ifndef USING_CYGWIN
-_MKS_VER :=$(shell $(MKSINFO) 2>&1 | $(GREP) Release | $(TAIL) -1 | $(SED) -e 's@.*\(Release.*\)@\1@')
-MKS_VER :=$(call GetVersion,$(_MKS_VER))
-# At this point, we can re-define FullPath to use DOSNAME_CMD
-CHECK_MKS87:=$(call CheckVersions,$(MKS_VER),8.7)
-TRY_DOSNAME:=false
-ifeq ($(CHECK_MKS87),same)
-TRY_DOSNAME:=true
-endif
-# Newer should be ok
-ifeq ($(CHECK_MKS87),newer)
-TRY_DOSNAME:=true
-endif
-ifeq ($(TRY_DOSNAME),true)
-ifeq ($(shell $(UNIXCOMMAND_PATH)dosname -s $(_system_drive)/ 2> $(DEV_NULL)),$(_system_drive)/)
-_DOSNAME=$(UNIXCOMMAND_PATH)dosname
-DOSNAME_CMD:=$(_DOSNAME) -s
+ifdef USING_MKS
+ _MKS_VER :=$(shell $(MKSINFO) 2>&1 | $(GREP) Release | $(TAIL) -1 | $(SED) -e 's@.*\(Release.*\)@\1@')
+ MKS_VER :=$(call GetVersion,$(_MKS_VER))
+ # At this point, we can re-define FullPath to use DOSNAME_CMD
+ CHECK_MKS87:=$(call CheckVersions,$(MKS_VER),8.7)
+ TRY_DOSNAME:=false
+ ifeq ($(CHECK_MKS87),same)
+ TRY_DOSNAME:=true
+ endif
+ # Newer should be ok
+ ifeq ($(CHECK_MKS87),newer)
+ TRY_DOSNAME:=true
+ endif
+ ifeq ($(TRY_DOSNAME),true)
+ ifeq ($(shell $(UNIXCOMMAND_PATH)dosname -s $(_system_drive)/ 2> $(DEV_NULL)),$(_system_drive)/)
+ _DOSNAME=$(UNIXCOMMAND_PATH)dosname
+ DOSNAME_CMD:=$(_DOSNAME) -s
define FullPath
$(subst //,/,$(shell echo $1 | $(DOSNAME_CMD) 2> $(DEV_NULL)))
endef
-endif # test dosname -s
-endif # TRY_DOSNAME
+ endif # test dosname -s
+ endif # TRY_DOSNAME
endif # MKS
# We try to get references to what we need via the default component
@@ -440,10 +454,14 @@
ifdef USING_CYGWIN
DEVTOOLS_PATH :=$(UNIXCOMMAND_PATH)
else
- xDEVTOOLS_PATH :="$(_system_drive)/utils"
- fxDEVTOOLS_PATH :=$(call FullPath,$(xDEVTOOLS_PATH))
- DEVTOOLS_PATH :=$(call PrefixPath,$(fxDEVTOOLS_PATH))
- endif
+ ifdef USING_MSYS
+ DEVTOOLS_PATH :=$(UNIXCOMMAND_PATH)
+ else
+ xDEVTOOLS_PATH :="$(_system_drive)/utils"
+ fxDEVTOOLS_PATH :=$(call FullPath,$(xDEVTOOLS_PATH))
+ DEVTOOLS_PATH :=$(call PrefixPath,$(fxDEVTOOLS_PATH))
+ endif # USING_MSYS
+ endif # USING_CYGWIN
endif
DEVTOOLS_PATH:=$(call AltCheckSpaces,DEVTOOLS_PATH)
@@ -636,7 +654,7 @@
# Special define for checking the binaries
-# All windows dll and exe files should have been built with /NXCOMPAT
+# All windows dll and exe files should have been built with -NXCOMPAT
# and be setup for dynamic base addresses.
# In addition, we should not be dependent on certain dll files that
# we do not or cannot redistribute.
@@ -648,37 +666,37 @@
BANNED_DLLS=msvcp100[.]dll|msvcr100d[.]dll|msvcrtd[.]dll
endif
-# Check for /safeseh (only used on 32bit)
+# Check for -safeseh (only used on 32bit)
define binary_file_safeseh_verification # binary_file
( \
- $(ECHO) "Checking for /SAFESEH usage in: $1" && \
- if [ "`$(DUMPBIN) /loadconfig $1 | $(EGREP) -i 'Safe Exception Handler Table'`" = "" ] ; then \
+ $(ECHO) "Checking for -SAFESEH usage in: $1" && \
+ if [ "`$(DUMPBIN) -loadconfig $1 | $(EGREP) -i 'Safe Exception Handler Table'`" = "" ] ; then \
$(ECHO) "ERROR: Did not find 'Safe Exception Handler Table' in loadconfig: $1" ; \
- $(DUMPBIN) /loadconfig $1 ; \
+ $(DUMPBIN) -loadconfig $1 ; \
exit 6 ; \
fi ; \
)
endef
-# Check for /NXCOMPAT usage
+# Check for -NXCOMPAT usage
define binary_file_nxcompat_verification # binary_file
( \
- $(ECHO) "Checking for /NXCOMPAT usage in: $1" && \
- if [ "`$(DUMPBIN) /headers $1 | $(EGREP) -i 'NX compatible'`" = "" ] ; then \
+ $(ECHO) "Checking for -NXCOMPAT usage in: $1" && \
+ if [ "`$(DUMPBIN) -headers $1 | $(EGREP) -i 'NX compatible'`" = "" ] ; then \
$(ECHO) "ERROR: Did not find 'NX compatible' in headers: $1" ; \
- $(DUMPBIN) /headers $1 ; \
+ $(DUMPBIN) -headers $1 ; \
exit 7 ; \
fi ; \
)
endef
-# Check for /DYNAMICBASE usage
+# Check for -DYNAMICBASE usage
define binary_file_dynamicbase_verification # binary_file
( \
- $(ECHO) "Checking for /DYNAMICBASE usage in: $1" && \
- if [ "`$(DUMPBIN) /headers $1 | $(EGREP) -i 'Dynamic base'`" = "" ] ; then \
+ $(ECHO) "Checking for -DYNAMICBASE usage in: $1" && \
+ if [ "`$(DUMPBIN) -headers $1 | $(EGREP) -i 'Dynamic base'`" = "" ] ; then \
$(ECHO) "ERROR: Did not find 'Dynamic base' in headers: $1" ; \
- $(DUMPBIN) /headers $1 ; \
+ $(DUMPBIN) -headers $1 ; \
exit 8 ; \
fi ; \
)
@@ -688,9 +706,9 @@
define binary_file_dll_verification # binary_file
( \
$(ECHO) "Checking for banned dependencies in: $1" && \
- if [ "`$(DUMPBIN) /dependents $1 | $(EGREP) -i '$(BANNED_DLLS)'`" != "" ] ; then \
+ if [ "`$(DUMPBIN) -dependents $1 | $(EGREP) -i '$(BANNED_DLLS)'`" != "" ] ; then \
$(ECHO) "ERROR: Found use of $(BANNED_DLLS)"; \
- $(DUMPBIN) /dependents $1 ; \
+ $(DUMPBIN) -dependents $1 ; \
exit 9 ; \
fi ; \
)
--- a/jdk/make/common/shared/Platform.gmk Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/make/common/shared/Platform.gmk Wed Oct 31 08:29:44 2012 -0700
@@ -70,6 +70,8 @@
# LIBARCH32 solaris only: sparc or i386
# LIBARCH64 solaris only: sparcv9 or amd64
# USING_CYGWIN windows only: true or false
+# USING_MSYS windows only: true or false
+# USING_MKS windows only: true or false
# ISHIELD_TEMP_MIN windows only: minimum disk space in temp area
# Only run uname once in this make session.
@@ -306,6 +308,8 @@
# Windows with and without CYGWIN will be slightly different
ifeq ($(SYSTEM_UNAME), Windows_NT)
PLATFORM = windows
+ USING_MKS = true
+ export USING_MKS
endif
ifneq (,$(findstring CYGWIN,$(SYSTEM_UNAME)))
PLATFORM = windows
@@ -318,6 +322,11 @@
export CYGWIN_HOME
endif
endif
+ifneq (,$(findstring MINGW,$(SYSTEM_UNAME)))
+ PLATFORM = windows
+ USING_MSYS = true
+ export USING_MSYS
+endif
# Platform settings specific to Windows
ifeq ($(PLATFORM), windows)
@@ -395,11 +404,12 @@
endif
ARCH_FAMILY = $(ARCH)
# Where is unwanted output to be delivered?
- # MKS uses the special file "NUL", cygwin uses the customary unix file.
- ifeq ($(USING_CYGWIN),true)
+ # MKS uses the special file "NUL"; Cygwin and MinGW/MSYS use the
+ # customary unix file.
+ ifeq ($(USING_MKS),true)
+ DEV_NULL = NUL
+ else
DEV_NULL = /dev/null
- else
- DEV_NULL = NUL
endif
export DEV_NULL
# Classpath separator
@@ -440,28 +450,11 @@
_MB_OF_MEMORY := \
$(shell free -m | grep Mem: | awk '{print $$2;}' )
else
- # Windows 2000 has the mem utility, but two memory areas
- # extended memory is what is beyond 1024M
- _B_OF_EXT_MEMORY := \
- $(shell mem 2> $(DEV_NULL) | \
- grep 'total contiguous extended memory' | awk '{print $$1;}')
- ifeq ($(_B_OF_EXT_MEMORY),)
- _B_OF_MEMORY := \
- $(shell mem 2> $(DEV_NULL) | \
- grep 'total conventional memory' | awk '{print $$1;}')
- else
- _B_OF_MEMORY := \
- $(shell expr 1048576 '+' $(_B_OF_EXT_MEMORY) 2> $(DEV_NULL))
- endif
- ifeq ($(_B_OF_MEMORY),)
- # Windows 2003 has the systeminfo utility use it if mem doesn't work
- _MB_OF_MEMORY := \
- $(shell systeminfo 2> $(DEV_NULL) | \
- grep 'Total Physical Memory:' | \
- awk '{print $$4;}' | sed -e 's@,@@')
- else
- _MB_OF_MEMORY := $(shell expr $(_B_OF_MEMORY) '/' 1024 2> $(DEV_NULL))
- endif
+ # Windows XP and higher has the systeminfo utility
+ _MB_OF_MEMORY := \
+ $(shell systeminfo 2> $(DEV_NULL) | \
+ grep 'Total Physical Memory:' | \
+ awk '{print $$4;}' | sed -e 's@,@@')
endif
ifeq ($(shell expr $(_MB_OF_MEMORY) '+' 0 2> $(DEV_NULL)), $(_MB_OF_MEMORY))
MB_OF_MEMORY := $(_MB_OF_MEMORY)
--- a/jdk/make/common/shared/Sanity-Settings.gmk Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/make/common/shared/Sanity-Settings.gmk Wed Oct 31 08:29:44 2012 -0700
@@ -182,8 +182,13 @@
ALL_SETTINGS+=$(call addRequiredVersionSetting,CYGWIN_VER)
ALL_SETTINGS+=$(call addRequiredSetting,CYGPATH_CMD)
else
- ALL_SETTINGS+=$(call addRequiredVersionSetting,MKS_VER)
- ALL_SETTINGS+=$(call addOptionalSetting,DOSNAME_CMD)
+ ifdef USING_MSYS
+ ALL_SETTINGS+=$(call addRequiredSetting,USING_MSYS)
+ ALL_SETTINGS+=$(call addRequiredSetting,DOSPATH_CMD)
+ else
+ ALL_SETTINGS+=$(call addRequiredVersionSetting,MKS_VER)
+ ALL_SETTINGS+=$(call addOptionalSetting,DOSNAME_CMD)
+ endif
endif
endif
ifeq ($(PLATFORM),linux)
--- a/jdk/make/common/shared/Sanity.gmk Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/make/common/shared/Sanity.gmk Wed Oct 31 08:29:44 2012 -0700
@@ -394,7 +394,7 @@
ifeq ($(PLATFORM), windows)
MKS_CHECK :=$(call CheckVersions,$(MKS_VER),$(REQUIRED_MKS_VER))
sane-mks:
- ifndef USING_CYGWIN
+ ifdef USING_MKS
ifeq ($(MKS_CHECK),missing)
@$(call OfficialErrorMessage,MKS version,$(MKS_VER),$(REQUIRED_MKS_VER))
endif
@@ -904,14 +904,25 @@
"" >> $(ERROR_FILE) ; \
fi
ifeq ($(PLATFORM), windows)
- @for utility in cpio ar file m4 ; do \
+ifeq ($(USING_MSYS), true)
+ @for utility in $(AR) $(FILE) $(M4) ; do \
if [ ! -r "`$(WHICH) $${utility}`" ]; then \
$(ECHO) "WARNING: You do not have the utility $${utility} in the \n" \
" directory $(UNIXCOMMAND_PATH). \n" \
- " The utilities cpio, ar, file, and m4 are required. \n" \
+ " The utilities ar, file and m4 are required. \n" \
"" >> $(WARNING_FILE) ; \
fi; \
done
+else
+ @for utility in $(AR) $(CPIO) $(FILE) $(M4) ; do \
+ if [ ! -r "`$(WHICH) $${utility}`" ]; then \
+ $(ECHO) "WARNING: You do not have the utility $${utility} in the \n" \
+ " directory $(UNIXCOMMAND_PATH). \n" \
+ " The utilities ar, cpio, file and m4 are required. \n" \
+ "" >> $(WARNING_FILE) ; \
+ fi; \
+ done
+endif
endif
######################################################
@@ -998,7 +1009,8 @@
" This is normally obtained from the WINDOWSSDKDIR." \
"" >> $(ERROR_FILE)
endif
- ifeq ($(wildcard $(DUMPBIN)),)
+ # MinGW/MSYS make 3.81 will not tolerate a path with a quoted substring
+ ifeq ($(wildcard $(subst ",,$(DUMPBIN))),)
@$(ECHO) "ERROR: Cannot find the DUMPBIN utility from path: $(DUMPBIN)\n" \
" This is normally obtained from the COMPILER_PATH." \
"" >> $(ERROR_FILE)
--- a/jdk/make/jdk_generic_profile.sh Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/make/jdk_generic_profile.sh Wed Oct 31 08:29:44 2012 -0700
@@ -176,17 +176,38 @@
else
windows_arch=i586
fi
+
+ repo=`hg root | sed -e 's@\\\\@/@g'`
# We need to check if we are running a CYGWIN shell
- if [ "$(uname -a | fgrep Cygwin)" != "" -a -f /bin/cygpath ] ; then
+ if [ "$(echo ${osname} | fgrep Cygwin)" != "" -a -f /bin/cygpath ] ; then
# For CYGWIN, uname will have "Cygwin" in it, and /bin/cygpath should exist
# Utility to convert to short pathnames without spaces
cygpath="/usr/bin/cygpath -a -m -s"
+ cygpathp="/usr/bin/cygpath -p"
# Most unix utilities are in the /usr/bin
unixcommand_path="/usr/bin"
# Make the prompt tell you CYGWIN
export PS1="CYGWIN:${COMPUTERNAME}:${USERNAME}[\!] "
+ elif [ "$(echo ${osname} | fgrep MINGW)" != "" ] ; then
+ # Utility to convert to short pathnames without spaces
+ cygpath="${repo}/make/tools/msys_build_scripts/dospath.sh"
+ if [ ! -f ${cygpath} ] ; then
+ echo "ERROR: Cannot find cygpath or equivalent on this machine"
+ exit 1
+ fi
+ # Utility to fix a path to MinGW/MSYS format - the equivalent of 'cygpath -p'
+ for tfile in "${repo}/make/scripts/fixpath.pl" "${repo}/../make/scripts/fixpath.pl"; do
+ if [ -f ${tfile} ] ; then
+ cygpathp="/bin/perl ${tfile} -m"
+ fi
+ done;
+ if [ -z "${cygpathp}" ] ; then
+ echo "ERROR: Cannot find make/scripts/fixpath.pl on this machine"
+ exit 1
+ fi
+ unixcommand_path="/usr/bin"
else
- echo "ERROR: Cannot find CYGWIN on this machine"
+ echo "ERROR: Cannot find CYGWIN or MinGW/MSYS on this machine"
exit 1
fi
if [ "${ALT_UNIXCOMMAND_PATH}" != "" ] ; then
@@ -204,17 +225,18 @@
else
sys_root=$(${cygpath} "C:/WINNT")
fi
- path4sdk="${unixcommand_path};${sys_root}/system32;${sys_root};${sys_root}/System32/Wbem"
if [ ! -d "${sys_root}" ] ; then
echo "WARNING: No system root found at: ${sys_root}"
fi
+ # Build a : separated path making sure each segment is acceptable to ${osname}
+ path4sdk="${unixcommand_path}:"`${cygpathp} "${sys_root}/system32;${sys_root};${sys_root}/System32/Wbem"`
+
# Compiler setup (nasty part)
# NOTE: You can use vcvars32.bat to set PATH, LIB, and INCLUDE.
# NOTE: CYGWIN has a link.exe too, make sure the compilers are first
# Use supplied vsvars.sh
- repo=`hg root`
if [ -f "${repo}/make/scripts/vsvars.sh" ] ; then
eval `sh ${repo}/make/scripts/vsvars.sh -v10`
elif [ -f "${repo}/../make/scripts/vsvars.sh" ] ; then
--- a/jdk/make/sun/net/FILES_java.gmk Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/make/sun/net/FILES_java.gmk Wed Oct 31 08:29:44 2012 -0700
@@ -128,8 +128,6 @@
sun/net/www/content/audio/x_wav.java \
sun/net/www/protocol/ftp/Handler.java \
sun/net/www/protocol/ftp/FtpURLConnection.java \
- sun/net/www/protocol/gopher/GopherClient.java \
- sun/net/www/protocol/gopher/Handler.java \
sun/net/www/protocol/mailto/Handler.java \
sun/net/www/protocol/mailto/MailToURLConnection.java \
sun/net/idn/Punycode.java \
--- a/jdk/make/tools/freetypecheck/Makefile Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/make/tools/freetypecheck/Makefile Wed Oct 31 08:29:44 2012 -0700
@@ -37,11 +37,11 @@
# Start with CFLAGS (which gets us the required -xarch setting on solaris)
ifeq ($(PLATFORM), windows)
- FT_OPTIONS = /nologo /c
+ FT_OPTIONS = -nologo -c
FREETYPE_DLL = $(FREETYPE_LIB_PATH)/freetype.dll
FT_LD_OPTIONS = $(FREETYPE_LIB_PATH)/freetype.lib
ifdef MT
- FT_LD_OPTIONS += /manifest
+ FT_LD_OPTIONS += -manifest
endif
else
FT_OPTIONS = $(CFLAGS)
@@ -72,11 +72,11 @@
$(prep-target)
ifeq ($(PLATFORM), windows)
$(CC) $(FT_OPTIONS) $(CC_OBJECT_OUTPUT_FLAG)$(FT_OBJ) $<
- $(LINK) $(FT_LD_OPTIONS) /OUT:$(FT_TEST) $(FT_OBJ)
+ $(LINK) $(FT_LD_OPTIONS) -OUT:$(FT_TEST) $(FT_OBJ)
$(CP) $(FREETYPE_DLL) $(@D)/
ifdef MT
$(CP) $(MSVCRNN_DLL_PATH)/$(MSVCRNN_DLL) $(@D)/
- $(MT) /manifest $(FT_TEST).manifest /outputresource:$(FT_TEST);#1
+ $(MT) -manifest $(FT_TEST).manifest -outputresource:$(FT_TEST);#1
endif
else
@$(CC) $(FT_OPTIONS) -o $@ $< $(FT_LD_OPTIONS)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/make/tools/msys_build_scripts/dospath.sh Wed Oct 31 08:29:44 2012 -0700
@@ -0,0 +1,42 @@
+#
+# 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. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# 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.
+#
+
+# A shell script which converts its first argument, which must be an existing
+# path name, into a DOS (aka 8.3) path name. If the path is a file, only the
+# directory part of the whole path will be converted.
+# This shell script executes the Visual Basic helper script 'dospath.vbs'
+# which must be located in the same directory as this script itself.
+# The Visual Basic script will be invoked trough the "Windows Script Host"
+# which is available by default on Windows since Windows 98.
+
+pushd `dirname "$0"` > /dev/null
+ABS_PATH=`pwd`
+popd > /dev/null
+if [ -d "$1" ]; then
+ echo `cd "$1" && cscript.exe -nologo $ABS_PATH/dospath.vbs`;
+elif [ -f "$1" ]; then
+ DIR=`dirname "$1"`;
+ echo `cd "$DIR" && cscript.exe -nologo $ABS_PATH/dospath.vbs`\\`basename "$1"`;
+fi
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/make/tools/msys_build_scripts/dospath.vbs Wed Oct 31 08:29:44 2012 -0700
@@ -0,0 +1,34 @@
+'
+' 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. Oracle designates this
+' particular file as subject to the "Classpath" exception as provided
+' by Oracle in the LICENSE file that accompanied this code.
+'
+' 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.
+'
+
+'
+' Visual Basic Script which returns the DOS (aka 8.3) filename of the current
+' directory.
+' Only called from 'dospath.sh' during a Windows build under MinGW/MSYS.
+'
+
+Set fso=CreateObject("Scripting.FileSystemObject")
+Set path = fso.GetFolder(".")
+WScript.Echo path.ShortPath
--- a/jdk/src/macosx/classes/com/apple/laf/AquaFileChooserUI.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/macosx/classes/com/apple/laf/AquaFileChooserUI.java Wed Oct 31 08:29:44 2012 -0700
@@ -379,6 +379,19 @@
}
}
updateButtonState(getFileChooser());
+ } else if (prop.equals(JFileChooser.SELECTED_FILES_CHANGED_PROPERTY)) {
+ JFileChooser fileChooser = getFileChooser();
+ if (!fileChooser.isDirectorySelectionEnabled()) {
+ final File[] files = (File[]) e.getNewValue();
+ if (files != null) {
+ for (int selectedRow : fFileList.getSelectedRows()) {
+ File file = (File) fFileList.getValueAt(selectedRow, 0);
+ if (fileChooser.isTraversable(file)) {
+ fFileList.removeSelectedIndex(selectedRow);
+ }
+ }
+ }
+ }
} else if (prop.equals(JFileChooser.DIRECTORY_CHANGED_PROPERTY)) {
fFileList.clearSelection();
final File currentDirectory = getFileChooser().getCurrentDirectory();
--- a/jdk/src/macosx/classes/sun/awt/CGraphicsDevice.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/macosx/classes/sun/awt/CGraphicsDevice.java Wed Oct 31 08:29:44 2012 -0700
@@ -33,9 +33,7 @@
import sun.java2d.opengl.CGLGraphicsConfig;
-import sun.awt.FullScreenCapable;
-
-public class CGraphicsDevice extends GraphicsDevice {
+public final class CGraphicsDevice extends GraphicsDevice {
// CoreGraphics display ID
private final int displayID;
@@ -108,11 +106,6 @@
return nativeGetYResolution(displayID);
}
- public int getScreenResolution() {
- // TODO: report non-72 value when HiDPI is turned on
- return 72;
- }
-
private static native double nativeGetXResolution(int displayID);
private static native double nativeGetYResolution(int displayID);
@@ -194,6 +187,9 @@
@Override
public void setDisplayMode(DisplayMode dm) {
+ if (dm == null) {
+ throw new IllegalArgumentException("Invalid display mode");
+ }
nativeSetDisplayMode(displayID, dm.getWidth(), dm.getHeight(), dm.getBitDepth(), dm.getRefreshRate());
if (isFullScreenSupported() && getFullScreenWindow() != null) {
getFullScreenWindow().setSize(dm.getWidth(), dm.getHeight());
--- a/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java Wed Oct 31 08:29:44 2012 -0700
@@ -65,7 +65,7 @@
private static native void nativeDispose(long nsWindowPtr);
private static native CPlatformWindow nativeGetTopmostPlatformWindowUnderMouse();
- private static native int nativeGetNSWindowDisplayID_AppKitThread(long nsWindowPtr);
+ private static native int nativeGetNSWindowDisplayID(long nsWindowPtr);
// Loger to report issues happened during execution but that do not affect functionality
private static final PlatformLogger logger = PlatformLogger.getLogger("sun.lwawt.macosx.CPlatformWindow");
@@ -444,7 +444,7 @@
public GraphicsDevice getGraphicsDevice() {
GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
CGraphicsEnvironment cge = (CGraphicsEnvironment)ge;
- int displayID = nativeGetNSWindowDisplayID_AppKitThread(getNSWindowPtr());
+ int displayID = nativeGetNSWindowDisplayID(getNSWindowPtr());
GraphicsDevice gd = cge.getScreenDevice(displayID);
if (gd == null) {
// this could possibly happen during device removal
--- a/jdk/src/macosx/classes/sun/lwawt/macosx/CTrayIcon.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CTrayIcon.java Wed Oct 31 08:29:44 2012 -0700
@@ -26,6 +26,7 @@
package sun.lwawt.macosx;
import sun.awt.SunToolkit;
+import sun.lwawt.macosx.event.NSEvent;
import javax.swing.*;
import java.awt.*;
@@ -42,6 +43,16 @@
private JDialog messageDialog;
private DialogEventHandler handler;
+ // In order to construct MouseEvent object, we need to specify a
+ // Component target. Because TrayIcon isn't Component's subclass,
+ // we use this dummy frame instead
+ private final Frame dummyFrame;
+
+ // A bitmask that indicates what mouse buttons produce MOUSE_CLICKED events
+ // on MOUSE_RELEASE. Click events are only generated if there were no drag
+ // events between MOUSE_PRESSED and MOUSE_RELEASED for particular button
+ private static int mouseClickButtons = 0;
+
CTrayIcon(TrayIcon target) {
super(0, true);
@@ -49,6 +60,7 @@
this.handler = null;
this.target = target;
this.popup = target.getPopupMenu();
+ this.dummyFrame = new Frame();
setPtr(createModel());
//if no one else is creating the peer.
@@ -119,6 +131,8 @@
disposeMessageDialog();
}
+ dummyFrame.dispose();
+
LWCToolkit.targetDisposedPeer(target, this);
target = null;
@@ -161,17 +175,78 @@
private native void setNativeImage(final long model, final long nsimage, final boolean autosize);
- //invocation from the AWTTrayIcon.m
- public void performAction() {
+ private void postEvent(final AWTEvent event) {
SunToolkit.executeOnEventHandlerThread(target, new Runnable() {
public void run() {
- final String cmd = target.getActionCommand();
- final ActionEvent event = new ActionEvent(target, ActionEvent.ACTION_PERFORMED, cmd);
SunToolkit.postEvent(SunToolkit.targetToAppContext(target), event);
}
});
}
+ //invocation from the AWTTrayIcon.m
+ private void handleMouseEvent(NSEvent nsEvent) {
+ int buttonNumber = nsEvent.getButtonNumber();
+ final SunToolkit tk = (SunToolkit)Toolkit.getDefaultToolkit();
+ if ((buttonNumber > 2 && !tk.areExtraMouseButtonsEnabled())
+ || buttonNumber > tk.getNumberOfButtons() - 1) {
+ return;
+ }
+
+ int jeventType = NSEvent.nsToJavaEventType(nsEvent.getType());
+
+ int jbuttonNumber = MouseEvent.NOBUTTON;
+ int jclickCount = 0;
+ if (jeventType != MouseEvent.MOUSE_MOVED) {
+ jbuttonNumber = NSEvent.nsToJavaButton(buttonNumber);
+ jclickCount = nsEvent.getClickCount();
+ }
+
+ int jmodifiers = NSEvent.nsToJavaMouseModifiers(buttonNumber,
+ nsEvent.getModifierFlags());
+ boolean isPopupTrigger = NSEvent.isPopupTrigger(jmodifiers);
+
+ int eventButtonMask = (jbuttonNumber > 0)?
+ MouseEvent.getMaskForButton(jbuttonNumber) : 0;
+ long when = System.currentTimeMillis();
+
+ if (jeventType == MouseEvent.MOUSE_PRESSED) {
+ mouseClickButtons |= eventButtonMask;
+ } else if (jeventType == MouseEvent.MOUSE_DRAGGED) {
+ mouseClickButtons = 0;
+ }
+
+ // The MouseEvent's coordinates are relative to screen
+ int absX = nsEvent.getAbsX();
+ int absY = nsEvent.getAbsY();
+
+ MouseEvent mouseEvent = new MouseEvent(dummyFrame, jeventType, when,
+ jmodifiers, absX, absY, absX, absY, jclickCount, isPopupTrigger,
+ jbuttonNumber);
+ mouseEvent.setSource(target);
+ postEvent(mouseEvent);
+
+ // fire ACTION event
+ if (jeventType == MouseEvent.MOUSE_PRESSED && isPopupTrigger) {
+ final String cmd = target.getActionCommand();
+ final ActionEvent event = new ActionEvent(target,
+ ActionEvent.ACTION_PERFORMED, cmd);
+ postEvent(event);
+ }
+
+ // synthesize CLICKED event
+ if (jeventType == MouseEvent.MOUSE_RELEASED) {
+ if ((mouseClickButtons & eventButtonMask) != 0) {
+ MouseEvent clickEvent = new MouseEvent(dummyFrame,
+ MouseEvent.MOUSE_CLICKED, when, jmodifiers, absX, absY,
+ absX, absY, jclickCount, isPopupTrigger, jbuttonNumber);
+ clickEvent.setSource(target);
+ postEvent(clickEvent);
+ }
+
+ mouseClickButtons &= ~eventButtonMask;
+ }
+ }
+
private native Point2D nativeGetIconLocation(long trayIconModel);
public void displayMessageOnEDT(String caption, String text,
@@ -256,6 +331,9 @@
dialog.setDefaultCloseOperation(JDialog.DO_NOTHING_ON_CLOSE);
dialog.setModal(false);
+ dialog.setModalExclusionType(Dialog.ModalExclusionType.TOOLKIT_EXCLUDE);
+ dialog.setAlwaysOnTop(true);
+ dialog.setAutoRequestFocus(false);
dialog.setResizable(false);
dialog.setContentPane(op);
--- a/jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java Wed Oct 31 08:29:44 2012 -0700
@@ -53,7 +53,7 @@
/**
* Mac OS X Cocoa-based AWT Toolkit.
*/
-public class LWCToolkit extends LWToolkit {
+public final class LWCToolkit extends LWToolkit {
// While it is possible to enumerate all mouse devices
// and query them for the number of buttons, the code
// that does it is rather complex. Instead, we opt for
@@ -278,7 +278,6 @@
return new CMouseInfoPeer();
}
-
@Override
protected int getScreenHeight() {
return GraphicsEnvironment.getLocalGraphicsEnvironment()
@@ -333,8 +332,9 @@
@Override
public int getScreenResolution() throws HeadlessException {
- return ((CGraphicsDevice) GraphicsEnvironment
- .getLocalGraphicsEnvironment().getDefaultScreenDevice()).getScreenResolution();
+ return (int) ((CGraphicsDevice) GraphicsEnvironment
+ .getLocalGraphicsEnvironment().getDefaultScreenDevice())
+ .getXResolution();
}
@Override
--- a/jdk/src/macosx/native/sun/awt/AWTWindow.m Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/macosx/native/sun/awt/AWTWindow.m Wed Oct 31 08:29:44 2012 -0700
@@ -324,6 +324,13 @@
}
}
++ (NSNumber *) getNSWindowDisplayID_AppKitThread:(NSWindow *)window {
+ AWT_ASSERT_APPKIT_THREAD;
+ NSScreen *screen = [window screen];
+ NSDictionary *deviceDescription = [screen deviceDescription];
+ return [deviceDescription objectForKey:@"NSScreenNumber"];
+}
+
- (void) dealloc {
AWT_ASSERT_APPKIT_THREAD;
@@ -1113,19 +1120,22 @@
* Signature: (J)I
*/
JNIEXPORT jint JNICALL
-Java_sun_lwawt_macosx_CPlatformWindow_nativeGetNSWindowDisplayID_1AppKitThread
+Java_sun_lwawt_macosx_CPlatformWindow_nativeGetNSWindowDisplayID
(JNIEnv *env, jclass clazz, jlong windowPtr)
{
- jint ret; // CGDirectDisplayID
+ __block jint ret; // CGDirectDisplayID
JNF_COCOA_ENTER(env);
-AWT_ASSERT_APPKIT_THREAD;
NSWindow *window = OBJC(windowPtr);
- NSScreen *screen = [window screen];
- NSDictionary *deviceDescription = [screen deviceDescription];
- NSNumber *displayID = [deviceDescription objectForKey:@"NSScreenNumber"];
- ret = (jint)[displayID intValue];
+
+ if ([NSThread isMainThread]) {
+ ret = (jint)[[AWTWindow getNSWindowDisplayID_AppKitThread: window] intValue];
+ } else {
+ [JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){
+ ret = (jint)[[AWTWindow getNSWindowDisplayID_AppKitThread: window] intValue];
+ }];
+ }
JNF_COCOA_EXIT(env);
--- a/jdk/src/macosx/native/sun/awt/CTrayIcon.h Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/macosx/native/sun/awt/CTrayIcon.h Wed Oct 31 08:29:44 2012 -0700
@@ -53,6 +53,7 @@
- (jobject) peer;
- (void) setImage:(NSImage *) imagePtr sizing:(BOOL)autosize;
- (NSPoint) getLocationOnScreen;
+- (void) deliverJavaMouseEvent:(NSEvent*) event;
@end //AWTTrayIcon
@@ -68,6 +69,7 @@
-(id)initWithTrayIcon:(AWTTrayIcon *)theTrayIcon;
-(void)setHighlighted:(BOOL)aFlag;
-(void)setImage:(NSImage*)anImage;
+-(void)setTrayIcon:(AWTTrayIcon*)theTrayIcon;
@end //AWTTrayIconView
--- a/jdk/src/macosx/native/sun/awt/CTrayIcon.m Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/macosx/native/sun/awt/CTrayIcon.m Wed Oct 31 08:29:44 2012 -0700
@@ -29,6 +29,7 @@
#import "CTrayIcon.h"
#import "ThreadUtilities.h"
#include "GeomUtilities.h"
+#import "LWCToolkit.h"
#define kImageInset 4.0
@@ -76,8 +77,9 @@
// Its a bad idea to force the item to release our view by setting
// the item's view to nil: it can lead to a crash in some scenarios.
// The item will release the view later on, so just set the view's image
- // to nil since we are done with it.
+ // and tray icon to nil since we are done with it.
[view setImage: nil];
+ [view setTrayIcon: nil];
[view release];
[theItem release];
@@ -115,6 +117,45 @@
return [[view window] convertBaseToScreen: NSZeroPoint];
}
+-(void) deliverJavaMouseEvent: (NSEvent *) event {
+ [AWTToolkit eventCountPlusPlus];
+
+ JNIEnv *env = [ThreadUtilities getJNIEnv];
+
+ NSPoint eventLocation = [event locationInWindow];
+ NSPoint localPoint = [view convertPoint: eventLocation fromView: nil];
+ localPoint.y = [view bounds].size.height - localPoint.y;
+
+ NSPoint absP = [NSEvent mouseLocation];
+ NSEventType type = [event type];
+
+ NSRect screenRect = [[NSScreen mainScreen] frame];
+ absP.y = screenRect.size.height - absP.y;
+ jint clickCount;
+
+ clickCount = [event clickCount];
+
+ static JNF_CLASS_CACHE(jc_NSEvent, "sun/lwawt/macosx/event/NSEvent");
+ static JNF_CTOR_CACHE(jctor_NSEvent, jc_NSEvent, "(IIIIIIIIDD)V");
+ jobject jEvent = JNFNewObject(env, jctor_NSEvent,
+ [event type],
+ [event modifierFlags],
+ clickCount,
+ [event buttonNumber],
+ (jint)localPoint.x, (jint)localPoint.y,
+ (jint)absP.x, (jint)absP.y,
+ [event deltaY],
+ [event deltaX]);
+ if (jEvent == nil) {
+ // Unable to create event by some reason.
+ return;
+ }
+
+ static JNF_CLASS_CACHE(jc_TrayIcon, "sun/lwawt/macosx/CTrayIcon");
+ static JNF_MEMBER_CACHE(jm_handleMouseEvent, jc_TrayIcon, "handleMouseEvent", "(Lsun/lwawt/macosx/event/NSEvent;)V");
+ JNFCallVoidMethod(env, peer, jm_handleMouseEvent, jEvent);
+}
+
@end //AWTTrayIcon
//================================================
@@ -123,7 +164,7 @@
-(id)initWithTrayIcon:(AWTTrayIcon *)theTrayIcon {
self = [super initWithFrame:NSMakeRect(0, 0, 1, 1)];
- trayIcon = theTrayIcon;
+ [self setTrayIcon: theTrayIcon];
isHighlighted = NO;
image = nil;
@@ -153,6 +194,10 @@
}
}
+-(void)setTrayIcon:(AWTTrayIcon*)theTrayIcon {
+ trayIcon = theTrayIcon;
+}
+
- (void)menuWillOpen:(NSMenu *)menu
{
[self setHighlighted:YES];
@@ -191,30 +236,57 @@
];
}
-- (void) mouseDown:(NSEvent *)e {
- //find CTrayIcon.getPopupMenuModel method and call it to get popup menu ptr.
- JNIEnv *env = [ThreadUtilities getJNIEnv];
- static JNF_CLASS_CACHE(jc_CTrayIcon, "sun/lwawt/macosx/CTrayIcon");
- static JNF_MEMBER_CACHE(jm_getPopupMenuModel, jc_CTrayIcon, "getPopupMenuModel", "()J");
- static JNF_MEMBER_CACHE(jm_performAction, jc_CTrayIcon, "performAction", "()V");
- jlong res = JNFCallLongMethod(env, trayIcon.peer, jm_getPopupMenuModel);
- if (res != 0) {
- CPopupMenu *cmenu = jlong_to_ptr(res);
- NSMenu* menu = [cmenu menu];
- [menu setDelegate:self];
- [trayIcon.theItem popUpStatusItemMenu:menu];
- [self setNeedsDisplay:YES];
- } else {
- JNFCallVoidMethod(env, trayIcon.peer, jm_performAction);
+- (void)mouseDown:(NSEvent *)event {
+ [trayIcon deliverJavaMouseEvent: event];
+
+ // don't show the menu on ctrl+click: it triggers ACTION event, like right click
+ if (([event modifierFlags] & NSControlKeyMask) == 0) {
+ //find CTrayIcon.getPopupMenuModel method and call it to get popup menu ptr.
+ JNIEnv *env = [ThreadUtilities getJNIEnv];
+ static JNF_CLASS_CACHE(jc_CTrayIcon, "sun/lwawt/macosx/CTrayIcon");
+ static JNF_MEMBER_CACHE(jm_getPopupMenuModel, jc_CTrayIcon, "getPopupMenuModel", "()J");
+ jlong res = JNFCallLongMethod(env, trayIcon.peer, jm_getPopupMenuModel);
+
+ if (res != 0) {
+ CPopupMenu *cmenu = jlong_to_ptr(res);
+ NSMenu* menu = [cmenu menu];
+ [menu setDelegate:self];
+ [trayIcon.theItem popUpStatusItemMenu:menu];
+ [self setNeedsDisplay:YES];
+ }
}
}
-- (void) rightMouseDown:(NSEvent *)e {
- // Call CTrayIcon.performAction() method on right mouse press
- JNIEnv *env = [ThreadUtilities getJNIEnv];
- static JNF_CLASS_CACHE(jc_CTrayIcon, "sun/lwawt/macosx/CTrayIcon");
- static JNF_MEMBER_CACHE(jm_performAction, jc_CTrayIcon, "performAction", "()V");
- JNFCallVoidMethod(env, trayIcon.peer, jm_performAction);
+- (void) mouseUp:(NSEvent *)event {
+ [trayIcon deliverJavaMouseEvent: event];
+}
+
+- (void) mouseDragged:(NSEvent *)event {
+ [trayIcon deliverJavaMouseEvent: event];
+}
+
+- (void) rightMouseDown:(NSEvent *)event {
+ [trayIcon deliverJavaMouseEvent: event];
+}
+
+- (void) rightMouseUp:(NSEvent *)event {
+ [trayIcon deliverJavaMouseEvent: event];
+}
+
+- (void) rightMouseDragged:(NSEvent *)event {
+ [trayIcon deliverJavaMouseEvent: event];
+}
+
+- (void) otherMouseDown:(NSEvent *)event {
+ [trayIcon deliverJavaMouseEvent: event];
+}
+
+- (void) otherMouseUp:(NSEvent *)event {
+ [trayIcon deliverJavaMouseEvent: event];
+}
+
+- (void) otherMouseDragged:(NSEvent *)event {
+ [trayIcon deliverJavaMouseEvent: event];
}
--- a/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java Wed Oct 31 08:29:44 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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
@@ -37,6 +37,9 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.security.AccessControlContext;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParserFactory;
@@ -46,6 +49,8 @@
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
+import sun.misc.SharedSecrets;
+
/**
* The main class to parse JavaBeans XML archive.
*
@@ -56,11 +61,10 @@
* @see ElementHandler
*/
public final class DocumentHandler extends DefaultHandler {
- private final Map<String, Class<? extends ElementHandler>> handlers = new HashMap<String, Class<? extends ElementHandler>>();
-
- private final Map<String, Object> environment = new HashMap<String, Object>();
-
- private final List<Object> objects = new ArrayList<Object>();
+ private final AccessControlContext acc = AccessController.getContext();
+ private final Map<String, Class<? extends ElementHandler>> handlers = new HashMap<>();
+ private final Map<String, Object> environment = new HashMap<>();
+ private final List<Object> objects = new ArrayList<>();
private Reference<ClassLoader> loader;
private ExceptionListener listener;
@@ -351,23 +355,32 @@
*
* @param input the input source to parse
*/
- public void parse(InputSource input) {
- try {
- SAXParserFactory.newInstance().newSAXParser().parse(input, this);
- }
- catch (ParserConfigurationException exception) {
- handleException(exception);
+ public void parse(final InputSource input) {
+ if ((this.acc == null) && (null != System.getSecurityManager())) {
+ throw new SecurityException("AccessControlContext is not set");
}
- catch (SAXException wrapper) {
- Exception exception = wrapper.getException();
- if (exception == null) {
- exception = wrapper;
+ AccessControlContext stack = AccessController.getContext();
+ SharedSecrets.getJavaSecurityAccess().doIntersectionPrivilege(new PrivilegedAction<Void>() {
+ public Void run() {
+ try {
+ SAXParserFactory.newInstance().newSAXParser().parse(input, DocumentHandler.this);
+ }
+ catch (ParserConfigurationException exception) {
+ handleException(exception);
+ }
+ catch (SAXException wrapper) {
+ Exception exception = wrapper.getException();
+ if (exception == null) {
+ exception = wrapper;
+ }
+ handleException(exception);
+ }
+ catch (IOException exception) {
+ handleException(exception);
+ }
+ return null;
}
- handleException(exception);
- }
- catch (IOException exception) {
- handleException(exception);
- }
+ }, stack, this.acc);
}
/**
--- a/jdk/src/share/classes/com/sun/beans/decoder/PropertyElementHandler.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/share/classes/com/sun/beans/decoder/PropertyElementHandler.java Wed Oct 31 08:29:44 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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
@@ -35,6 +35,8 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import sun.reflect.misc.MethodUtil;
+
/**
* This class is intended to handle <property> element.
* This element simplifies access to the properties.
@@ -168,11 +170,11 @@
private static Object getPropertyValue(Object bean, String name, Integer index) throws IllegalAccessException, IntrospectionException, InvocationTargetException, NoSuchMethodException {
Class<?> type = bean.getClass();
if (index == null) {
- return findGetter(type, name).invoke(bean);
+ return MethodUtil.invoke(findGetter(type, name), bean, new Object[] {});
} else if (type.isArray() && (name == null)) {
return Array.get(bean, index);
} else {
- return findGetter(type, name, int.class).invoke(bean, index);
+ return MethodUtil.invoke(findGetter(type, name, int.class), bean, new Object[] {index});
}
}
@@ -197,11 +199,11 @@
: null;
if (index == null) {
- findSetter(type, name, param).invoke(bean, value);
+ MethodUtil.invoke(findSetter(type, name, param), bean, new Object[] {value});
} else if (type.isArray() && (name == null)) {
Array.set(bean, index, value);
} else {
- findSetter(type, name, int.class, param).invoke(bean, index, value);
+ MethodUtil.invoke(findSetter(type, name, int.class, param), bean, new Object[] {index, value});
}
}
--- a/jdk/src/share/classes/com/sun/jmx/remote/internal/ServerNotifForwarder.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/share/classes/com/sun/jmx/remote/internal/ServerNotifForwarder.java Wed Oct 31 08:29:44 2012 -0700
@@ -68,9 +68,9 @@
this.notifBuffer = notifBuffer;
this.connectionId = connectionId;
connectionTimeout = EnvHelp.getServerConnectionTimeout(env);
- checkNotificationEmission = EnvHelp.computeBooleanFromString(
- env,
- "jmx.remote.x.check.notification.emission",false);
+
+ String stringBoolean = (String) env.get("jmx.remote.x.check.notification.emission");
+ checkNotificationEmission = EnvHelp.computeBooleanFromString( stringBoolean );
notificationAccessController =
EnvHelp.getNotificationAccessController(env);
}
--- a/jdk/src/share/classes/com/sun/jmx/remote/util/EnvHelp.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/share/classes/com/sun/jmx/remote/util/EnvHelp.java Wed Oct 31 08:29:44 2012 -0700
@@ -665,97 +665,57 @@
* Computes a boolean value from a string value retrieved from a
* property in the given map.
*
- * @param env the environment map.
- * @param prop the name of the property in the environment map whose
- * returned string value must be converted into a boolean value.
- * @param systemProperty if true, consult a system property of the
- * same name if there is no entry in the environment map.
+ * @param stringBoolean the string value that must be converted
+ * into a boolean value.
*
* @return
* <ul>
- * <li>{@code false} if {@code env.get(prop)} is {@code null}</li>
+ * <li>{@code false} if {@code stringBoolean} is {@code null}</li>
* <li>{@code false} if
- * {@code ((String)env.get(prop)).equalsIgnoreCase("false")}
+ * {@code stringBoolean.equalsIgnoreCase("false")}
* is {@code true}</li>
* <li>{@code true} if
- * {@code ((String)env.get(prop)).equalsIgnoreCase("true")}
+ * {@code stringBoolean.equalsIgnoreCase("true")}
* is {@code true}</li>
* </ul>
*
- * @throws IllegalArgumentException if {@code env} is {@code null} or
- * {@code env.get(prop)} is not {@code null} and
+ * @throws IllegalArgumentException if
* {@code ((String)env.get(prop)).equalsIgnoreCase("false")} and
* {@code ((String)env.get(prop)).equalsIgnoreCase("true")} are
* {@code false}.
- * @throws ClassCastException if {@code env.get(prop)} cannot be cast
- * to {@code String}.
*/
- public static boolean computeBooleanFromString(
- Map<String, ?> env, String prop, boolean systemProperty) {
-
- if (env == null)
- throw new IllegalArgumentException("env map cannot be null");
-
+ public static boolean computeBooleanFromString(String stringBoolean) {
// returns a default value of 'false' if no property is found...
- return computeBooleanFromString(env,prop,systemProperty,false);
+ return computeBooleanFromString(stringBoolean,false);
}
/**
* Computes a boolean value from a string value retrieved from a
* property in the given map.
*
- * @param env the environment map.
- * @param prop the name of the property in the environment map whose
- * returned string value must be converted into a boolean value.
- * @param systemProperty if true, consult a system property of the
- * same name if there is no entry in the environment map.
+ * @param stringBoolean the string value that must be converted
+ * into a boolean value.
* @param defaultValue a default value to return in case no property
* was defined.
*
* @return
* <ul>
- * <li>{@code defaultValue} if {@code env.get(prop)} is {@code null}
- * and {@code systemProperty} is {@code false}</li>
- * <li>{@code defaultValue} if {@code env.get(prop)} is {@code null}
- * and {@code systemProperty} is {@code true} and
- * {@code System.getProperty(prop)} is {@code null}</li>
- * <li>{@code false} if {@code env.get(prop)} is {@code null}
- * and {@code systemProperty} is {@code true} and
- * {@code System.getProperty(prop).equalsIgnoreCase("false")}
- * is {@code true}</li>
- * <li>{@code true} if {@code env.get(prop)} is {@code null}
- * and {@code systemProperty} is {@code true} and
- * {@code System.getProperty(prop).equalsIgnoreCase("true")}
- * is {@code true}</li>
+ * <li>{@code defaultValue} if {@code stringBoolean}
+ * is {@code null}</li>
* <li>{@code false} if
- * {@code ((String)env.get(prop)).equalsIgnoreCase("false")}
+ * {@code stringBoolean.equalsIgnoreCase("false")}
* is {@code true}</li>
* <li>{@code true} if
- * {@code ((String)env.get(prop)).equalsIgnoreCase("true")}
+ * {@code stringBoolean.equalsIgnoreCase("true")}
* is {@code true}</li>
* </ul>
*
- * @throws IllegalArgumentException if {@code env} is {@code null} or
- * {@code env.get(prop)} is not {@code null} and
+ * @throws IllegalArgumentException if
* {@code ((String)env.get(prop)).equalsIgnoreCase("false")} and
* {@code ((String)env.get(prop)).equalsIgnoreCase("true")} are
* {@code false}.
- * @throws ClassCastException if {@code env.get(prop)} cannot be cast
- * to {@code String}.
*/
- public static boolean computeBooleanFromString(
- Map<String, ?> env, String prop,
- boolean systemProperty, boolean defaultValue) {
-
- if (env == null)
- throw new IllegalArgumentException("env map cannot be null");
-
- String stringBoolean = (String) env.get(prop);
- if (stringBoolean == null && systemProperty) {
- stringBoolean =
- AccessController.doPrivileged(new GetPropertyAction(prop));
- }
-
+ public static boolean computeBooleanFromString( String stringBoolean, boolean defaultValue) {
if (stringBoolean == null)
return defaultValue;
else if (stringBoolean.equalsIgnoreCase("true"))
@@ -763,8 +723,8 @@
else if (stringBoolean.equalsIgnoreCase("false"))
return false;
else
- throw new IllegalArgumentException(prop +
- " must be \"true\" or \"false\" instead of \"" +
+ throw new IllegalArgumentException(
+ "Property value must be \"true\" or \"false\" instead of \"" +
stringBoolean + "\"");
}
--- a/jdk/src/share/classes/java/beans/XMLDecoder.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/share/classes/java/beans/XMLDecoder.java Wed Oct 31 08:29:44 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -29,6 +29,9 @@
import java.io.Closeable;
import java.io.InputStream;
import java.io.IOException;
+import java.security.AccessControlContext;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import org.xml.sax.InputSource;
import org.xml.sax.helpers.DefaultHandler;
@@ -61,6 +64,7 @@
* @author Philip Milne
*/
public class XMLDecoder implements AutoCloseable {
+ private final AccessControlContext acc = AccessController.getContext();
private final DocumentHandler handler = new DocumentHandler();
private final InputSource input;
private Object owner;
@@ -189,7 +193,15 @@
return false;
}
if (this.array == null) {
- this.handler.parse(this.input);
+ if ((this.acc == null) && (null != System.getSecurityManager())) {
+ throw new SecurityException("AccessControlContext is not set");
+ }
+ AccessController.doPrivileged(new PrivilegedAction<Void>() {
+ public Void run() {
+ XMLDecoder.this.handler.parse(XMLDecoder.this.input);
+ return null;
+ }
+ }, this.acc);
this.array = this.handler.getObjects();
}
return true;
--- a/jdk/src/share/classes/java/io/FilePermission.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/share/classes/java/io/FilePermission.java Wed Oct 31 08:29:44 2012 -0700
@@ -407,7 +407,7 @@
* @return a hash code value for this object.
*/
public int hashCode() {
- return this.cpath.hashCode();
+ return 0;
}
/**
--- a/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java Wed Oct 31 08:29:44 2012 -0700
@@ -79,7 +79,7 @@
default : throw new InternalError("unexpected xtype: " + xtype);
}
} catch (Throwable t) {
- throw new InternalError(t);
+ throw newInternalError(t);
}
}
@@ -97,7 +97,7 @@
case 'D': return cloneExtendD(type, form, (double) x);
}
} catch (Throwable t) {
- throw new InternalError(t);
+ throw newInternalError(t);
}
throw new InternalError("unexpected type: " + xtype);
}
@@ -115,7 +115,7 @@
try {
return clone(srcType, form);
} catch (Throwable t) {
- throw new InternalError(t);
+ throw newInternalError(t);
}
}
@@ -124,7 +124,7 @@
try {
return clone(newType, form.permuteArguments(1, reorder, basicTypes(newType.parameterList())));
} catch (Throwable t) {
- throw new InternalError(t);
+ throw newInternalError(t);
}
}
@@ -166,7 +166,7 @@
case 'J': return argJ(i);
}
} catch (Throwable ex) {
- throw new InternalError(ex);
+ throw newInternalError(ex);
}
throw new InternalError("unexpected type: " + speciesData().types+"."+i);
}
@@ -192,7 +192,7 @@
try {
return (MethodHandle) argL(0);
} catch (Throwable ex) {
- throw new InternalError(ex);
+ throw newInternalError(ex);
}
}
@@ -464,7 +464,7 @@
}
}
} catch (Throwable e) {
- throw new InternalError(e);
+ throw newInternalError(e);
}
for (SpeciesData d : CACHE.values()) {
@@ -748,7 +748,7 @@
try {
return LOOKUP.findGetter(cbmhClass, fieldName, fieldType);
} catch (NoSuchFieldException | IllegalAccessException e) {
- throw new InternalError(e);
+ throw newInternalError(e);
}
}
@@ -776,7 +776,7 @@
Field F_SPECIES_DATA = cbmh.getDeclaredField("SPECIES_DATA");
return (SpeciesData) F_SPECIES_DATA.get(null);
} catch (ReflectiveOperationException ex) {
- throw new InternalError(ex);
+ throw newInternalError(ex);
}
}
@@ -802,7 +802,7 @@
try {
return linkConstructor(LOOKUP.findConstructor(cbmh, MethodType.fromMethodDescriptorString(makeSignature(types, true), null)));
} catch (NoSuchMethodException | IllegalAccessException | IllegalArgumentException | TypeNotPresentException e) {
- throw new InternalError(e);
+ throw newInternalError(e);
}
}
@@ -833,7 +833,7 @@
linkerMN = MemberName.getFactory().resolveOrFail(REF_invokeStatic, linkerMN, null, NoSuchMethodException.class);
assert(linkerMN.isStatic());
} catch (ReflectiveOperationException ex) {
- throw new InternalError(ex);
+ throw newInternalError(ex);
}
// extend arguments array
Object[] newArgs = Arrays.copyOf(initName.arguments, initName.arguments.length + 1);
--- a/jdk/src/share/classes/java/lang/invoke/CallSite.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/share/classes/java/lang/invoke/CallSite.java Wed Oct 31 08:29:44 2012 -0700
@@ -222,7 +222,7 @@
GET_TARGET = IMPL_LOOKUP.
findVirtual(CallSite.class, "getTarget", MethodType.methodType(MethodHandle.class));
} catch (ReflectiveOperationException e) {
- throw new InternalError(e);
+ throw newInternalError(e);
}
}
--- a/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java Wed Oct 31 08:29:44 2012 -0700
@@ -218,7 +218,7 @@
try {
linker = IMPL_NAMES.resolveOrFail(REF_invokeStatic, linker, null, NoSuchMethodException.class);
} catch (ReflectiveOperationException ex) {
- throw new InternalError(ex);
+ throw newInternalError(ex);
}
final int DMH_THIS = 0;
final int ARG_BASE = 1;
@@ -554,7 +554,7 @@
try {
linker = IMPL_NAMES.resolveOrFail(REF_invokeVirtual, linker, null, NoSuchMethodException.class);
} catch (ReflectiveOperationException ex) {
- throw new InternalError(ex);
+ throw newInternalError(ex);
}
// What is the external type of the lambda form?
@@ -653,7 +653,7 @@
nf.resolve();
}
} catch (ReflectiveOperationException ex) {
- throw new InternalError(ex);
+ throw newInternalError(ex);
}
}
}
--- a/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java Wed Oct 31 08:29:44 2012 -0700
@@ -138,7 +138,7 @@
DUMP_CLASS_FILES_DIR = dumpDir;
System.out.println("Dumping class files to "+DUMP_CLASS_FILES_DIR+"/...");
} catch (Exception e) {
- throw new InternalError(e);
+ throw newInternalError(e);
}
} else {
DUMP_CLASS_FILES_COUNTERS = null;
@@ -162,7 +162,7 @@
file.close();
return null;
} catch (IOException ex) {
- throw new InternalError(ex);
+ throw newInternalError(ex);
}
}
});
@@ -279,7 +279,7 @@
try {
member = MEMBERNAME_FACTORY.resolveOrFail(REF_invokeStatic, member, HOST_CLASS, ReflectiveOperationException.class);
} catch (ReflectiveOperationException e) {
- throw new InternalError(e);
+ throw newInternalError(e);
}
//System.out.println("resolveInvokerMember => "+member);
return member;
--- a/jdk/src/share/classes/java/lang/invoke/Invokers.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/share/classes/java/lang/invoke/Invokers.java Wed Oct 31 08:29:44 2012 -0700
@@ -27,6 +27,7 @@
import java.util.Arrays;
import sun.invoke.empty.Empty;
+import static java.lang.invoke.MethodHandleStatics.*;
import static java.lang.invoke.MethodHandleNatives.Constants.*;
import static java.lang.invoke.MethodHandles.Lookup.IMPL_LOOKUP;
import static java.lang.invoke.LambdaForm.*;
@@ -128,9 +129,8 @@
try {
//Lookup.findVirtual(MethodHandle.class, name, type);
return IMPL_LOOKUP.resolveOrFail(REF_invokeVirtual, MethodHandle.class, name, type);
-
} catch (ReflectiveOperationException ex) {
- throw new InternalError("JVM cannot find invoker for "+type, ex);
+ throw newInternalError("JVM cannot find invoker for "+type, ex);
}
}
@@ -176,7 +176,7 @@
.findVirtual(MethodHandle.class, "asSpreader",
MethodType.methodType(MethodHandle.class, Class.class, int.class));
} catch (ReflectiveOperationException ex) {
- throw new InternalError(ex);
+ throw newInternalError(ex);
}
makeSpreader = MethodHandles.insertArguments(makeSpreader, 1, Object[].class, spreadArgCount);
vaInvoker = MethodHandles.filterArgument(arrayInvoker, 0, makeSpreader);
@@ -215,7 +215,7 @@
.findStatic(CallSite.class, "uninitializedCallSite",
MethodType.methodType(Empty.class));
} catch (ReflectiveOperationException ex) {
- throw new InternalError(ex);
+ throw newInternalError(ex);
}
}
invoker = MethodHandles.explicitCastArguments(invoker, MethodType.methodType(targetType.returnType()));
@@ -389,7 +389,7 @@
form.genericInvoker = gamh;
return gamh;
} catch (Exception ex) {
- throw new InternalError("Exception while resolving inexact invoke", ex);
+ throw newInternalError("Exception while resolving inexact invoke", ex);
}
}
@@ -456,7 +456,7 @@
NF_getCallSiteTarget.resolve();
// bound
} catch (ReflectiveOperationException ex) {
- throw new InternalError(ex);
+ throw newInternalError(ex);
}
}
--- a/jdk/src/share/classes/java/lang/invoke/LambdaForm.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/share/classes/java/lang/invoke/LambdaForm.java Wed Oct 31 08:29:44 2012 -0700
@@ -457,7 +457,7 @@
isCompiled = true;
return vmentry;
} catch (Error | Exception ex) {
- throw new InternalError(this.toString(), ex);
+ throw newInternalError(this.toString(), ex);
}
}
@@ -1547,7 +1547,7 @@
try {
zmem = IMPL_NAMES.resolveOrFail(REF_invokeStatic, zmem, null, NoSuchMethodException.class);
} catch (IllegalAccessException|NoSuchMethodException ex) {
- throw new InternalError(ex);
+ throw newInternalError(ex);
}
NamedFunction zcon = new NamedFunction(zmem);
Name n = new Name(zcon).newIndex(0);
--- a/jdk/src/share/classes/java/lang/invoke/MemberName.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/share/classes/java/lang/invoke/MemberName.java Wed Oct 31 08:29:44 2012 -0700
@@ -558,7 +558,7 @@
try {
return (MemberName) super.clone();
} catch (CloneNotSupportedException ex) {
- throw new InternalError(ex);
+ throw newInternalError(ex);
}
}
--- a/jdk/src/share/classes/java/lang/invoke/MethodHandle.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/share/classes/java/lang/invoke/MethodHandle.java Wed Oct 31 08:29:44 2012 -0700
@@ -1372,7 +1372,7 @@
NF_reinvokerTarget = new LambdaForm.NamedFunction(MethodHandle.class
.getDeclaredMethod("reinvokerTarget"));
} catch (ReflectiveOperationException ex) {
- throw new InternalError(ex);
+ throw newInternalError(ex);
}
}
@@ -1397,7 +1397,7 @@
try {
FORM_OFFSET = UNSAFE.objectFieldOffset(MethodHandle.class.getDeclaredField("form"));
} catch (ReflectiveOperationException ex) {
- throw new InternalError(ex);
+ throw newInternalError(ex);
}
}
}
--- a/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java Wed Oct 31 08:29:44 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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
@@ -25,13 +25,14 @@
package java.lang.invoke;
-import sun.invoke.util.VerifyType;
-
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import sun.invoke.empty.Empty;
import sun.invoke.util.ValueConversions;
+import sun.invoke.util.VerifyType;
import sun.invoke.util.Wrapper;
import static java.lang.invoke.LambdaForm.*;
import static java.lang.invoke.MethodHandleStatics.*;
@@ -478,7 +479,7 @@
.getDeclaredMethod("checkSpreadArgument", Object.class, int.class));
NF_checkSpreadArgument.resolve();
} catch (ReflectiveOperationException ex) {
- throw new InternalError(ex);
+ throw newInternalError(ex);
}
}
@@ -781,4 +782,168 @@
return mh;
}
+ /**
+ * Create an alias for the method handle which, when called,
+ * appears to be called from the same class loader and protection domain
+ * as hostClass.
+ * This is an expensive no-op unless the method which is called
+ * is sensitive to its caller. A small number of system methods
+ * are in this category, including Class.forName and Method.invoke.
+ */
+ static
+ MethodHandle bindCaller(MethodHandle mh, Class<?> hostClass) {
+ return BindCaller.bindCaller(mh, hostClass);
+ }
+
+ // Put the whole mess into its own nested class.
+ // That way we can lazily load the code and set up the constants.
+ private static class BindCaller {
+ static
+ MethodHandle bindCaller(MethodHandle mh, Class<?> hostClass) {
+ // Do not use this function to inject calls into system classes.
+ if (hostClass == null) {
+ hostClass = C_Trampoline;
+ } else if (hostClass.isArray() ||
+ hostClass.isPrimitive() ||
+ hostClass.getName().startsWith("java.") ||
+ hostClass.getName().startsWith("sun.")) {
+ throw new InternalError(); // does not happen, and should not anyway
+ }
+ // For simplicity, convert mh to a varargs-like method.
+ MethodHandle vamh = prepareForInvoker(mh);
+ // Cache the result of makeInjectedInvoker once per argument class.
+ MethodHandle bccInvoker = CV_makeInjectedInvoker.get(hostClass);
+ return restoreToType(bccInvoker.bindTo(vamh), mh.type());
+ }
+
+ // This class ("Trampoline") is known to be inside a dead-end class loader.
+ // Inject all doubtful calls into this class.
+ private static Class<?> C_Trampoline;
+ static {
+ Class<?> tramp = null;
+ try {
+ final int FRAME_COUNT_ARG = 1; // [0] Reflection [1] Trampoline
+ java.lang.reflect.Method gcc = sun.reflect.Reflection.class.getMethod("getCallerClass", int.class);
+ tramp = (Class<?>) sun.reflect.misc.MethodUtil.invoke(gcc, null, new Object[]{ FRAME_COUNT_ARG });
+ if (tramp.getClassLoader() == BindCaller.class.getClassLoader())
+ throw new RuntimeException(tramp.getName()+" class loader");
+ } catch (Throwable ex) {
+ throw new InternalError(ex);
+ }
+ C_Trampoline = tramp;
+ }
+
+ private static MethodHandle makeInjectedInvoker(Class<?> hostClass) {
+ Class<?> bcc = UNSAFE.defineAnonymousClass(hostClass, T_BYTES, null);
+ if (hostClass.getClassLoader() != bcc.getClassLoader())
+ throw new InternalError(hostClass.getName()+" (CL)");
+ try {
+ if (hostClass.getProtectionDomain() != bcc.getProtectionDomain())
+ throw new InternalError(hostClass.getName()+" (PD)");
+ } catch (SecurityException ex) {
+ // Self-check was blocked by security manager. This is OK.
+ // In fact the whole try body could be turned into an assertion.
+ }
+ try {
+ MethodHandle init = IMPL_LOOKUP.findStatic(bcc, "init", MethodType.methodType(void.class));
+ init.invokeExact(); // force initialization of the class
+ } catch (Throwable ex) {
+ throw uncaughtException(ex);
+ }
+ MethodHandle bccInvoker;
+ try {
+ MethodType invokerMT = MethodType.methodType(Object.class, MethodHandle.class, Object[].class);
+ bccInvoker = IMPL_LOOKUP.findStatic(bcc, "invoke_V", invokerMT);
+ } catch (ReflectiveOperationException ex) {
+ throw uncaughtException(ex);
+ }
+ // Test the invoker, to ensure that it really injects into the right place.
+ try {
+ MethodHandle vamh = prepareForInvoker(MH_checkCallerClass);
+ Object ok = bccInvoker.invokeExact(vamh, new Object[]{hostClass, bcc});
+ } catch (Throwable ex) {
+ throw new InternalError(ex);
+ }
+ return bccInvoker;
+ }
+ private static ClassValue<MethodHandle> CV_makeInjectedInvoker = new ClassValue<MethodHandle>() {
+ @Override protected MethodHandle computeValue(Class<?> hostClass) {
+ return makeInjectedInvoker(hostClass);
+ }
+ };
+
+ // Adapt mh so that it can be called directly from an injected invoker:
+ private static MethodHandle prepareForInvoker(MethodHandle mh) {
+ mh = mh.asFixedArity();
+ MethodType mt = mh.type();
+ int arity = mt.parameterCount();
+ MethodHandle vamh = mh.asType(mt.generic());
+ vamh.internalForm().compileToBytecode(); // eliminate LFI stack frames
+ vamh = vamh.asSpreader(Object[].class, arity);
+ vamh.internalForm().compileToBytecode(); // eliminate LFI stack frames
+ return vamh;
+ }
+
+ // Undo the adapter effect of prepareForInvoker:
+ private static MethodHandle restoreToType(MethodHandle vamh, MethodType type) {
+ return vamh.asCollector(Object[].class, type.parameterCount()).asType(type);
+ }
+
+ private static final MethodHandle MH_checkCallerClass;
+ static {
+ final Class<?> THIS_CLASS = BindCaller.class;
+ assert(checkCallerClass(THIS_CLASS, THIS_CLASS));
+ try {
+ MH_checkCallerClass = IMPL_LOOKUP
+ .findStatic(THIS_CLASS, "checkCallerClass",
+ MethodType.methodType(boolean.class, Class.class, Class.class));
+ assert((boolean) MH_checkCallerClass.invokeExact(THIS_CLASS, THIS_CLASS));
+ } catch (Throwable ex) {
+ throw new InternalError(ex);
+ }
+ }
+
+ private static boolean checkCallerClass(Class<?> expected, Class<?> expected2) {
+ final int FRAME_COUNT_ARG = 2; // [0] Reflection [1] BindCaller [2] Expected
+ Class<?> actual = sun.reflect.Reflection.getCallerClass(FRAME_COUNT_ARG);
+ if (actual != expected && actual != expected2)
+ throw new InternalError("found "+actual.getName()+", expected "+expected.getName()
+ +(expected == expected2 ? "" : ", or else "+expected2.getName()));
+ return true;
+ }
+
+ private static final byte[] T_BYTES;
+ static {
+ final Object[] values = {null};
+ AccessController.doPrivileged(new PrivilegedAction<Void>() {
+ public Void run() {
+ try {
+ Class<T> tClass = T.class;
+ String tName = tClass.getName();
+ String tResource = tName.substring(tName.lastIndexOf('.')+1)+".class";
+ java.net.URLConnection uconn = tClass.getResource(tResource).openConnection();
+ int len = uconn.getContentLength();
+ byte[] bytes = new byte[len];
+ try (java.io.InputStream str = uconn.getInputStream()) {
+ int nr = str.read(bytes);
+ if (nr != len) throw new java.io.IOException(tResource);
+ }
+ values[0] = bytes;
+ } catch (java.io.IOException ex) {
+ throw new InternalError(ex);
+ }
+ return null;
+ }
+ });
+ T_BYTES = (byte[]) values[0];
+ }
+
+ // The following class is used as a template for Unsafe.defineAnonymousClass:
+ private static class T {
+ static void init() { } // side effect: initializes this class
+ static Object invoke_V(MethodHandle vamh, Object[] args) throws Throwable {
+ return vamh.invokeExact(args);
+ }
+ }
+ }
}
--- a/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java Wed Oct 31 08:29:44 2012 -0700
@@ -385,4 +385,101 @@
throw err;
}
}
+
+ /**
+ * Is this method a caller-sensitive method?
+ * I.e., does it call Reflection.getCallerClass or a similer method
+ * to ask about the identity of its caller?
+ */
+ // FIXME: Replace this pattern match by an annotation @sun.reflect.CallerSensitive.
+ static boolean isCallerSensitive(MemberName mem) {
+ assert(mem.isInvocable());
+ Class<?> defc = mem.getDeclaringClass();
+ switch (mem.getName()) {
+ case "doPrivileged":
+ return defc == java.security.AccessController.class;
+ case "getUnsafe":
+ return defc == sun.misc.Unsafe.class;
+ case "lookup":
+ return defc == java.lang.invoke.MethodHandles.class;
+ case "invoke":
+ return defc == java.lang.reflect.Method.class;
+ case "get":
+ case "getBoolean":
+ case "getByte":
+ case "getChar":
+ case "getShort":
+ case "getInt":
+ case "getLong":
+ case "getFloat":
+ case "getDouble":
+ case "set":
+ case "setBoolean":
+ case "setByte":
+ case "setChar":
+ case "setShort":
+ case "setInt":
+ case "setLong":
+ case "setFloat":
+ case "setDouble":
+ return defc == java.lang.reflect.Field.class;
+ case "newInstance":
+ if (defc == java.lang.reflect.Constructor.class) return true;
+ if (defc == java.lang.Class.class) return true;
+ break;
+ case "forName":
+ case "getClassLoader":
+ case "getClasses":
+ case "getFields":
+ case "getMethods":
+ case "getConstructors":
+ case "getDeclaredClasses":
+ case "getDeclaredFields":
+ case "getDeclaredMethods":
+ case "getDeclaredConstructors":
+ case "getField":
+ case "getMethod":
+ case "getConstructor":
+ case "getDeclaredField":
+ case "getDeclaredMethod":
+ case "getDeclaredConstructor":
+ return defc == java.lang.Class.class;
+ case "getConnection":
+ case "getDriver":
+ case "getDrivers":
+ case "deregisterDriver":
+ return defc == java.sql.DriverManager.class;
+ case "newUpdater":
+ if (defc == java.util.concurrent.atomic.AtomicIntegerFieldUpdater.class) return true;
+ if (defc == java.util.concurrent.atomic.AtomicLongFieldUpdater.class) return true;
+ if (defc == java.util.concurrent.atomic.AtomicReferenceFieldUpdater.class) return true;
+ break;
+ case "getContextClassLoader":
+ return defc == java.lang.Thread.class;
+ case "getPackage":
+ case "getPackages":
+ return defc == java.lang.Package.class;
+ case "getParent":
+ case "getSystemClassLoader":
+ return defc == java.lang.ClassLoader.class;
+ case "load":
+ case "loadLibrary":
+ if (defc == java.lang.Runtime.class) return true;
+ if (defc == java.lang.System.class) return true;
+ break;
+ case "getCallerClass":
+ if (defc == sun.reflect.Reflection.class) return true;
+ if (defc == java.lang.System.class) return true;
+ break;
+ case "getCallerClassLoader":
+ return defc == java.lang.ClassLoader.class;
+ case "getProxyClass":
+ case "newProxyInstance":
+ return defc == java.lang.reflect.Proxy.class;
+ case "getBundle":
+ case "clearCache":
+ return defc == java.util.ResourceBundle.class;
+ }
+ return false;
+ }
}
--- a/jdk/src/share/classes/java/lang/invoke/MethodHandleStatics.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/share/classes/java/lang/invoke/MethodHandleStatics.java Wed Oct 31 08:29:44 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -93,6 +93,12 @@
}
// handy shared exception makers (they simplify the common case code)
+ /*non-public*/ static InternalError newInternalError(String message, Throwable cause) {
+ return new InternalError(message, cause);
+ }
+ /*non-public*/ static InternalError newInternalError(Throwable cause) {
+ return new InternalError(cause);
+ }
/*non-public*/ static RuntimeException newIllegalStateException(String message) {
return new IllegalStateException(message);
}
@@ -108,8 +114,8 @@
/*non-public*/ static RuntimeException newIllegalArgumentException(String message, Object obj, Object obj2) {
return new IllegalArgumentException(message(message, obj, obj2));
}
- /*non-public*/ static Error uncaughtException(Exception ex) {
- throw new InternalError("uncaught exception", ex);
+ /*non-public*/ static Error uncaughtException(Throwable ex) {
+ throw newInternalError("uncaught exception", ex);
}
static Error NYI() {
throw new AssertionError("NYI");
--- a/jdk/src/share/classes/java/lang/invoke/MethodHandles.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/share/classes/java/lang/invoke/MethodHandles.java Wed Oct 31 08:29:44 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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
@@ -329,6 +329,7 @@
* where {@code defcPkg} is the package of {@code defc}.
* </ul>
*/
+ // FIXME in MR1: clarify that the bytecode behavior of a caller-ID method (like Class.forName) is relative to the lookupClass used to create the method handle, not the dynamic caller of the method handle
public static final
class Lookup {
/** The class on behalf of whom the lookup is being performed. */
@@ -1209,6 +1210,7 @@
if (method.isMethodHandleInvoke())
return fakeMethodHandleInvoke(method);
MethodHandle mh = DirectMethodHandle.make(refc, method);
+ mh = maybeBindCaller(method, mh);
mh = mh.setVarargs(method);
if (doRestrict)
mh = restrictReceiver(method, mh, lookupClass());
@@ -1217,6 +1219,16 @@
private MethodHandle fakeMethodHandleInvoke(MemberName method) {
return throwException(method.getReturnType(), UnsupportedOperationException.class);
}
+ private MethodHandle maybeBindCaller(MemberName method, MethodHandle mh) throws IllegalAccessException {
+ if (allowedModes == TRUSTED || !MethodHandleNatives.isCallerSensitive(method))
+ return mh;
+ Class<?> hostClass = lookupClass;
+ if ((allowedModes & PRIVATE) == 0) // caller must use full-power lookup
+ hostClass = null;
+ MethodHandle cbmh = MethodHandleImpl.bindCaller(mh, hostClass);
+ // Note: caller will apply varargs after this step happens.
+ return cbmh;
+ }
private MethodHandle getDirectField(byte refKind, Class<?> refc, MemberName field) throws IllegalAccessException {
checkField(refKind, refc, field);
MethodHandle mh = DirectMethodHandle.make(refc, field);
@@ -1229,6 +1241,7 @@
private MethodHandle getDirectConstructor(Class<?> refc, MemberName ctor) throws IllegalAccessException {
assert(ctor.isConstructor());
checkAccess(REF_newInvokeSpecial, refc, ctor);
+ assert(!MethodHandleNatives.isCallerSensitive(ctor)); // maybeBindCaller not relevant here
return DirectMethodHandle.make(ctor).setVarargs(ctor);
}
--- a/jdk/src/share/classes/java/security/AccessController.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/share/classes/java/security/AccessController.java Wed Oct 31 08:29:44 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -290,11 +290,11 @@
*/
public static <T> T doPrivilegedWithCombiner(PrivilegedAction<T> action) {
- DomainCombiner dc = null;
AccessControlContext acc = getStackAccessControlContext();
- if (acc == null || (dc = acc.getAssignedCombiner()) == null) {
+ if (acc == null) {
return AccessController.doPrivileged(action);
}
+ DomainCombiner dc = acc.getAssignedCombiner();
return AccessController.doPrivileged(action, preserveCombiner(dc));
}
@@ -386,11 +386,11 @@
public static <T> T doPrivilegedWithCombiner
(PrivilegedExceptionAction<T> action) throws PrivilegedActionException {
- DomainCombiner dc = null;
AccessControlContext acc = getStackAccessControlContext();
- if (acc == null || (dc = acc.getAssignedCombiner()) == null) {
+ if (acc == null) {
return AccessController.doPrivileged(action);
}
+ DomainCombiner dc = acc.getAssignedCombiner();
return AccessController.doPrivileged(action, preserveCombiner(dc));
}
@@ -417,7 +417,12 @@
// perform 'combine' on the caller of doPrivileged,
// even if the caller is from the bootclasspath
ProtectionDomain[] pds = new ProtectionDomain[] {callerPd};
- return new AccessControlContext(combiner.combine(pds, null), combiner);
+ if (combiner == null) {
+ return new AccessControlContext(pds);
+ } else {
+ return new AccessControlContext(combiner.combine(pds, null),
+ combiner);
+ }
}
--- a/jdk/src/share/classes/java/util/ServiceLoader.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/share/classes/java/util/ServiceLoader.java Wed Oct 31 08:29:44 2012 -0700
@@ -358,14 +358,21 @@
}
String cn = nextName;
nextName = null;
+ Class<?> c = null;
try {
- S p = service.cast(Class.forName(cn, true, loader)
- .newInstance());
- providers.put(cn, p);
- return p;
+ c = Class.forName(cn, false, loader);
} catch (ClassNotFoundException x) {
fail(service,
"Provider " + cn + " not found");
+ }
+ if (!service.isAssignableFrom(c)) {
+ fail(service,
+ "Provider " + cn + " not a subtype");
+ }
+ try {
+ S p = service.cast(c.newInstance());
+ providers.put(cn, p);
+ return p;
} catch (Throwable x) {
fail(service,
"Provider " + cn + " could not be instantiated: " + x,
--- a/jdk/src/share/classes/java/util/concurrent/Executors.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/share/classes/java/util/concurrent/Executors.java Wed Oct 31 08:29:44 2012 -0700
@@ -530,18 +530,17 @@
return AccessController.doPrivileged(
new PrivilegedExceptionAction<T>() {
public T run() throws Exception {
- ClassLoader savedcl = null;
Thread t = Thread.currentThread();
- try {
- ClassLoader cl = t.getContextClassLoader();
- if (ccl != cl) {
- t.setContextClassLoader(ccl);
- savedcl = cl;
+ ClassLoader cl = t.getContextClassLoader();
+ if (ccl == cl) {
+ return task.call();
+ } else {
+ t.setContextClassLoader(ccl);
+ try {
+ return task.call();
+ } finally {
+ t.setContextClassLoader(cl);
}
- return task.call();
- } finally {
- if (savedcl != null)
- t.setContextClassLoader(savedcl);
}
}
}, acc);
--- a/jdk/src/share/classes/java/util/logging/FileHandler.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/share/classes/java/util/logging/FileHandler.java Wed Oct 31 08:29:44 2012 -0700
@@ -233,7 +233,7 @@
* @exception NullPointerException if pattern property is an empty String.
*/
public FileHandler() throws IOException, SecurityException {
- checkAccess();
+ checkPermission();
configure();
openFiles();
}
@@ -259,7 +259,7 @@
if (pattern.length() < 1 ) {
throw new IllegalArgumentException();
}
- checkAccess();
+ checkPermission();
configure();
this.pattern = pattern;
this.limit = 0;
@@ -291,7 +291,7 @@
if (pattern.length() < 1 ) {
throw new IllegalArgumentException();
}
- checkAccess();
+ checkPermission();
configure();
this.pattern = pattern;
this.limit = 0;
@@ -328,7 +328,7 @@
if (limit < 0 || count < 1 || pattern.length() < 1) {
throw new IllegalArgumentException();
}
- checkAccess();
+ checkPermission();
configure();
this.pattern = pattern;
this.limit = limit;
@@ -367,7 +367,7 @@
if (limit < 0 || count < 1 || pattern.length() < 1) {
throw new IllegalArgumentException();
}
- checkAccess();
+ checkPermission();
configure();
this.pattern = pattern;
this.limit = limit;
@@ -380,7 +380,7 @@
// configured instance variables.
private void openFiles() throws IOException {
LogManager manager = LogManager.getLogManager();
- manager.checkAccess();
+ manager.checkPermission();
if (count < 1) {
throw new IllegalArgumentException("file count = " + count);
}
--- a/jdk/src/share/classes/java/util/logging/Handler.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/share/classes/java/util/logging/Handler.java Wed Oct 31 08:29:44 2012 -0700
@@ -111,7 +111,7 @@
* the caller does not have <tt>LoggingPermission("control")</tt>.
*/
public void setFormatter(Formatter newFormatter) throws SecurityException {
- checkAccess();
+ checkPermission();
// Check for a null pointer:
newFormatter.getClass();
formatter = newFormatter;
@@ -140,7 +140,7 @@
*/
public void setEncoding(String encoding)
throws SecurityException, java.io.UnsupportedEncodingException {
- checkAccess();
+ checkPermission();
if (encoding != null) {
try {
if(!java.nio.charset.Charset.isSupported(encoding)) {
@@ -175,7 +175,7 @@
* the caller does not have <tt>LoggingPermission("control")</tt>.
*/
public void setFilter(Filter newFilter) throws SecurityException {
- checkAccess();
+ checkPermission();
filter = newFilter;
}
@@ -199,7 +199,7 @@
* the caller does not have <tt>LoggingPermission("control")</tt>.
*/
public void setErrorManager(ErrorManager em) {
- checkAccess();
+ checkPermission();
if (em == null) {
throw new NullPointerException();
}
@@ -213,7 +213,7 @@
* the caller does not have <tt>LoggingPermission("control")</tt>.
*/
public ErrorManager getErrorManager() {
- checkAccess();
+ checkPermission();
return errorManager;
}
@@ -253,7 +253,7 @@
if (newLevel == null) {
throw new NullPointerException();
}
- checkAccess();
+ checkPermission();
logLevel = newLevel;
}
@@ -296,9 +296,9 @@
// If "sealed" is true, we check that the caller has
// appropriate security privileges to update Handler
// state and if not throw a SecurityException.
- void checkAccess() throws SecurityException {
+ void checkPermission() throws SecurityException {
if (sealed) {
- manager.checkAccess();
+ manager.checkPermission();
}
}
}
--- a/jdk/src/share/classes/java/util/logging/LogManager.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/share/classes/java/util/logging/LogManager.java Wed Oct 31 08:29:44 2012 -0700
@@ -321,7 +321,7 @@
@Deprecated
public void addPropertyChangeListener(PropertyChangeListener l) throws SecurityException {
PropertyChangeListener listener = Objects.requireNonNull(l);
- checkAccess();
+ checkPermission();
synchronized (listenerMap) {
// increment the registration count if already registered
Integer value = listenerMap.get(listener);
@@ -352,7 +352,7 @@
*/
@Deprecated
public void removePropertyChangeListener(PropertyChangeListener l) throws SecurityException {
- checkAccess();
+ checkPermission();
if (l != null) {
PropertyChangeListener listener = l;
synchronized (listenerMap) {
@@ -807,7 +807,7 @@
* @exception IOException if there are IO problems reading the configuration.
*/
public void readConfiguration() throws IOException, SecurityException {
- checkAccess();
+ checkPermission();
// if a configuration class is specified, load it and use it.
String cname = System.getProperty("java.util.logging.config.class");
@@ -865,7 +865,7 @@
*/
public void reset() throws SecurityException {
- checkAccess();
+ checkPermission();
synchronized (this) {
props = new Properties();
// Since we are doing a reset we no longer want to initialize
@@ -950,7 +950,7 @@
* @exception IOException if there are problems reading from the stream.
*/
public void readConfiguration(InputStream ins) throws IOException, SecurityException {
- checkAccess();
+ checkPermission();
reset();
// Load the properties
@@ -1127,8 +1127,13 @@
loadLoggerHandlers(rootLogger, null, "handlers");
}
+ private final Permission controlPermission = new LoggingPermission("control", null);
- private Permission ourPermission = new LoggingPermission("control", null);
+ void checkPermission() {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null)
+ sm.checkPermission(controlPermission);
+ }
/**
* Check that the current context is trusted to modify the logging
@@ -1141,11 +1146,7 @@
* the caller does not have LoggingPermission("control").
*/
public void checkAccess() throws SecurityException {
- SecurityManager sm = System.getSecurityManager();
- if (sm == null) {
- return;
- }
- sm.checkPermission(ourPermission);
+ checkPermission();
}
// Nested class to represent a node in our tree of named loggers.
--- a/jdk/src/share/classes/java/util/logging/Logger.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/share/classes/java/util/logging/Logger.java Wed Oct 31 08:29:44 2012 -0700
@@ -276,13 +276,13 @@
this.manager = manager;
}
- private void checkAccess() throws SecurityException {
+ private void checkPermission() throws SecurityException {
if (!anonymous) {
if (manager == null) {
// Complete initialization of the global Logger.
manager = LogManager.getLogManager();
}
- manager.checkAccess();
+ manager.checkPermission();
}
}
@@ -482,7 +482,7 @@
* the caller does not have LoggingPermission("control").
*/
public void setFilter(Filter newFilter) throws SecurityException {
- checkAccess();
+ checkPermission();
filter = newFilter;
}
@@ -1168,7 +1168,7 @@
* the caller does not have LoggingPermission("control").
*/
public void setLevel(Level newLevel) throws SecurityException {
- checkAccess();
+ checkPermission();
synchronized (treeLock) {
levelObject = newLevel;
updateEffectiveLevel();
@@ -1223,7 +1223,7 @@
public void addHandler(Handler handler) throws SecurityException {
// Check for null handler
handler.getClass();
- checkAccess();
+ checkPermission();
handlers.add(handler);
}
@@ -1237,7 +1237,7 @@
* the caller does not have LoggingPermission("control").
*/
public void removeHandler(Handler handler) throws SecurityException {
- checkAccess();
+ checkPermission();
if (handler == null) {
return;
}
@@ -1265,7 +1265,7 @@
* the caller does not have LoggingPermission("control").
*/
public void setUseParentHandlers(boolean useParentHandlers) {
- checkAccess();
+ checkPermission();
this.useParentHandlers = useParentHandlers;
}
@@ -1420,7 +1420,7 @@
if (parent == null) {
throw new NullPointerException();
}
- manager.checkAccess();
+ manager.checkPermission();
doSetParent(parent);
}
--- a/jdk/src/share/classes/java/util/logging/MemoryHandler.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/share/classes/java/util/logging/MemoryHandler.java Wed Oct 31 08:29:44 2012 -0700
@@ -257,7 +257,7 @@
throw new NullPointerException();
}
LogManager manager = LogManager.getLogManager();
- checkAccess();
+ checkPermission();
pushLevel = newLevel;
}
--- a/jdk/src/share/classes/java/util/logging/StreamHandler.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/share/classes/java/util/logging/StreamHandler.java Wed Oct 31 08:29:44 2012 -0700
@@ -263,7 +263,7 @@
}
private synchronized void flushAndClose() throws SecurityException {
- checkAccess();
+ checkPermission();
if (writer != null) {
try {
if (!doneHeader) {
--- a/jdk/src/share/classes/javax/management/modelmbean/DescriptorSupport.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/share/classes/javax/management/modelmbean/DescriptorSupport.java Wed Oct 31 08:29:44 2012 -0700
@@ -1245,13 +1245,12 @@
return s.substring(1, s.length() - 1);
}
final String className = s.substring(1, slash);
+
final Constructor<?> constr;
try {
+ ReflectUtil.checkPackageAccess(className);
final ClassLoader contextClassLoader =
Thread.currentThread().getContextClassLoader();
- if (contextClassLoader == null) {
- ReflectUtil.checkPackageAccess(className);
- }
final Class<?> c =
Class.forName(className, false, contextClassLoader);
constr = c.getConstructor(new Class<?>[] {String.class});
--- a/jdk/src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java Wed Oct 31 08:29:44 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,30 @@
package javax.management.remote.rmi;
+import java.io.IOException;
+import java.rmi.MarshalledObject;
+import java.rmi.UnmarshalException;
+import java.rmi.server.Unreferenced;
+import java.security.AccessControlContext;
+import java.security.AccessController;
+import java.security.Permission;
+import java.security.PermissionCollection;
+import java.security.Permissions;
+import java.security.PrivilegedAction;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.security.ProtectionDomain;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+
+import javax.management.*;
+import javax.management.remote.JMXServerErrorException;
+import javax.management.remote.NotificationResult;
+import javax.management.remote.TargetedNotification;
+import javax.security.auth.Subject;
+
import static com.sun.jmx.mbeanserver.Util.cast;
import com.sun.jmx.remote.internal.ServerCommunicatorAdmin;
import com.sun.jmx.remote.internal.ServerNotifForwarder;
@@ -35,44 +59,6 @@
import com.sun.jmx.remote.util.EnvHelp;
import com.sun.jmx.remote.util.OrderClassLoaders;
-import java.io.IOException;
-import java.rmi.MarshalledObject;
-import java.rmi.UnmarshalException;
-import java.rmi.server.Unreferenced;
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Map;
-import java.util.Set;
-
-import javax.management.Attribute;
-import javax.management.AttributeList;
-import javax.management.AttributeNotFoundException;
-import javax.management.InstanceAlreadyExistsException;
-import javax.management.InstanceNotFoundException;
-import javax.management.IntrospectionException;
-import javax.management.InvalidAttributeValueException;
-import javax.management.ListenerNotFoundException;
-import javax.management.MBeanException;
-import javax.management.MBeanInfo;
-import javax.management.MBeanRegistrationException;
-import javax.management.MBeanServer;
-import javax.management.NotCompliantMBeanException;
-import javax.management.NotificationFilter;
-import javax.management.ObjectInstance;
-import javax.management.ObjectName;
-import javax.management.QueryExp;
-import javax.management.ReflectionException;
-import javax.management.RuntimeOperationsException;
-import javax.management.remote.JMXServerErrorException;
-import javax.management.remote.NotificationResult;
-import javax.management.remote.TargetedNotification;
-import javax.security.auth.Subject;
-
/**
* <p>Implementation of the {@link RMIConnection} interface. User
* code will not usually reference this class.</p>
@@ -143,6 +129,7 @@
this.mbeanServer = rmiServer.getMBeanServer();
final ClassLoader dcl = defaultClassLoader;
+
this.classLoaderWithRepository =
AccessController.doPrivileged(
new PrivilegedAction<ClassLoaderWithRepository>() {
@@ -151,13 +138,40 @@
mbeanServer.getClassLoaderRepository(),
dcl);
}
+ },
+
+ withPermissions( new MBeanPermission("*", "getClassLoaderRepository"),
+ new RuntimePermission("createClassLoader"))
+ );
+
+
+ this.defaultContextClassLoader =
+ AccessController.doPrivileged(
+ new PrivilegedAction<ClassLoader>() {
+ @Override
+ public ClassLoader run() {
+ return new CombinedClassLoader(Thread.currentThread().getContextClassLoader(),
+ dcl);
+ }
});
+
serverCommunicatorAdmin = new
RMIServerCommunicatorAdmin(EnvHelp.getServerConnectionTimeout(env));
this.env = env;
}
+ private static AccessControlContext withPermissions(Permission ... perms){
+ Permissions col = new Permissions();
+
+ for (Permission thePerm : perms ) {
+ col.add(thePerm);
+ }
+
+ final ProtectionDomain pd = new ProtectionDomain(null, col);
+ return new AccessControlContext( new ProtectionDomain[] { pd });
+ }
+
private synchronized ServerNotifForwarder getServerNotifFwd() {
// Lazily created when first use. Mainly when
// addNotificationListener is first called.
@@ -507,7 +521,7 @@
"connectionId=" + connectionId
+" unwrapping query with defaultClassLoader.");
- queryValue = unwrap(query, defaultClassLoader, QueryExp.class);
+ queryValue = unwrap(query, defaultContextClassLoader, QueryExp.class);
try {
final Object params[] = new Object[] { name, queryValue };
@@ -542,7 +556,7 @@
"connectionId=" + connectionId
+" unwrapping query with defaultClassLoader.");
- queryValue = unwrap(query, defaultClassLoader, QueryExp.class);
+ queryValue = unwrap(query, defaultContextClassLoader, QueryExp.class);
try {
final Object params[] = new Object[] { name, queryValue };
@@ -1330,7 +1344,9 @@
public ClassLoader run() throws InstanceNotFoundException {
return mbeanServer.getClassLoader(name);
}
- });
+ },
+ withPermissions(new MBeanPermission("*", "getClassLoader"))
+ );
} catch (PrivilegedActionException pe) {
throw (InstanceNotFoundException) extractException(pe);
}
@@ -1345,7 +1361,9 @@
public Object run() throws InstanceNotFoundException {
return mbeanServer.getClassLoaderFor(name);
}
- });
+ },
+ withPermissions(new MBeanPermission("*", "getClassLoaderFor"))
+ );
} catch (PrivilegedActionException pe) {
throw (InstanceNotFoundException) extractException(pe);
}
@@ -1572,7 +1590,8 @@
ClassLoader orderCL = AccessController.doPrivileged(
new PrivilegedExceptionAction<ClassLoader>() {
public ClassLoader run() throws Exception {
- return new OrderClassLoaders(cl1, cl2);
+ return new CombinedClassLoader(Thread.currentThread().getContextClassLoader(),
+ new OrderClassLoaders(cl1, cl2));
}
}
);
@@ -1664,6 +1683,8 @@
private final ClassLoader defaultClassLoader;
+ private final ClassLoader defaultContextClassLoader;
+
private final ClassLoaderWithRepository classLoaderWithRepository;
private boolean terminated = false;
@@ -1746,4 +1767,43 @@
private static final ClassLogger logger =
new ClassLogger("javax.management.remote.rmi", "RMIConnectionImpl");
+
+ private static final class CombinedClassLoader extends ClassLoader {
+
+ private final static class ClassLoaderWrapper extends ClassLoader {
+ ClassLoaderWrapper(ClassLoader cl) {
+ super(cl);
+ }
+
+ @Override
+ protected Class<?> loadClass(String name, boolean resolve)
+ throws ClassNotFoundException {
+ return super.loadClass(name, resolve);
+ }
+ };
+
+ final ClassLoaderWrapper defaultCL;
+
+ private CombinedClassLoader(ClassLoader parent, ClassLoader defaultCL) {
+ super(parent);
+ this.defaultCL = new ClassLoaderWrapper(defaultCL);
+ }
+
+ @Override
+ protected Class<?> loadClass(String name, boolean resolve)
+ throws ClassNotFoundException {
+ try {
+ super.loadClass(name, resolve);
+ } catch(Exception e) {
+ for(Throwable t = e; t != null; t = t.getCause()) {
+ if(t instanceof SecurityException) {
+ throw t==e?(SecurityException)t:new SecurityException(t.getMessage(), e);
+ }
+ }
+ }
+ final Class<?> cl = defaultCL.loadClass(name, resolve);
+ return cl;
+ }
+
+ }
}
--- a/jdk/src/share/classes/javax/management/remote/rmi/RMIConnector.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/share/classes/javax/management/remote/rmi/RMIConnector.java Wed Oct 31 08:29:44 2012 -0700
@@ -277,9 +277,9 @@
// Check for secure RMIServer stub if the corresponding
// client-side environment property is set to "true".
//
- boolean checkStub = EnvHelp.computeBooleanFromString(
- usemap,
- "jmx.remote.x.check.stub",false);
+ String stringBoolean = (String) usemap.get("jmx.remote.x.check.stub");
+ boolean checkStub = EnvHelp.computeBooleanFromString(stringBoolean);
+
if (checkStub) checkStub(stub, rmiServerImplStubClass);
// Connect IIOP Stub if needed.
--- a/jdk/src/share/classes/javax/management/remote/rmi/RMIConnectorServer.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/share/classes/javax/management/remote/rmi/RMIConnectorServer.java Wed Oct 31 08:29:44 2012 -0700
@@ -412,9 +412,8 @@
if (tracing)
logger.trace("start", "Using external directory: " + jndiUrl);
- final boolean rebind = EnvHelp.computeBooleanFromString(
- attributes,
- JNDI_REBIND_ATTRIBUTE,false);
+ String stringBoolean = (String) attributes.get(JNDI_REBIND_ATTRIBUTE);
+ final boolean rebind = EnvHelp.computeBooleanFromString( stringBoolean );
if (tracing)
logger.trace("start", JNDI_REBIND_ATTRIBUTE + "=" + rebind);
--- a/jdk/src/share/classes/javax/swing/text/DefaultFormatter.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/share/classes/javax/swing/text/DefaultFormatter.java Wed Oct 31 08:29:44 2012 -0700
@@ -24,6 +24,8 @@
*/
package javax.swing.text;
+import sun.reflect.misc.ConstructorUtil;
+
import java.io.Serializable;
import java.lang.reflect.*;
import java.text.ParseException;
@@ -245,7 +247,7 @@
Constructor cons;
try {
- cons = vc.getConstructor(new Class[] { String.class });
+ cons = ConstructorUtil.getConstructor(vc, new Class[]{String.class});
} catch (NoSuchMethodException nsme) {
cons = null;
--- a/jdk/src/share/classes/sun/invoke/anon/AnonymousClassLoader.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/share/classes/sun/invoke/anon/AnonymousClassLoader.java Wed Oct 31 08:29:44 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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
@@ -73,74 +73,14 @@
public class AnonymousClassLoader {
final Class<?> hostClass;
- // Note: Do not refactor the calls to checkHostClass unless you
- // also adjust this constant:
- private static int CHC_CALLERS = 3;
-
- public AnonymousClassLoader() {
- this.hostClass = checkHostClass(null);
- }
- public AnonymousClassLoader(Class<?> hostClass) {
- this.hostClass = checkHostClass(hostClass);
- }
-
- private static Class<?> getTopLevelClass(Class<?> clazz) {
- for(Class<?> outer = clazz.getDeclaringClass(); outer != null;
- outer = outer.getDeclaringClass()) {
- clazz = outer;
- }
- return clazz;
+ // Privileged constructor.
+ private AnonymousClassLoader(Class<?> hostClass) {
+ this.hostClass = hostClass;
}
- private static Class<?> checkHostClass(Class<?> hostClass) {
- // called only from the constructor
- // does a context-sensitive check on caller class
- // CC[0..3] = {Reflection, this.checkHostClass, this.<init>, caller}
- Class<?> caller = sun.reflect.Reflection.getCallerClass(CHC_CALLERS);
-
- if (caller == null) {
- // called from the JVM directly
- if (hostClass == null)
- return AnonymousClassLoader.class; // anything central will do
- return hostClass;
- }
-
- if (hostClass == null)
- hostClass = caller; // default value is caller itself
-
- // anonymous class will access hostClass on behalf of caller
- Class<?> callee = hostClass;
-
- if (caller == callee)
- // caller can always nominate itself to grant caller's own access rights
- return hostClass;
-
- // normalize caller and callee to their top-level classes:
- caller = getTopLevelClass(caller);
- callee = getTopLevelClass(callee);
- if (caller == callee)
- return caller;
-
- ClassLoader callerCL = caller.getClassLoader();
- if (callerCL == null) {
- // caller is trusted code, so accept the proposed hostClass
- return hostClass;
- }
-
- // %%% should do something with doPrivileged, because trusted
- // code should have a way to execute on behalf of
- // partially-trusted clients
-
- // Does the caller have the right to access the private
- // members of the callee? If not, raise an error.
- final int ACC_PRIVATE = 2;
- try {
- sun.reflect.Reflection.ensureMemberAccess(caller, callee, null, ACC_PRIVATE);
- } catch (IllegalAccessException ee) {
- throw new IllegalArgumentException(ee);
- }
-
- return hostClass;
+ public static AnonymousClassLoader make(sun.misc.Unsafe unsafe, Class<?> hostClass) {
+ if (unsafe == null) throw new NullPointerException();
+ return new AnonymousClassLoader(hostClass);
}
public Class<?> loadClass(byte[] classFile) {
@@ -249,7 +189,7 @@
private static int fakeNameCounter = 99999;
// ignore two warnings on this line:
- static sun.misc.Unsafe unsafe = sun.misc.Unsafe.getUnsafe();
+ private static sun.misc.Unsafe unsafe = sun.misc.Unsafe.getUnsafe();
// preceding line requires that this class be on the boot class path
static private final Method defineAnonymousClass;
--- a/jdk/src/share/classes/sun/invoke/util/ValueConversions.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/share/classes/sun/invoke/util/ValueConversions.java Wed Oct 31 08:29:44 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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
@@ -475,7 +475,7 @@
.findStatic(THIS_CLASS, "fillNewTypedArray",
MethodType.methodType(Object[].class, Object[].class, Integer.class, Object[].class));
} catch (NoSuchMethodException | IllegalAccessException ex) {
- throw new InternalError("uncaught exception", ex);
+ throw newInternalError("uncaught exception", ex);
}
}
@@ -489,7 +489,7 @@
COPY_AS_PRIMITIVE_ARRAY = IMPL_LOOKUP.findStatic(THIS_CLASS, "copyAsPrimitiveArray", MethodType.methodType(Object.class, Wrapper.class, Object[].class));
MAKE_LIST = IMPL_LOOKUP.findStatic(THIS_CLASS, "makeList", MethodType.methodType(List.class, Object[].class));
} catch (ReflectiveOperationException ex) {
- throw new InternalError("uncaught exception", ex);
+ throw newInternalError("uncaught exception", ex);
}
}
}
@@ -522,14 +522,19 @@
static {
MethodHandle mh = null;
try {
- java.lang.reflect.Method m = MethodHandles.class
+ final java.lang.reflect.Method m = MethodHandles.class
.getDeclaredMethod("collectArguments",
MethodHandle.class, int.class, MethodHandle.class);
- m.setAccessible(true);
+ AccessController.doPrivileged(new PrivilegedAction<Void>() {
+ @Override
+ public Void run() {
+ m.setAccessible(true);
+ return null;
+ }
+ });
mh = IMPL_LOOKUP.unreflect(m);
-
- } catch (ReflectiveOperationException | SecurityException ex) {
- throw new InternalError(ex);
+ } catch (ReflectiveOperationException ex) {
+ throw newInternalError(ex);
}
COLLECT_ARGUMENTS = mh;
}
@@ -1209,4 +1214,12 @@
private static MethodHandle buildVarargsList(int nargs) {
return MethodHandles.filterReturnValue(varargsArray(nargs), LazyStatics.MAKE_LIST);
}
+
+ // handy shared exception makers (they simplify the common case code)
+ private static InternalError newInternalError(String message, Throwable cause) {
+ return new InternalError(message, cause);
+ }
+ private static InternalError newInternalError(Throwable cause) {
+ return new InternalError(cause);
+ }
}
--- a/jdk/src/share/classes/sun/misc/Service.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/share/classes/sun/misc/Service.java Wed Oct 31 08:29:44 2012 -0700
@@ -284,12 +284,20 @@
}
String cn = nextName;
nextName = null;
+ Class<?> c = null;
try {
- return service.cast(Class.forName(cn, true, loader).newInstance());
+ c = Class.forName(cn, false, loader);
} catch (ClassNotFoundException x) {
fail(service,
"Provider " + cn + " not found");
- } catch (Exception x) {
+ }
+ if (!service.isAssignableFrom(c)) {
+ fail(service,
+ "Provider " + cn + " not a subtype");
+ }
+ try {
+ return service.cast(c.newInstance());
+ } catch (Throwable x) {
fail(service,
"Provider " + cn + " could not be instantiated: " + x,
x);
--- a/jdk/src/share/classes/sun/net/www/protocol/gopher/GopherClient.java Mon Oct 29 16:51:59 2012 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,357 +0,0 @@
-/*
- * Copyright (c) 1996, 2004, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.net.www.protocol.gopher;
-
-import java.io.*;
-import java.util.*;
-import java.net.*;
-import sun.net.www.*;
-import sun.net.NetworkClient;
-import java.net.URL;
-import java.net.URLStreamHandler;
-
-import sun.security.action.GetBooleanAction;
-
-/** Class to maintain the state of a gopher fetch and handle the protocol */
-public class GopherClient extends NetworkClient implements Runnable {
-
- /* The following three data members are left in for binary
- * backwards-compatibility. Unfortunately, HotJava sets them directly
- * when it wants to change the settings. The new design has us not
- * cache these, so this is unnecessary, but eliminating the data members
- * would break HJB 1.1 under JDK 1.2.
- *
- * These data members are not used, and their values are meaningless.
- * REMIND: Take them out for JDK 2.0!
- */
-
- /**
- * @deprecated
- */
- @Deprecated
- public static boolean useGopherProxy;
-
- /**
- * @deprecated
- */
- @Deprecated
- public static String gopherProxyHost;
-
- /**
- * @deprecated
- */
- @Deprecated
- public static int gopherProxyPort;
-
-
- static {
- useGopherProxy = java.security.AccessController.doPrivileged(
- new sun.security.action.GetBooleanAction("gopherProxySet"))
- .booleanValue();
-
- gopherProxyHost = java.security.AccessController.doPrivileged(
- new sun.security.action.GetPropertyAction("gopherProxyHost"));
-
- gopherProxyPort = java.security.AccessController.doPrivileged(
- new sun.security.action.GetIntegerAction("gopherProxyPort", 80))
- .intValue();
- }
-
- PipedOutputStream os;
- URL u;
- int gtype;
- String gkey;
- sun.net.www.URLConnection connection;
-
- GopherClient(sun.net.www.URLConnection connection) {
- this.connection = connection;
- }
-
- /**
- * @return true if gopher connections should go through a proxy, according
- * to system properties.
- */
- public static boolean getUseGopherProxy() {
- return java.security.AccessController.doPrivileged(
- new GetBooleanAction("gopherProxySet")).booleanValue();
- }
-
- /**
- * @return the proxy host to use, or null if nothing is set.
- */
- public static String getGopherProxyHost() {
- String host = java.security.AccessController.doPrivileged(
- new sun.security.action.GetPropertyAction("gopherProxyHost"));
- if ("".equals(host)) {
- host = null;
- }
- return host;
- }
-
- /**
- * @return the proxy port to use. Will default reasonably.
- */
- public static int getGopherProxyPort() {
- return java.security.AccessController.doPrivileged(
- new sun.security.action.GetIntegerAction("gopherProxyPort", 80))
- .intValue();
- }
-
- /** Given a url, setup to fetch the gopher document it refers to */
- InputStream openStream(URL u) throws IOException {
- this.u = u;
- this.os = os;
- int i = 0;
- String s = u.getFile();
- int limit = s.length();
- int c = '1';
- while (i < limit && (c = s.charAt(i)) == '/')
- i++;
- gtype = c == '/' ? '1' : c;
- if (i < limit)
- i++;
- gkey = s.substring(i);
-
- openServer(u.getHost(), u.getPort() <= 0 ? 70 : u.getPort());
-
- MessageHeader msgh = new MessageHeader();
-
- switch (gtype) {
- case '0':
- case '7':
- msgh.add("content-type", "text/plain");
- break;
- case '1':
- msgh.add("content-type", "text/html");
- break;
- case 'g':
- case 'I':
- msgh.add("content-type", "image/gif");
- break;
- default:
- msgh.add("content-type", "content/unknown");
- break;
- }
- if (gtype != '7') {
- serverOutput.print(decodePercent(gkey) + "\r\n");
- serverOutput.flush();
- } else if ((i = gkey.indexOf('?')) >= 0) {
- serverOutput.print(decodePercent(gkey.substring(0, i) + "\t" +
- gkey.substring(i + 1) + "\r\n"));
- serverOutput.flush();
- msgh.add("content-type", "text/html");
- } else {
- msgh.add("content-type", "text/html");
- }
- connection.setProperties(msgh);
- if (msgh.findValue("content-type") == "text/html") {
- os = new PipedOutputStream();
- PipedInputStream ret = new PipedInputStream();
- ret.connect(os);
- new Thread(this).start();
- return ret;
- }
- return new GopherInputStream(this, serverInput);
- }
-
- /** Translate all the instances of %NN into the character they represent */
- private String decodePercent(String s) {
- if (s == null || s.indexOf('%') < 0)
- return s;
- int limit = s.length();
- char d[] = new char[limit];
- int dp = 0;
- for (int sp = 0; sp < limit; sp++) {
- int c = s.charAt(sp);
- if (c == '%' && sp + 2 < limit) {
- int s1 = s.charAt(sp + 1);
- int s2 = s.charAt(sp + 2);
- if ('0' <= s1 && s1 <= '9')
- s1 = s1 - '0';
- else if ('a' <= s1 && s1 <= 'f')
- s1 = s1 - 'a' + 10;
- else if ('A' <= s1 && s1 <= 'F')
- s1 = s1 - 'A' + 10;
- else
- s1 = -1;
- if ('0' <= s2 && s2 <= '9')
- s2 = s2 - '0';
- else if ('a' <= s2 && s2 <= 'f')
- s2 = s2 - 'a' + 10;
- else if ('A' <= s2 && s2 <= 'F')
- s2 = s2 - 'A' + 10;
- else
- s2 = -1;
- if (s1 >= 0 && s2 >= 0) {
- c = (s1 << 4) | s2;
- sp += 2;
- }
- }
- d[dp++] = (char) c;
- }
- return new String(d, 0, dp);
- }
-
- /** Turn special characters into the %NN form */
- private String encodePercent(String s) {
- if (s == null)
- return s;
- int limit = s.length();
- char d[] = null;
- int dp = 0;
- for (int sp = 0; sp < limit; sp++) {
- int c = s.charAt(sp);
- if (c <= ' ' || c == '"' || c == '%') {
- if (d == null)
- d = s.toCharArray();
- if (dp + 3 >= d.length) {
- char nd[] = new char[dp + 10];
- System.arraycopy(d, 0, nd, 0, dp);
- d = nd;
- }
- d[dp] = '%';
- int dig = (c >> 4) & 0xF;
- d[dp + 1] = (char) (dig < 10 ? '0' + dig : 'A' - 10 + dig);
- dig = c & 0xF;
- d[dp + 2] = (char) (dig < 10 ? '0' + dig : 'A' - 10 + dig);
- dp += 3;
- } else {
- if (d != null) {
- if (dp >= d.length) {
- char nd[] = new char[dp + 10];
- System.arraycopy(d, 0, nd, 0, dp);
- d = nd;
- }
- d[dp] = (char) c;
- }
- dp++;
- }
- }
- return d == null ? s : new String(d, 0, dp);
- }
-
- /** This method is run as a seperate thread when an incoming gopher
- document requires translation to html */
- public void run() {
- int qpos = -1;
- try {
- if (gtype == '7' && (qpos = gkey.indexOf('?')) < 0) {
- PrintStream ps = new PrintStream(os, false, encoding);
- ps.print("<html><head><title>Searchable Gopher Index</title></head>\n<body><h1>Searchable Gopher Index</h1><isindex>\n</body></html>\n");
- } else if (gtype != '1' && gtype != '7') {
- byte buf[] = new byte[2048];
- try {
- int n;
- while ((n = serverInput.read(buf)) >= 0)
- os.write(buf, 0, n);
- } catch(Exception e) {
- }
- } else {
- PrintStream ps = new PrintStream(os, false, encoding);
- String title = null;
- if (gtype == '7')
- title = "Results of searching for \"" + gkey.substring(qpos + 1)
- + "\" on " + u.getHost();
- else
- title = "Gopher directory " + gkey + " from " + u.getHost();
- ps.print("<html><head><title>");
- ps.print(title);
- ps.print("</title></head>\n<body>\n<H1>");
- ps.print(title);
- ps.print("</h1><dl compact>\n");
- BufferedReader ds = new BufferedReader(new InputStreamReader(serverInput));
- String s;
- while ((s = ds.readLine()) != null) {
- int len = s.length();
- while (len > 0 && s.charAt(len - 1) <= ' ')
- len--;
- if (len <= 0)
- continue;
- int key = s.charAt(0);
- int t1 = s.indexOf('\t');
- int t2 = t1 > 0 ? s.indexOf('\t', t1 + 1) : -1;
- int t3 = t2 > 0 ? s.indexOf('\t', t2 + 1) : -1;
- if (t3 < 0) {
- // ps.print("<br><i>"+s+"</i>\n");
- continue;
- }
- String port = t3 + 1 < len ? ":" + s.substring(t3 + 1, len) : "";
- String host = t2 + 1 < t3 ? s.substring(t2 + 1, t3) : u.getHost();
- ps.print("<dt><a href=\"gopher://" + host + port + "/"
- + s.substring(0, 1) + encodePercent(s.substring(t1 + 1, t2)) + "\">\n");
- ps.print("<img align=middle border=0 width=25 height=32 src=");
- switch (key) {
- default:
- ps.print(System.getProperty("java.net.ftp.imagepath.file"));
- break;
- case '0':
- ps.print(System.getProperty("java.net.ftp.imagepath.text"));
- break;
- case '1':
- ps.print(System.getProperty("java.net.ftp.imagepath.directory"));
- break;
- case 'g':
- ps.print(System.getProperty("java.net.ftp.imagepath.gif"));
- break;
- }
- ps.print(".gif align=middle><dd>\n");
- ps.print(s.substring(1, t1) + "</a>\n");
- }
- ps.print("</dl></body>\n");
- ps.close();
- }
-
- } catch (UnsupportedEncodingException e) {
- throw new InternalError(encoding+ " encoding not found", e);
- } catch (IOException e) {
- } finally {
- try {
- closeServer();
- os.close();
- } catch (IOException e2) {
- }
- }
- }
-}
-
-/** An input stream that does nothing more than hold on to the NetworkClient
- that created it. This is used when only the input stream is needed, and
- the network client needs to be closed when the input stream is closed. */
-class GopherInputStream extends FilterInputStream {
- NetworkClient parent;
-
- GopherInputStream(NetworkClient o, InputStream fd) {
- super(fd);
- parent = o;
- }
-
- public void close() {
- try {
- parent.closeServer();
- super.close();
- } catch (IOException e) {
- }
- }
-}
--- a/jdk/src/share/classes/sun/net/www/protocol/gopher/Handler.java Mon Oct 29 16:51:59 2012 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 1995, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.net.www.protocol.gopher;
-
-import java.io.*;
-import java.util.*;
-import sun.net.NetworkClient;
-import java.net.URL;
-import java.net.URLStreamHandler;
-import java.net.Proxy;
-import java.net.InetSocketAddress;
-import java.net.SocketPermission;
-import java.security.Permission;
-import sun.net.www.protocol.http.HttpURLConnection;
-
-/**
- * A class to handle the gopher protocol.
- */
-
-public class Handler extends java.net.URLStreamHandler {
-
- protected int getDefaultPort() {
- return 70;
- }
-
- public java.net.URLConnection openConnection(URL u)
- throws IOException {
- return openConnection(u, null);
- }
-
- public java.net.URLConnection openConnection(URL u, Proxy p)
- throws IOException {
-
-
- /* if set for proxy usage then go through the http code to get */
- /* the url connection. */
- if (p == null && GopherClient.getUseGopherProxy()) {
- String host = GopherClient.getGopherProxyHost();
- if (host != null) {
- InetSocketAddress saddr = InetSocketAddress.createUnresolved(host, GopherClient.getGopherProxyPort());
-
- p = new Proxy(Proxy.Type.HTTP, saddr);
- }
- }
- if (p != null) {
- return new HttpURLConnection(u, p);
- }
-
- return new GopherURLConnection(u);
- }
-}
-
-class GopherURLConnection extends sun.net.www.URLConnection {
-
- Permission permission;
-
- GopherURLConnection(URL u) {
- super(u);
- }
-
- public void connect() throws IOException {
- }
-
- public InputStream getInputStream() throws IOException {
- return new GopherClient(this).openStream(url);
- }
-
- public Permission getPermission() {
- if (permission == null) {
- int port = url.getPort();
- port = port < 0 ? 70 : port;
- String host = url.getHost() + ":" + url.getPort();
- permission = new SocketPermission(host, "connect");
- }
- return permission;
- }
-}
--- a/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java Wed Oct 31 08:29:44 2012 -0700
@@ -405,7 +405,8 @@
*/
perms.add(new SocketPermission("*", "connect,accept"));
- perms.add(new RuntimePermission("accessClassInPackage.sun.*"));
+ perms.add(new RuntimePermission("accessClassInPackage.sun.jvmstat.*"));
+ perms.add(new RuntimePermission("accessClassInPackage.sun.jvm.hotspot.*"));
perms.add(new FilePermission("<<ALL FILES>>", "read"));
--- a/jdk/src/share/classes/sun/security/provider/SecureRandom.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/share/classes/sun/security/provider/SecureRandom.java Wed Oct 31 08:29:44 2012 -0700
@@ -56,12 +56,6 @@
private static final long serialVersionUID = 3581829991155417889L;
- /**
- * This static object will be seeded by SeedGenerator, and used
- * to seed future instances of SecureRandom
- */
- private static SecureRandom seeder;
-
private static final int DIGEST_SIZE = 20;
private transient MessageDigest digest;
private byte[] state;
@@ -173,6 +167,28 @@
}
/**
+ * This static object will be seeded by SeedGenerator, and used
+ * to seed future instances of SHA1PRNG SecureRandoms.
+ *
+ * Bloch, Effective Java Second Edition: Item 71
+ */
+ private static class SeederHolder {
+
+ private static final SecureRandom seeder;
+
+ static {
+ /*
+ * Call to SeedGenerator.generateSeed() to add additional
+ * seed material (likely from the Native implementation).
+ */
+ seeder = new SecureRandom(SeedGenerator.getSystemEntropy());
+ byte [] b = new byte[DIGEST_SIZE];
+ SeedGenerator.generateSeed(b);
+ seeder.engineSetSeed(b);
+ }
+ }
+
+ /**
* Generates a user-specified number of random bytes.
*
* @param bytes the array to be filled in with random bytes.
@@ -183,13 +199,8 @@
byte[] output = remainder;
if (state == null) {
- if (seeder == null) {
- seeder = new SecureRandom(SeedGenerator.getSystemEntropy());
- seeder.engineSetSeed(engineGenerateSeed(DIGEST_SIZE));
- }
-
byte[] seed = new byte[DIGEST_SIZE];
- seeder.engineNextBytes(seed);
+ SeederHolder.seeder.engineNextBytes(seed);
state = digest.digest(seed);
}
--- a/jdk/src/share/classes/sun/security/ssl/HandshakeInStream.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/share/classes/sun/security/ssl/HandshakeInStream.java Wed Oct 31 08:29:44 2012 -0700
@@ -191,6 +191,7 @@
byte[] getBytes8() throws IOException {
int len = getInt8();
+ verifyLength(len);
byte b[] = new byte[len];
read(b, 0, len);
@@ -199,6 +200,7 @@
public byte[] getBytes16() throws IOException {
int len = getInt16();
+ verifyLength(len);
byte b[] = new byte[len];
read(b, 0, len);
@@ -207,10 +209,19 @@
byte[] getBytes24() throws IOException {
int len = getInt24();
+ verifyLength(len);
byte b[] = new byte[len];
read(b, 0, len);
return b;
}
+ // Is a length greater than available bytes in the record?
+ private void verifyLength(int len) throws SSLException {
+ if (len > available()) {
+ throw new SSLException(
+ "Not enough data to fill declared vector size");
+ }
+ }
+
}
--- a/jdk/src/share/classes/sun/security/ssl/Handshaker.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/share/classes/sun/security/ssl/Handshaker.java Wed Oct 31 08:29:44 2012 -0700
@@ -1079,7 +1079,6 @@
if (debug != null && Debug.isOn("handshake")) {
System.out.println("RSA master secret generation error:");
e.printStackTrace(System.out);
- System.out.println("Generating new random premaster secret");
}
if (requestedVersion != null) {
@@ -1146,7 +1145,6 @@
System.out.println("RSA PreMasterSecret version error: expected"
+ protocolVersion + " or " + requestedVersion + ", decrypted: "
+ premasterVersion);
- System.out.println("Generating new random premaster secret");
}
preMasterSecret =
RSAClientKeyExchange.generateDummySecret(requestedVersion);
--- a/jdk/src/share/classes/sun/security/ssl/RSAClientKeyExchange.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/share/classes/sun/security/ssl/RSAClientKeyExchange.java Wed Oct 31 08:29:44 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
@@ -36,6 +36,7 @@
import javax.net.ssl.*;
import sun.security.internal.spec.TlsRsaPremasterSecretParameterSpec;
+import sun.security.util.KeyLength;
/**
* This is the client key exchange message (CLIENT --> SERVER) used with
@@ -192,26 +193,38 @@
"unable to get the plaintext of the premaster secret");
}
- // We are not always able to get the encoded key of the
- // premaster secret. Pass the cheking to master secret
+ int keySize = KeyLength.getKeySize(secretKey);
+ if (keySize > 0 && keySize != 384) { // 384 = 48 * 8
+ if (debug != null && Debug.isOn("handshake")) {
+ System.out.println(
+ "incorrect length of premaster secret: " +
+ (keySize/8));
+ }
+
+ return generateDummySecret(clientHelloVersion);
+ }
+
+ // The key size is exactly 48 bytes or not accessible.
+ //
+ // Conservatively, pass the checking to master secret
// calculation.
return secretKey;
} else if (encoded.length == 48) {
// check the version
if (clientHelloVersion.major == encoded[0] &&
clientHelloVersion.minor == encoded[1]) {
+
return secretKey;
- } else if (clientHelloVersion.v <= ProtocolVersion.TLS10.v) {
+ } else if (clientHelloVersion.v <= ProtocolVersion.TLS10.v &&
+ currentVersion.major == encoded[0] &&
+ currentVersion.minor == encoded[1]) {
/*
- * we never checked the client_version in server side
- * for TLS v1.0 and SSL v3.0. For compatibility, we
- * maintain this behavior.
+ * For compatibility, we maintain the behavior that the
+ * version in pre_master_secret can be the negotiated
+ * version for TLS v1.0 and SSL v3.0.
*/
- if (currentVersion.major == encoded[0] &&
- currentVersion.minor == encoded[1]) {
- this.protocolVersion = currentVersion;
- return secretKey;
- }
+ this.protocolVersion = currentVersion;
+ return secretKey;
}
if (debug != null && Debug.isOn("handshake")) {
@@ -220,22 +233,23 @@
", while PreMasterSecret.client_version is " +
ProtocolVersion.valueOf(encoded[0], encoded[1]));
}
+
+ return generateDummySecret(clientHelloVersion);
} else {
if (debug != null && Debug.isOn("handshake")) {
System.out.println(
"incorrect length of premaster secret: " +
encoded.length);
}
+
+ return generateDummySecret(clientHelloVersion);
}
}
- if (debug != null && Debug.isOn("handshake")) {
- if (failoverException != null) {
- System.out.println("Error decrypting premaster secret:");
- failoverException.printStackTrace(System.out);
- }
-
- System.out.println("Generating random secret");
+ if (debug != null && Debug.isOn("handshake") &&
+ failoverException != null) {
+ System.out.println("Error decrypting premaster secret:");
+ failoverException.printStackTrace(System.out);
}
return generateDummySecret(clientHelloVersion);
@@ -243,6 +257,10 @@
// generate a premaster secret with the specified version number
static SecretKey generateDummySecret(ProtocolVersion version) {
+ if (debug != null && Debug.isOn("handshake")) {
+ System.out.println("Generating a random fake premaster secret");
+ }
+
try {
String s = ((version.v >= ProtocolVersion.TLS12.v) ?
"SunTls12RsaPremasterSecret" : "SunTlsRsaPremasterSecret");
--- a/jdk/src/share/lib/security/java.security Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/share/lib/security/java.security Wed Oct 31 08:29:44 2012 -0700
@@ -145,7 +145,7 @@
# passed to checkPackageAccess unless the
# corresponding RuntimePermission ("accessClassInPackage."+package) has
# been granted.
-package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,jdk.internal.
+package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal.,jdk.internal.
#
# List of comma-separated packages that start with or equal this string
@@ -157,7 +157,7 @@
# by default, none of the class loaders supplied with the JDK call
# checkPackageDefinition.
#
-package.definition=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,jdk.internal.
+package.definition=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal.,jdk.internal.
#
# Determines whether this properties file can be appended to
--- a/jdk/src/share/lib/security/java.security-macosx Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/share/lib/security/java.security-macosx Wed Oct 31 08:29:44 2012 -0700
@@ -146,7 +146,7 @@
# passed to checkPackageAccess unless the
# corresponding RuntimePermission ("accessClassInPackage."+package) has
# been granted.
-package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,apple.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,jdk.internal.
+package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,apple.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal.,jdk.internal.
#
# List of comma-separated packages that start with or equal this string
@@ -158,7 +158,7 @@
# by default, none of the class loaders supplied with the JDK call
# checkPackageDefinition.
#
-package.definition=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,apple.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,jdk.internal.
+package.definition=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,apple.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal.,jdk.internal.
#
# Determines whether this properties file can be appended to
--- a/jdk/src/share/lib/security/java.security-solaris Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/share/lib/security/java.security-solaris Wed Oct 31 08:29:44 2012 -0700
@@ -147,7 +147,7 @@
# passed to checkPackageAccess unless the
# corresponding RuntimePermission ("accessClassInPackage."+package) has
# been granted.
-package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,jdk.internal.
+package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal.,jdk.internal.
#
# List of comma-separated packages that start with or equal this string
@@ -159,7 +159,7 @@
# by default, none of the class loaders supplied with the JDK call
# checkPackageDefinition.
#
-package.definition=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,jdk.internal.
+package.definition=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal.,jdk.internal.
#
# Determines whether this properties file can be appended to
--- a/jdk/src/share/lib/security/java.security-windows Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/share/lib/security/java.security-windows Wed Oct 31 08:29:44 2012 -0700
@@ -146,7 +146,7 @@
# passed to checkPackageAccess unless the
# corresponding RuntimePermission ("accessClassInPackage."+package) has
# been granted.
-package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,jdk.internal.
+package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal.,jdk.internal.
#
# List of comma-separated packages that start with or equal this string
@@ -158,7 +158,7 @@
# by default, none of the class loaders supplied with the JDK call
# checkPackageDefinition.
#
-package.definition=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,jdk.internal.
+package.definition=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal.,jdk.internal.
#
# Determines whether this properties file can be appended to
--- a/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c Wed Oct 31 08:29:44 2012 -0700
@@ -253,6 +253,16 @@
if (sProf.pf == NULL) {
JNU_ThrowIllegalArgumentException(env, "Invalid profile data");
+ } else {
+ /* Sanity check: try to save the profile in order
+ * to force basic validation.
+ */
+ cmsUInt32Number pfSize = 0;
+ if (!cmsSaveProfileToMem(sProf.pf, NULL, &pfSize) ||
+ pfSize < sizeof(cmsICCHeader))
+ {
+ JNU_ThrowIllegalArgumentException(env, "Invalid profile data");
+ }
}
return sProf.j;
--- a/jdk/src/solaris/classes/sun/awt/X11/XKeysym.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/solaris/classes/sun/awt/X11/XKeysym.java Wed Oct 31 08:29:44 2012 -0700
@@ -379,6 +379,25 @@
keysym2UCSHash.put( (long)0xFFB8, (char)0x0038); // XK_KP_8 --> DIGIT EIGHT
keysym2UCSHash.put( (long)0xFFB9, (char)0x0039); // XK_KP_9 --> DIGIT NINE
keysym2UCSHash.put( (long)0xFE20, (char)0x0009); // XK_ISO_Left_Tab --> <control>
+ keysym2UCSHash.put( (long)0xFE50, (char)0x02CB); // XK_dead_grave --> MODIFIER LETTER GRAVE ACCENT
+ keysym2UCSHash.put( (long)0xFE51, (char)0x02CA); // XK_dead_acute --> MODIFIER LETTER ACUTE ACCENT
+ keysym2UCSHash.put( (long)0xFE52, (char)0x02C6); // XK_dead_circumflex --> MODIFIER LETTER CIRCUMFLEX ACCENT
+ keysym2UCSHash.put( (long)0xFE53, (char)0x02DC); // XK_dead_tilde --> SMALL TILDE
+ keysym2UCSHash.put( (long)0xFE54, (char)0x02C9); // XK_dead_macron --> MODIFIER LETTER MACRON
+ keysym2UCSHash.put( (long)0xFE55, (char)0x02D8); // XK_dead_breve --> BREVE
+ keysym2UCSHash.put( (long)0xFE56, (char)0x02D9); // XK_dead_abovedot --> DOT ABOVE
+ keysym2UCSHash.put( (long)0xFE57, (char)0x00A8); // XK_dead_diaeresis --> DIAERESIS
+ keysym2UCSHash.put( (long)0xFE58, (char)0x02DA); // XK_dead_abovering --> RING ABOVE
+ keysym2UCSHash.put( (long)0xFE59, (char)0x02DD); // XK_dead_doubleacute --> DOUBLE ACUTE ACCENT
+ keysym2UCSHash.put( (long)0xFE5A, (char)0x02C7); // XK_dead_caron --> CARON
+ keysym2UCSHash.put( (long)0xFE5B, (char)0x00B8); // XK_dead_cedilla --> CEDILLA
+ keysym2UCSHash.put( (long)0xFE5C, (char)0x02DB); // XK_dead_ogonek --> OGONEK
+ keysym2UCSHash.put( (long)0xFE5D, (char)0x0269); // XK_dead_iota --> LATIN SMALL LETTER IOTA
+ keysym2UCSHash.put( (long)0xFE5E, (char)0x3099); // XK_dead_voiced_sound --> COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+ keysym2UCSHash.put( (long)0xFE5F, (char)0x309A); // XK_dead_semivoiced_sound --> COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
+ keysym2UCSHash.put( (long)0xFE60, (char)0x0323); // XK_dead_belowdot --> COMBINING DOT BELOW
+ keysym2UCSHash.put( (long)0xFE61, (char)0x0321); // XK_dead_hook --> COMBINING PALATALIZED HOOK BELOW
+ keysym2UCSHash.put( (long)0xFE62, (char)0x031B); // XK_dead_horn --> COMBINING HORN
keysym2UCSHash.put( (long)0x1a1, (char)0x0104); // XK_Aogonek --> LATIN CAPITAL LETTER A WITH OGONEK
keysym2UCSHash.put( (long)0x1a2, (char)0x02d8); // XK_breve --> BREVE
keysym2UCSHash.put( (long)0x1a3, (char)0x0141); // XK_Lstroke --> LATIN CAPITAL LETTER L WITH STROKE
--- a/jdk/src/solaris/classes/sun/awt/X11/XWindow.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/solaris/classes/sun/awt/X11/XWindow.java Wed Oct 31 08:29:44 2012 -0700
@@ -1115,7 +1115,10 @@
// (1) either XIM could not handle it or
// (2) it was Latin 1:1 mapping.
//
- XKeysym.Keysym2JavaKeycode jkc = XKeysym.getJavaKeycode(ev);
+ // Preserve modifiers to get Java key code for dead keys
+ boolean isDeadKey = isDeadKey(keysym[0]);
+ XKeysym.Keysym2JavaKeycode jkc = isDeadKey ? XKeysym.getJavaKeycode(keysym[0])
+ : XKeysym.getJavaKeycode(ev);
if( jkc == null ) {
jkc = new XKeysym.Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_UNDEFINED, java.awt.event.KeyEvent.KEY_LOCATION_UNKNOWN);
}
@@ -1141,7 +1144,7 @@
jkc.getJavaKeycode();
postKeyEvent( java.awt.event.KeyEvent.KEY_PRESSED,
ev.get_time(),
- jkeyToReturn,
+ isDeadKey ? jkeyExtended : jkeyToReturn,
(unicodeKey == 0 ? java.awt.event.KeyEvent.CHAR_UNDEFINED : unicodeKey),
jkc.getKeyLocation(),
ev.get_state(),ev.getPData(), XKeyEvent.getSize(), (long)(ev.get_keycode()),
@@ -1149,7 +1152,7 @@
jkeyExtended);
- if( unicodeKey > 0 ) {
+ if (unicodeKey > 0 && !isDeadKey) {
keyEventLog.fine("fire _TYPED on "+unicodeKey);
postKeyEvent( java.awt.event.KeyEvent.KEY_TYPED,
ev.get_time(),
@@ -1176,9 +1179,7 @@
}
// un-private it if you need to call it from elsewhere
private void handleKeyRelease(XKeyEvent ev) {
- long keysym[] = new long[2];
int unicodeKey = 0;
- keysym[0] = XConstants.NoSymbol;
if (keyEventLog.isLoggable(PlatformLogger.FINE)) {
logIncomingKeyEvent( ev );
@@ -1187,7 +1188,11 @@
// and Java KeyEvent keycode should be calculated.
// For release we should post released event.
//
- XKeysym.Keysym2JavaKeycode jkc = XKeysym.getJavaKeycode(ev);
+ // Preserve modifiers to get Java key code for dead keys
+ long keysym = xkeycodeToKeysym(ev);
+ boolean isDeadKey = isDeadKey(keysym);
+ XKeysym.Keysym2JavaKeycode jkc = isDeadKey ? XKeysym.getJavaKeycode(keysym)
+ : XKeysym.getJavaKeycode(ev);
if( jkc == null ) {
jkc = new XKeysym.Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_UNDEFINED, java.awt.event.KeyEvent.KEY_LOCATION_UNKNOWN);
}
@@ -1219,7 +1224,7 @@
jkc.getJavaKeycode();
postKeyEvent( java.awt.event.KeyEvent.KEY_RELEASED,
ev.get_time(),
- jkeyToReturn,
+ isDeadKey ? jkeyExtended : jkeyToReturn,
(unicodeKey == 0 ? java.awt.event.KeyEvent.CHAR_UNDEFINED : unicodeKey),
jkc.getKeyLocation(),
ev.get_state(),ev.getPData(), XKeyEvent.getSize(), (long)(ev.get_keycode()),
@@ -1229,6 +1234,11 @@
}
+
+ private boolean isDeadKey(long keysym){
+ return XKeySymConstants.XK_dead_grave <= keysym && keysym <= XKeySymConstants.XK_dead_semivoiced_sound;
+ }
+
/*
* XmNiconic and Map/UnmapNotify (that XmNiconic relies on) are
* unreliable, since mapping changes can happen for a virtual desktop
--- a/jdk/src/solaris/classes/sun/awt/X11/keysym2ucs.h Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/solaris/classes/sun/awt/X11/keysym2ucs.h Wed Oct 31 08:29:44 2012 -0700
@@ -695,25 +695,25 @@
0x0000 #define XK_ISO_Center_Object 0xFE33
0x0000 #define XK_ISO_Enter 0xFE34
-0x0000 #define XK_dead_grave 0xFE50
-0x0000 #define XK_dead_acute 0xFE51
-0x0000 #define XK_dead_circumflex 0xFE52
-0x0000 #define XK_dead_tilde 0xFE53
-0x0000 #define XK_dead_macron 0xFE54
-0x0000 #define XK_dead_breve 0xFE55
-0x0000 #define XK_dead_abovedot 0xFE56
-0x0000 #define XK_dead_diaeresis 0xFE57
-0x0000 #define XK_dead_abovering 0xFE58
-0x0000 #define XK_dead_doubleacute 0xFE59
-0x0000 #define XK_dead_caron 0xFE5A
-0x0000 #define XK_dead_cedilla 0xFE5B
-0x0000 #define XK_dead_ogonek 0xFE5C
-0x0000 #define XK_dead_iota 0xFE5D
-0x0000 #define XK_dead_voiced_sound 0xFE5E
-0x0000 #define XK_dead_semivoiced_sound 0xFE5F
-0x0000 #define XK_dead_belowdot 0xFE60
-0x0000 #define XK_dead_hook 0xFE61
-0x0000 #define XK_dead_horn 0xFE62
+0x02CB #define XK_dead_grave 0xFE50
+0x02CA #define XK_dead_acute 0xFE51
+0x02C6 #define XK_dead_circumflex 0xFE52
+0x02DC #define XK_dead_tilde 0xFE53
+0x02C9 #define XK_dead_macron 0xFE54
+0x02D8 #define XK_dead_breve 0xFE55
+0x02D9 #define XK_dead_abovedot 0xFE56
+0x00A8 #define XK_dead_diaeresis 0xFE57
+0x02DA #define XK_dead_abovering 0xFE58
+0x02DD #define XK_dead_doubleacute 0xFE59
+0x02C7 #define XK_dead_caron 0xFE5A
+0x00B8 #define XK_dead_cedilla 0xFE5B
+0x02DB #define XK_dead_ogonek 0xFE5C
+0x0269 #define XK_dead_iota 0xFE5D
+0x3099 #define XK_dead_voiced_sound 0xFE5E
+0x309A #define XK_dead_semivoiced_sound 0xFE5F
+0x0323 #define XK_dead_belowdot 0xFE60
+0x0321 #define XK_dead_hook 0xFE61
+0x031B #define XK_dead_horn 0xFE62
0x0000 #define XK_First_Virtual_Screen 0xFED0
0x0000 #define XK_Prev_Virtual_Screen 0xFED1
@@ -2466,6 +2466,7 @@
tojava keysym2JavaKeycodeHash.put( Long.valueOf(XKeySymConstants.XK_Meta_L), new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_META, java.awt.event.KeyEvent.KEY_LOCATION_LEFT));
tojava keysym2JavaKeycodeHash.put( Long.valueOf(XKeySymConstants.XK_Meta_R), new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_META, java.awt.event.KeyEvent.KEY_LOCATION_RIGHT));
tojava keysym2JavaKeycodeHash.put( Long.valueOf(XKeySymConstants.XK_Caps_Lock), new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_CAPS_LOCK, java.awt.event.KeyEvent.KEY_LOCATION_STANDARD));
+tojava keysym2JavaKeycodeHash.put( Long.valueOf(XKeySymConstants.XK_Shift_Lock), new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_CAPS_LOCK, java.awt.event.KeyEvent.KEY_LOCATION_STANDARD));
tojava
tojava /* Misc Functions */
tojava keysym2JavaKeycodeHash.put( Long.valueOf(XKeySymConstants.XK_Print), new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_PRINTSCREEN, java.awt.event.KeyEvent.KEY_LOCATION_STANDARD));
@@ -2640,6 +2641,21 @@
tojava keysym2JavaKeycodeHash.put( Long.valueOf(XKeySymConstants.XK_Kanji), new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_CONVERT, java.awt.event.KeyEvent.KEY_LOCATION_STANDARD));
tojava /* Type 5c Japanese keyboard: nihongo */
tojava keysym2JavaKeycodeHash.put( Long.valueOf(XKeySymConstants.XK_Henkan_Mode), new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_INPUT_METHOD_ON_OFF, java.awt.event.KeyEvent.KEY_LOCATION_STANDARD));
+tojava keysym2JavaKeycodeHash.put( Long.valueOf(XKeySymConstants.XK_Eisu_Shift ), new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_ALPHANUMERIC , java.awt.event.KeyEvent.KEY_LOCATION_STANDARD));
+tojava keysym2JavaKeycodeHash.put( Long.valueOf(XKeySymConstants.XK_Eisu_toggle ), new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_ALPHANUMERIC , java.awt.event.KeyEvent.KEY_LOCATION_STANDARD));
+tojava keysym2JavaKeycodeHash.put( Long.valueOf(XKeySymConstants.XK_Zenkaku ), new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_FULL_WIDTH , java.awt.event.KeyEvent.KEY_LOCATION_STANDARD));
+tojava keysym2JavaKeycodeHash.put( Long.valueOf(XKeySymConstants.XK_Hankaku ), new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_HALF_WIDTH , java.awt.event.KeyEvent.KEY_LOCATION_STANDARD));
+tojava keysym2JavaKeycodeHash.put( Long.valueOf(XKeySymConstants.XK_Hiragana ), new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_HIRAGANA , java.awt.event.KeyEvent.KEY_LOCATION_STANDARD));
+tojava keysym2JavaKeycodeHash.put( Long.valueOf(XKeySymConstants.XK_Katakana ), new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_KATAKANA , java.awt.event.KeyEvent.KEY_LOCATION_STANDARD));
+tojava keysym2JavaKeycodeHash.put( Long.valueOf(XKeySymConstants.XK_Romaji ), new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_JAPANESE_ROMAN , java.awt.event.KeyEvent.KEY_LOCATION_STANDARD));
+tojava keysym2JavaKeycodeHash.put( Long.valueOf(XKeySymConstants.XK_Kana_Shift ), new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_KANA , java.awt.event.KeyEvent.KEY_LOCATION_STANDARD));
+tojava keysym2JavaKeycodeHash.put( Long.valueOf(XKeySymConstants.XK_Kana_Lock ), new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_KANA_LOCK , java.awt.event.KeyEvent.KEY_LOCATION_STANDARD));
+tojava keysym2JavaKeycodeHash.put( Long.valueOf(XKeySymConstants.XK_Muhenkan ), new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_NONCONVERT , java.awt.event.KeyEvent.KEY_LOCATION_STANDARD));
+tojava keysym2JavaKeycodeHash.put( Long.valueOf(XKeySymConstants.XK_Zen_Koho ), new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_ALL_CANDIDATES , java.awt.event.KeyEvent.KEY_LOCATION_STANDARD));
+tojava keysym2JavaKeycodeHash.put( Long.valueOf(XKeySymConstants.XK_Kanji_Bangou ), new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_CODE_INPUT , java.awt.event.KeyEvent.KEY_LOCATION_STANDARD));
+tojava keysym2JavaKeycodeHash.put( Long.valueOf(XKeySymConstants.XK_Mae_Koho ), new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_PREVIOUS_CANDIDATE , java.awt.event.KeyEvent.KEY_LOCATION_STANDARD));
+tojava
+tojava
tojava /* VK_KANA_LOCK is handled separately because it generates the
tojava * same keysym as ALT_GRAPH in spite of its different behavior.
tojava */
--- a/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c Wed Oct 31 08:29:44 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -753,7 +753,7 @@
sizeof(errmsg),
"Can't connect to X11 window server using '%s' as the value of the DISPLAY variable.",
(getenv("DISPLAY") == NULL) ? ":0.0" : getenv("DISPLAY"));
- JNU_ThrowInternalError(env, errmsg);
+ JNU_ThrowByName(env, "java/awt/AWTError", errmsg);
return NULL;
}
--- a/jdk/src/windows/classes/sun/awt/shell/Win32ShellFolder2.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/windows/classes/sun/awt/shell/Win32ShellFolder2.java Wed Oct 31 08:29:44 2012 -0700
@@ -1099,7 +1099,7 @@
? SwingConstants.CENTER
: SwingConstants.LEADING);
- column.setComparator(new ColumnComparator(getIShellFolder(), i));
+ column.setComparator(new ColumnComparator(Win32ShellFolder2.this, i));
notNullColumns.add(column);
}
@@ -1135,7 +1135,7 @@
// synchronize the whole code of the sort method once
invoke(new Callable<Void>() {
public Void call() {
- Collections.sort(files, new ColumnComparator(getIShellFolder(), 0));
+ Collections.sort(files, new ColumnComparator(Win32ShellFolder2.this, 0));
return null;
}
@@ -1143,12 +1143,12 @@
}
private static class ColumnComparator implements Comparator<File> {
- private final long parentIShellFolder;
+ private final Win32ShellFolder2 shellFolder;
private final int columnIdx;
- public ColumnComparator(long parentIShellFolder, int columnIdx) {
- this.parentIShellFolder = parentIShellFolder;
+ public ColumnComparator(Win32ShellFolder2 shellFolder, int columnIdx) {
+ this.shellFolder = shellFolder;
this.columnIdx = columnIdx;
}
@@ -1159,7 +1159,7 @@
if (o instanceof Win32ShellFolder2
&& o1 instanceof Win32ShellFolder2) {
// delegates comparison to native method
- return compareIDsByColumn(parentIShellFolder,
+ return compareIDsByColumn(shellFolder.getIShellFolder(),
((Win32ShellFolder2) o).getRelativePIDL(),
((Win32ShellFolder2) o1).getRelativePIDL(),
columnIdx);
--- a/jdk/src/windows/native/sun/windows/awt_Window.cpp Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/src/windows/native/sun/windows/awt_Window.cpp Wed Oct 31 08:29:44 2012 -0700
@@ -1559,21 +1559,8 @@
BOOL AwtWindow::AwtSetActiveWindow(BOOL isMouseEventCause, UINT hittest)
{
- // Fix for 6458497.
- // Retreat if current foreground window is out of both our and embedder process.
- // The exception is when activation is requested due to a mouse event.
- if (!isMouseEventCause) {
- HWND fgWindow = ::GetForegroundWindow();
- if (NULL != fgWindow) {
- DWORD fgProcessID;
- ::GetWindowThreadProcessId(fgWindow, &fgProcessID);
- if (fgProcessID != ::GetCurrentProcessId()
- && !AwtToolkit::GetInstance().IsEmbedderProcessId(fgProcessID))
- {
- return FALSE;
- }
- }
- }
+ // We used to reject non mouse window activation if our app wasn't active.
+ // This code since has been removed as the fix for 7185280
HWND proxyContainerHWnd = GetProxyToplevelContainer();
HWND proxyHWnd = GetProxyFocusOwner();
--- a/jdk/test/ProblemList.txt Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/test/ProblemList.txt Wed Oct 31 08:29:44 2012 -0700
@@ -143,6 +143,11 @@
java/lang/management/MemoryMXBean/MemoryTest.java generic-all
java/lang/management/MemoryMXBean/MemoryTestAllGC.sh generic-all
+# Exclude until hotspot/jdk repos are sync'd w.r.t. JAVA_MAX_SUPPORTED_VERSION
+# Needed when hotspot fix 7054345 is present. Remove when the JDK source is
+# updated accordingly.
+java/lang/System/Versions.java generic-all
+
############################################################################
# jdk_management
--- a/jdk/test/java/awt/Frame/7024749/bug7024749.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/test/java/awt/Frame/7024749/bug7024749.java Wed Oct 31 08:29:44 2012 -0700
@@ -25,7 +25,7 @@
* @test
* @bug 7024749
* @summary JDK7 b131---a crash in: Java_sun_awt_windows_ThemeReader_isGetThemeTransitionDurationDefined+0x75
- * @library ../../../regtesthelpers
+ * @library ../../regtesthelpers
* @build Util
* @author Oleg Pekhovskiy: area=awt.toplevel
@run main bug7024749
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/awt/GraphicsConfiguration/NormalizingTransformTest/NormalizingTransformTest.java Wed Oct 31 08:29:44 2012 -0700
@@ -0,0 +1,55 @@
+/*
+ * 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.
+ */
+
+/**
+ * @test
+ * @bug 6373505
+ * @summary Tests that the result of Toolkit.getScreenResolution() is
+ * consistent with GraphicsConfiguration.getNormalizingTransform().
+ * @author Dmitri.Trembovetski@Sun.COM: area=GraphicsConfiguration
+ * @run main NormalizingTransformTest
+ */
+
+import java.awt.GraphicsConfiguration;
+import java.awt.GraphicsEnvironment;
+import java.awt.Toolkit;
+import java.awt.geom.AffineTransform;
+
+public class NormalizingTransformTest {
+
+ public static void main(String[] args) {
+ GraphicsConfiguration gc =
+ GraphicsEnvironment.getLocalGraphicsEnvironment().
+ getDefaultScreenDevice().getDefaultConfiguration();
+ AffineTransform normTransform = gc.getNormalizingTransform();
+ int dpiX = Toolkit.getDefaultToolkit().getScreenResolution();
+ int normDpiX = (int)(normTransform.getScaleX() * 72.0);
+ if (dpiX != normDpiX) {
+ throw new RuntimeException(
+ "Test FAILED. Toolkit.getScreenResolution()=" + dpiX +
+ " GraphicsConfiguration.getNormalizingTransform()="+normDpiX);
+ }
+ System.out.println("Test PASSED. DPI="+normDpiX);
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/awt/Toolkit/BadDisplayTest/BadDisplayTest.java Wed Oct 31 08:29:44 2012 -0700
@@ -0,0 +1,48 @@
+/*
+ * 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.
+ */
+
+
+/*
+ * @test
+ * @summary Test that Toolkit.getDefaultToolkit throws AWTError exception if bad DISPLAY variable was set
+ * @bug 6818083
+ *
+ * @run shell/timeout=240 BadDisplayTest.sh
+ */
+
+import java.awt.*;
+
+public class BadDisplayTest{
+ public static void main(String[] args) {
+
+ Throwable th = null;
+ try {
+ Toolkit.getDefaultToolkit();
+ } catch (Throwable x) {
+ th = x;
+ }
+ if ( !(th instanceof AWTError)) {
+ System.exit(1);
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/awt/Toolkit/BadDisplayTest/BadDisplayTest.sh Wed Oct 31 08:29:44 2012 -0700
@@ -0,0 +1,42 @@
+# 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.
+
+${TESTJAVA}/bin/javac -cp ${TESTSRC} -d . ${TESTSRC}/BadDisplayTest.java
+
+
+export DISPLAY=
+
+OS=`uname -s`
+case "$OS" in
+ SunOS )
+ ${TESTJAVA}/bin/java BadDisplayTest
+ ;;
+ Linux )
+ ${TESTJAVA}/bin/java BadDisplayTest
+ ;;
+ * )
+ echo "Unsupported System: ${OS}"
+ exit 0;
+ ;;
+esac
+
+exit $?
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/invoke/7196190/ClassForNameTest.java Wed Oct 31 08:29:44 2012 -0700
@@ -0,0 +1,98 @@
+/*
+ * 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.
+ *
+ */
+
+/**
+ * @test
+ * @bug 7196190
+ * @summary Improve method of handling MethodHandles
+ *
+ * @run main/othervm ClassForNameTest
+ */
+
+import java.lang.invoke.*;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+
+public class ClassForNameTest {
+ final static String NAME = ClassForNameTest.class.getName();
+
+ public static void main(String[] args) throws Throwable {
+ {
+ final MethodType mt = MethodType.methodType(Class.class, String.class);
+ final MethodHandle mh = MethodHandles.lookup()
+ .findStatic(Class.class, "forName", mt);
+
+ Class.forName(NAME);
+
+ mh.invoke(NAME);
+ mh.bindTo(NAME).invoke();
+ mh.invokeWithArguments(Arrays.asList(NAME));
+ mh.invokeWithArguments(NAME);
+ Class cls = (Class) mh.invokeExact(NAME);
+ }
+
+ {
+ final Method fnMethod = Class.class.getMethod("forName", String.class);
+ final MethodType mt = MethodType.methodType(Object.class, Object.class, Object[].class);
+ final MethodHandle mh = MethodHandles.lookup()
+ .findVirtual(Method.class, "invoke", mt)
+ .bindTo(fnMethod);
+
+ fnMethod.invoke(null, NAME);
+
+ mh.bindTo(null).bindTo(new Object[]{NAME}).invoke();
+ mh.invoke(null, new Object[]{NAME});
+ mh.invokeWithArguments(null, new Object[]{NAME});
+ mh.invokeWithArguments(Arrays.asList(null, new Object[]{NAME}));
+ Object obj = mh.invokeExact((Object) null, new Object[]{NAME});
+ }
+
+ {
+ final Method fnMethod = Class.class.getMethod("forName", String.class);
+ final MethodType mt = MethodType.methodType(Object.class, Object.class, Object[].class);
+
+ final MethodHandle mh = MethodHandles.lookup()
+ .bind(fnMethod, "invoke", mt);
+
+ mh.bindTo(null).bindTo(new Object[]{NAME}).invoke();
+ mh.invoke(null, new Object[]{NAME});
+ mh.invokeWithArguments(null, NAME);
+ mh.invokeWithArguments(Arrays.asList(null, NAME));
+ Object obj = mh.invokeExact((Object) null, new Object[]{NAME});
+ }
+
+ {
+ final Method fnMethod = Class.class.getMethod("forName", String.class);
+ final MethodHandle mh = MethodHandles.lookup().unreflect(fnMethod);
+
+ mh.bindTo(NAME).invoke();
+ mh.invoke(NAME);
+ mh.invokeWithArguments(NAME);
+ mh.invokeWithArguments(Arrays.asList(NAME));
+ Class cls = (Class) mh.invokeExact(NAME);
+ }
+
+ System.out.println("TEST PASSED");
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/invoke/7196190/GetUnsafeTest.java Wed Oct 31 08:29:44 2012 -0700
@@ -0,0 +1,112 @@
+/*
+ * 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.
+ *
+ */
+
+/**
+ * @test
+ * @bug 7196190
+ * @summary Improve method of handling MethodHandles
+ *
+ * @run main/othervm/policy=jtreg.security.policy/secure=java.lang.SecurityManager GetUnsafeTest
+ */
+
+import java.lang.invoke.*;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+
+public class GetUnsafeTest {
+ final static String NAME = "sun.misc.Unsafe";
+
+ private static boolean isTestFailed = false;
+
+ private static void fail() {
+ isTestFailed = true;
+ try { throw new Exception(); } catch (Throwable e) {
+ StackTraceElement frame = e.getStackTrace()[1];
+ System.out.printf("Failed at %s:%d\n", frame.getFileName(), frame.getLineNumber());
+ }
+ }
+
+ public static void main(String[] args) throws Throwable {
+ {
+ final MethodType mt = MethodType.methodType(Class.class, String.class);
+ final MethodHandle mh = MethodHandles.lookup()
+ .findStatic(Class.class, "forName", mt);
+
+ try { Class.forName(NAME); fail(); } catch (Throwable e) {}
+
+ try { mh.invoke(NAME); fail(); } catch (Throwable e) {}
+ try { mh.bindTo(NAME).invoke(); fail(); } catch (Throwable e) {}
+ try { mh.invokeWithArguments(Arrays.asList(NAME)); fail(); } catch (Throwable e) {}
+ try { mh.invokeWithArguments(NAME); fail(); } catch (Throwable e) {}
+ try { Class cls = (Class) mh.invokeExact(NAME); fail(); } catch (Throwable e) {}
+ }
+
+ {
+ final Method fnMethod = Class.class.getMethod("forName", String.class);
+ final MethodType mt = MethodType.methodType(Object.class, Object.class, Object[].class);
+ final MethodHandle mh = MethodHandles.lookup()
+ .findVirtual(Method.class, "invoke", mt)
+ .bindTo(fnMethod);
+
+ try { fnMethod.invoke(null, NAME); fail(); } catch (Throwable e) {}
+
+ try { mh.bindTo(null).bindTo(new Object[]{NAME}).invoke(); fail(); } catch (Throwable e) {}
+ try { mh.invoke(null, new Object[]{NAME}); fail(); } catch (Throwable e) {}
+ try { mh.invokeWithArguments(null, new Object[]{NAME}); fail(); } catch (Throwable e) {}
+ try { mh.invokeWithArguments(Arrays.asList(null, new Object[]{NAME})); fail(); } catch (Throwable e) {}
+ try { Object obj = mh.invokeExact((Object) null, new Object[]{NAME}); fail(); } catch (Throwable e) {}
+ }
+
+ {
+ final Method fnMethod = Class.class.getMethod("forName", String.class);
+ final MethodType mt = MethodType.methodType(Object.class, Object.class, Object[].class);
+
+ final MethodHandle mh = MethodHandles.lookup().bind(fnMethod, "invoke", mt);
+
+ try { mh.bindTo(null).bindTo(new Object[]{NAME}).invoke(); fail(); } catch (Throwable e) {}
+ try { mh.invoke(null, new Object[]{NAME}); fail(); } catch (Throwable e) {}
+ try { mh.invokeWithArguments(null, NAME); fail(); } catch (Throwable e) {}
+ try { mh.invokeWithArguments(Arrays.asList(null, NAME)); fail(); } catch (Throwable e) {}
+ try { Object obj = mh.invokeExact((Object) null, new Object[]{NAME}); fail(); } catch (Throwable e) {}
+ }
+
+ {
+ final Method fnMethod = Class.class.getMethod("forName", String.class);
+ final MethodHandle mh = MethodHandles.lookup().unreflect(fnMethod);
+
+ try { mh.bindTo(NAME).invoke(); fail(); } catch (Throwable e) {}
+ try { mh.invoke(NAME); fail(); } catch (Throwable e) {}
+ try { mh.invokeWithArguments(NAME); fail(); } catch (Throwable e) {}
+ try { mh.invokeWithArguments(Arrays.asList(NAME)); fail(); } catch (Throwable e) {}
+ try { Class cls = (Class) mh.invokeExact(NAME); fail(); } catch (Throwable e) {}
+ }
+
+ if (!isTestFailed) {
+ System.out.println("TEST PASSED");
+ } else {
+ System.out.println("TEST FAILED");
+ System.exit(1);
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/invoke/7196190/MHProxyTest.java Wed Oct 31 08:29:44 2012 -0700
@@ -0,0 +1,181 @@
+/*
+ * 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.
+ *
+ */
+
+/**
+ * @test
+ * @bug 7196190
+ * @summary Improve method of handling MethodHandles
+ *
+ * @run main/othervm MHProxyTest
+ */
+
+import java.lang.invoke.*;
+import java.security.*;
+import static java.lang.invoke.MethodHandles.*;
+import static java.lang.invoke.MethodType.*;
+
+public class MHProxyTest {
+ private static final Class<?> C_Unsafe;
+ private static final MethodHandle MH_getUnsafe;
+ static {
+ // Do these before there is a SM installed.
+ C_Unsafe = sun.misc.Unsafe.class; // EXPECT A WARNING ON THIS LINE
+ Lookup lookup = lookup();
+ MethodHandle gumh = null;
+ try {
+ gumh = lookup.findStatic(C_Unsafe, "getUnsafe", methodType(C_Unsafe));
+ } catch (ReflectiveOperationException ex) {
+ throw new InternalError(ex.toString());
+ }
+ MH_getUnsafe = gumh;
+ // Try some different lookups:
+ try {
+ lookup.in(Object.class).findStatic(C_Unsafe, "getUnsafe", methodType(C_Unsafe));
+ } catch (ReflectiveOperationException ex) {
+ throw new InternalError(ex.toString());
+ }
+ lookup = lookup().in(C_Unsafe);
+ try {
+ lookup.in(C_Unsafe).findStatic(C_Unsafe, "getUnsafe", methodType(C_Unsafe));
+ } catch (ReflectiveOperationException ex) {
+ throw new InternalError(ex.toString());
+ }
+ }
+
+ public static void main(String[] args) throws Throwable {
+ System.setSecurityManager(new SecurityManager());
+ Lookup lookup = lookup();
+ testBasic(lookup);
+ testDoPriv(lookup);
+ testSetVar();
+ Lookup l2 = lookup.in(Object.class);
+ System.out.println("=== "+l2);
+ testBasic(l2);
+ testDoPriv(l2);
+ Lookup l3 = lookup.in(C_Unsafe);
+ System.out.println("=== "+l3);
+ testBasic(l3);
+ testDoPriv(l3);
+ if (failure != null)
+ throw failure;
+ }
+
+ private static Throwable failure;
+ private static void fail(Throwable ex) {
+ if (failure == null)
+ failure = ex;
+ StackTraceElement frame = new Exception().getStackTrace()[1];
+ System.out.printf("Failed at %s:%d: %s\n", frame.getFileName(), frame.getLineNumber(), ex);
+ }
+ private static void ok(Throwable ex) {
+ StackTraceElement frame = new Exception().getStackTrace()[1];
+ System.out.printf("OK at %s:%d: %s\n", frame.getFileName(), frame.getLineNumber(), ex);
+ }
+
+ private static void testBasic(Lookup lookup) throws Throwable {
+ // Verify that we can't get to this guy under the SM:
+ try {
+ MethodHandle badmh = lookup.findStatic(C_Unsafe, "getUnsafe", methodType(C_Unsafe));
+ assert(badmh.type() == methodType(C_Unsafe));
+ badmh = badmh.asType(badmh.type().generic());
+ Object u = C_Unsafe.cast(badmh.invokeExact());
+ assert(C_Unsafe.isInstance(u));
+ fail(new AssertionError("got mh to getUnsafe!"));
+ } catch (SecurityException ex) {
+ ok(ex);
+ }
+ try {
+ Object u = MH_getUnsafe.invokeWithArguments();
+ assert(C_Unsafe.isInstance(u));
+ fail(new AssertionError("got the Unsafe object! (MH invoke)"));
+ } catch (SecurityException ex) {
+ ok(ex);
+ }
+ try {
+ MethodHandle mh = MH_getUnsafe;
+ mh = mh.asType(mh.type().generic());
+ mh = foldArguments(identity(Object.class), mh);
+ mh = filterReturnValue(mh, identity(Object.class));
+ Object u = mh.invokeExact();
+ assert(C_Unsafe.isInstance(u));
+ fail(new AssertionError("got the Unsafe object! (MH invokeWithArguments)"));
+ } catch (SecurityException ex) {
+ ok(ex);
+ }
+ }
+
+ private static void testDoPriv(Lookup lookup) throws Throwable {
+ PrivilegedAction privAct = MethodHandleProxies.asInterfaceInstance(PrivilegedAction.class, MH_getUnsafe);
+ try {
+ Object u = AccessController.doPrivileged(privAct);
+ assert(C_Unsafe.isInstance(u));
+ fail(new AssertionError("got the Unsafe object! (static doPriv)"));
+ } catch (SecurityException ex) {
+ ok(ex);
+ }
+ MethodHandle MH_doPriv = lookup.findStatic(AccessController.class, "doPrivileged",
+ methodType(Object.class, PrivilegedAction.class));
+ MH_doPriv = MH_doPriv.bindTo(privAct);
+ try {
+ Object u = MH_doPriv.invoke();
+ assert(C_Unsafe.isInstance(u));
+ fail(new AssertionError("got the Unsafe object! (MH + doPriv)"));
+ } catch (SecurityException ex) {
+ ok(ex);
+ }
+ // try one more layer of indirection:
+ Runnable rbl = MethodHandleProxies.asInterfaceInstance(Runnable.class, MH_doPriv);
+ try {
+ rbl.run();
+ fail(new AssertionError("got the Unsafe object! (Runnable + MH + doPriv)"));
+ } catch (SecurityException ex) {
+ ok(ex);
+ }
+ }
+
+ private static void testSetVar() throws Throwable {
+ {
+ // Test the box pattern:
+ Object[] box = new Object[1];
+ MethodHandle MH_getFoo = identity(Object.class).bindTo("foo");
+ MethodHandle MH_storeToBox = insertArguments(arrayElementSetter(Object[].class), 0, box, 0);
+ MethodHandle mh = filterReturnValue(MH_getFoo, MH_storeToBox);
+ mh.invokeExact();
+ assert(box[0] == "foo");
+ }
+ {
+ Object[] box = new Object[1];
+ MethodHandle MH_storeToBox = insertArguments(arrayElementSetter(Object[].class), 0, box, 0);
+ MethodHandle mh = filterReturnValue(MH_getUnsafe.asType(MH_getUnsafe.type().generic()), MH_storeToBox);
+ try {
+ mh.invokeExact();
+ Object u = box[0];
+ assert(C_Unsafe.isInstance(u));
+ fail(new AssertionError("got the Unsafe object! (MH + setElement)"));
+ } catch (SecurityException ex) {
+ ok(ex);
+ }
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/invoke/7196190/jtreg.security.policy Wed Oct 31 08:29:44 2012 -0700
@@ -0,0 +1,9 @@
+/*
+ * security policy used by the test process
+ * must allow file reads so that jtreg itself can run
+ */
+
+grant {
+ // standard test activation permissions
+ permission java.io.FilePermission "*", "read";
+};
--- a/jdk/test/java/lang/invoke/BigArityTest.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/test/java/lang/invoke/BigArityTest.java Wed Oct 31 08:29:44 2012 -0700
@@ -70,7 +70,7 @@
MethodHandles.lookup().unreflect(
BigArityTest.class.getDeclaredMethod("hashArguments", Object[].class));
} catch (ReflectiveOperationException ex) {
- throw new InternalError(ex);
+ throw new Error(ex);
}
}
static MethodHandle MH_hashArguments(int arity) {
--- a/jdk/test/java/lang/invoke/PrivateInvokeTest.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/test/java/lang/invoke/PrivateInvokeTest.java Wed Oct 31 08:29:44 2012 -0700
@@ -145,21 +145,21 @@
MH_DEBUG_STRING = DIRECT_INVOKER_LOOKUP
.findVirtual(MethodHandle.class, "debugString", methodType(String.class));
} catch (ReflectiveOperationException ex) {
- throw new InternalError(ex);
+ throw new Error(ex);
}
}
private Object internalMemberName(MethodHandle mh) {
try {
return MH_INTERNAL_MEMBER_NAME.invokeExact(mh);
} catch (Throwable ex) {
- throw new InternalError(ex);
+ throw new Error(ex);
}
}
private String debugString(MethodHandle mh) {
try {
return (String) MH_DEBUG_STRING.invokeExact(mh);
} catch (Throwable ex) {
- throw new InternalError(ex);
+ throw new Error(ex);
}
}
private static MethodHandle directInvoker(int refKind, MethodType mtype) {
--- a/jdk/test/java/net/URL/Test.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/test/java/net/URL/Test.java Wed Oct 31 08:29:44 2012 -0700
@@ -322,10 +322,6 @@
test("ftp://ftp.is.co.za/rfc/rfc1808.txt")
.s("ftp").h("ftp.is.co.za").p("/rfc/rfc1808.txt").z();
- test("gopher://spinaltap.micro.umn.edu/00/Weather/California/Los%20Angeles")
- .s("gopher").h("spinaltap.micro.umn.edu")
- .p("/00/Weather/California/Los%20Angeles").z();
-
test("http://www.math.uio.no/faq/compression-faq/part1.html")
.s("http").h("www.math.uio.no").p("/faq/compression-faq/part1.html").z();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/JMenuItem/4654927/bug4654927.java Wed Oct 31 08:29:44 2012 -0700
@@ -0,0 +1,152 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 4654927
+ * @summary Clicking on Greyed Menuitems closes the Menubar Dropdown
+ * @author Alexander Potochkin
+ * @library ../../regtesthelpers
+ * @build Util
+ * @run main bug4654927
+ */
+
+import javax.swing.*;
+
+import java.awt.*;
+import java.awt.event.InputEvent;
+import java.util.concurrent.Callable;
+import sun.awt.SunToolkit;
+
+public class bug4654927 {
+
+ private static volatile JMenu menu;
+ private static volatile JMenuItem menuItem;
+
+ public static void main(String[] args) throws Exception {
+ String systemLAF = UIManager.getSystemLookAndFeelClassName();
+ // the test is not applicable to Motif L&F
+ if(systemLAF.endsWith("MotifLookAndFeel")){
+ return;
+ }
+
+ UIManager.setLookAndFeel(systemLAF);
+ SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
+ Robot robot = new Robot();
+ robot.setAutoDelay(10);
+
+ SwingUtilities.invokeAndWait(new Runnable() {
+
+ public void run() {
+ createAndShowUI();
+ }
+ });
+ toolkit.realSync();
+
+ // test mouse press
+ Point point = Util.getCenterPoint(menu);
+ robot.mouseMove(point.x, point.y);
+ robot.mousePress(InputEvent.BUTTON1_MASK);
+ robot.mouseRelease(InputEvent.BUTTON1_MASK);
+ toolkit.realSync();
+
+ point = Util.getCenterPoint(menuItem);
+ robot.mouseMove(point.x, point.y);
+ robot.mousePress(InputEvent.BUTTON1_MASK);
+ robot.mouseRelease(InputEvent.BUTTON1_MASK);
+ toolkit.realSync();
+
+ if (!isMenuItemShowing()) {
+ throw new RuntimeException("Popup is unexpectedly closed");
+ }
+
+ // test mouse drag
+ point = Util.getCenterPoint(menu);
+ robot.mouseMove(point.x, point.y);
+ Point menuLocation = Util.invokeOnEDT(new Callable<Point>() {
+
+ @Override
+ public Point call() throws Exception {
+ return menu.getLocationOnScreen();
+ }
+ });
+
+ Point itemLocation = Util.invokeOnEDT(new Callable<Point>() {
+
+ @Override
+ public Point call() throws Exception {
+ return menuItem.getLocationOnScreen();
+ }
+ });
+
+ int x0 = menuLocation.x + 10;
+ int y0 = menuLocation.y + 10;
+ int x1 = itemLocation.x + 10;
+ int y1 = itemLocation.y + 10;
+
+ // close menu
+ robot.mousePress(InputEvent.BUTTON1_MASK);
+ robot.mouseRelease(InputEvent.BUTTON1_MASK);
+ toolkit.realSync();
+
+ robot.mousePress(InputEvent.BUTTON1_MASK);
+ Util.glide(robot, x0, y0, x1, y1);
+ robot.mouseRelease(InputEvent.BUTTON1_MASK);
+ toolkit.realSync();
+
+ if (!isMenuItemShowing()) {
+ throw new RuntimeException("Popup is unexpectedly closed");
+ }
+ }
+
+ private static boolean isMenuItemShowing() throws Exception {
+ return Util.invokeOnEDT(new Callable<Boolean>() {
+
+ @Override
+ public Boolean call() throws Exception {
+ return menuItem.isShowing();
+ }
+ });
+ }
+
+ private static void createAndShowUI() {
+ JFrame frame = new JFrame();
+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+
+ menu = new JMenu("Menu");
+ menu.add(new JMenuItem("menuItem"));
+ menuItem = new JMenuItem("menuItem");
+ menuItem.setEnabled(false);
+ menu.add(menuItem);
+ menu.add(new JMenuItem("menuItem"));
+
+ JMenuBar bar = new JMenuBar();
+ bar.add(menu);
+ frame.setJMenuBar(bar);
+
+ frame.setSize(200, 200);
+ frame.setLocationRelativeTo(null);
+ frame.setVisible(true);
+
+ }
+}
--- a/jdk/test/javax/swing/regtesthelpers/Util.java Mon Oct 29 16:51:59 2012 -0700
+++ b/jdk/test/javax/swing/regtesthelpers/Util.java Wed Oct 31 08:29:44 2012 -0700
@@ -157,6 +157,36 @@
}
/**
+ * Moves mouse smoothly from (x0, y0) to (x1, y1).
+ */
+ public static void glide(Robot robot, int x0, int y0, int x1, int y1) throws AWTException {
+ float dmax = (float) Math.max(Math.abs(x1 - x0), Math.abs(y1 - y0));
+ float dx = (x1 - x0) / dmax;
+ float dy = (y1 - y0) / dmax;
+
+ for (int i = 0; i <= dmax; i += 10) {
+ robot.mouseMove((int) (x0 + dx * i), (int) (y0 + dy * i));
+ }
+ }
+
+ /**
+ * Gets component center point
+ *
+ * @return center point of the <code>component</code>
+ */
+ public static Point getCenterPoint(final Component component) throws Exception {
+ return Util.invokeOnEDT(new Callable<Point>() {
+
+ @Override
+ public Point call() throws Exception {
+ Point p = component.getLocationOnScreen();
+ Dimension size = component.getSize();
+ return new Point(p.x + size.width / 2, p.y + size.height / 2);
+ }
+ });
+ }
+
+ /**
* Invokes the <code>task</code> on the EDT thread.
*
* @return result of the <code>task</code>
--- a/langtools/.hgtags Mon Oct 29 16:51:59 2012 -0700
+++ b/langtools/.hgtags Wed Oct 31 08:29:44 2012 -0700
@@ -182,3 +182,4 @@
804a3fbc86e28a4d9e77c30aa0bd4aa68056f23f jdk8-b58
f299927fc31689385f67ab7322c18eb41d8bd71e jdk8-b59
3d2b98ffcb534b0e5be87bb1f9f68d1518ad7729 jdk8-b60
+26020b247ad3806dbca33e029ee12e1b191f59f9 jdk8-b61
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/scripts/fixpath.pl Wed Oct 31 08:29:44 2012 -0700
@@ -0,0 +1,169 @@
+#!/bin/perl
+
+#
+# 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. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# 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.
+#
+
+# Crunch down the input(s) to Windows short (mangled) form.
+# Any elements not actually found in the filesystem will be dropped.
+#
+# This script needs three modes:
+# 1) DOS mode with drive letter followed by : and ; path separator
+# 2) Cygwin mode with /cygdrive/<drive letter>/ and : path separator
+# 3) MinGW/MSYS mode with /<drive letter>/ and : path separator
+
+use strict;
+use warnings;
+use Getopt::Std;
+
+sub Usage() {
+ print ("Usage:\n $0 -d | -c | -m \<PATH\>\n");
+ print (" -d DOS style (drive letter, :, and ; path separator)\n");
+ print (" -c Cywgin style (/cygdrive/drive/ and : path separator)\n");
+ print (" -m MinGW style (/drive/ and : path separator)\n");
+ exit 1;
+}
+# Process command line options:
+my %opts;
+getopts('dcm', \%opts) || Usage();
+
+if (scalar(@ARGV) != 1) {Usage()};
+
+# Translate drive letters such as C:/
+# if MSDOS, Win32::GetShortPathName() does the work (see below).
+# if Cygwin, use the /cygdrive/c/ form.
+# if MinGW, use the /c/ form.
+my $path0;
+my $sep2;
+if (defined ($opts{'d'})) {
+ #MSDOS
+ $path0 = '';
+ $sep2 = ';';
+} elsif (defined ($opts{'c'})) {
+ #Cygwin
+ $path0 = '/cygdrive';
+ $sep2 = ':';
+} elsif (defined ($opts{'m'})) {
+ #MinGW/MSYS
+ $path0 = '';
+ $sep2 = ':';
+} else {
+ Usage();
+}
+
+my $input = $ARGV[0];
+my $sep1;
+
+# Is the input ';' separated, or ':' separated, or a simple string?
+if (($input =~ tr/;/;/) > 0) {
+ # One or more ';' implies Windows style path.
+ $sep1 = ';';
+} elsif (($input =~ tr/:/:/) > 1) {
+ # Two or more ':' implies Cygwin or MinGW/MSYS style path.
+ $sep1 = ':';
+} else {
+ # Otherwise, this is not a path - take up to the end of string in
+ # one piece.
+ $sep1 = '/$/';
+}
+
+# Split the input on $sep1 PATH separator and process the pieces.
+my @pieces;
+for (split($sep1, $input)) {
+ my $try = $_;
+
+ if (($try =~ /^\/cygdrive\/(.)\/(.*)$/) || ($try =~ /^\/(.)\/(.*)$/)) {
+ # Special case #1: This is a Cygwin /cygrive/<drive letter/ path.
+ # Special case #2: This is a MinGW/MSYS /<drive letter/ path.
+ $try = $1.':/'.$2;
+ } elsif ($try =~ /^\/(.*)$/) {
+ # Special case #3: check for a Cygwin or MinGW/MSYS form with a
+ # leading '/' for example '/usr/bin/bash'.
+ # Look up where this is mounted and rebuild the
+ # $try string with that information
+ my $cmd = "df --portability --all --human-readable $try";
+ my $line = qx ($cmd);
+ my $status = $?;
+ if ($status == 0) {
+ my @lines = split ('\n', $line);
+ my ($device, $junk, $mountpoint);
+ # $lines[0] is the df header.
+ # Example string for split - we want the first and last elements:
+ # C:\jprt\products\P1\MinGW\msys\1.0 200G 78G 123G 39% /usr
+ ($device, $junk, $junk, $junk, $junk, $mountpoint) = split (/\s+/, $lines[1]);
+ # Replace $mountpoint with $device/ in the original string
+ $try =~ s|$mountpoint|$device/|;
+ } else {
+ printf ("Error %d from command %s\n%s\n", $status, $cmd, $line);
+ }
+ }
+
+ my $str = Win32::GetShortPathName($try);
+ if (!defined($str)){
+ # Special case #4: If the lookup did not work, loop through
+ # adding extensions listed in PATHEXT, looking for the first
+ # match.
+ for (split(';', $ENV{'PATHEXT'})) {
+ $str = Win32::GetShortPathName($try.$_);
+ if (defined($str)) {
+ last;
+ }
+ }
+ }
+
+ if (defined($str)){
+ if (!defined($opts{'d'})) {
+ # If not MSDOS, change C: to [/cygdrive]/c/
+ if ($str =~ /^(\S):(.*)$/) {
+ my $path1 = $1;
+ my $path2 = $2;
+ $str = $path0 . '/' . $path1 . '/' . $path2;
+ }
+ }
+ push (@pieces, $str);
+ }
+}
+
+# If input was a PATH, join the pieces back together with $sep2 path
+# separator.
+my $result;
+if (scalar(@pieces > 1)) {
+ $result = join ($sep2, @pieces);
+} else {
+ $result = $pieces[0];
+}
+
+if (defined ($result)) {
+
+ # Change all '\' to '/'
+ $result =~ s/\\/\//g;
+
+ # Remove duplicate '/'
+ $result =~ s/\/\//\//g;
+
+ # Map to lower case
+ $result =~ tr/A-Z/a-z/;
+
+ print ("$result\n");
+}
--- a/make/scripts/vsvars.sh Mon Oct 29 16:51:59 2012 -0700
+++ b/make/scripts/vsvars.sh Wed Oct 31 08:29:44 2012 -0700
@@ -1,7 +1,7 @@
#!/bin/sh
#
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 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
@@ -27,22 +27,6 @@
# variables normally set by the vcvars32.bat or vcvars64.bat file or
# SetEnv.cmd for older SDKs.
-# Use cygpath?
-isCygwin="`uname -s | grep CYGWIN`"
-if [ "${isCygwin}" != "" ] ; then
- cygpath="/usr/bin/cygpath"
- cygpath_short="${cygpath} -m -s"
- cygpath_windows="${cygpath} -w -s"
- cygpath_path="${cygpath} -p"
- pathsep=':'
-else
- cygpath="dosname"
- cygpath_short="${cygpath} -s"
- cygpath_windows="${cygpath} -s"
- cygpath_path="echo"
- pathsep=';'
-fi
-
########################################################################
# Error functions
msg() # message
@@ -60,8 +44,8 @@
}
envpath() # path
{
- if [ "${cygpath_short}" != "" -a -d "$1" ] ; then
- ${cygpath_short} "$1"
+ if [ "${fixpath}" != "" -a -d "$1" ] ; then
+ ${fixpath} "$1"
else
echo "$1"
fi
@@ -72,14 +56,65 @@
# Defaults settings
debug="false"
verbose="false"
-shellStyle="sh"
-parentCsh="` ps -p ${PPID} 2> /dev/null | grep csh `"
-if [ "${parentCsh}" != "" ] ; then
- shellStyle="csh"
-fi
set -e
+CYGWIN="nodosfilewarning ntsec"
+export CYGWIN
+
+# pathsepIn is always ; because the input strings are coming from
+# vcvarsxx.bat. This is true under all of MKS, Cygwin, MINGW/msys
+pathsepIn=';'
+
+OS="`uname -s`"
+case "${OS}" in
+ CYGWIN*)
+ pathflag='-c'
+ devnull=/dev/null
+ pathsepOut=':'
+ ;;
+
+ MINGW*)
+ pathflag='-m'
+ devnull=/dev/null
+ pathsepOut=':'
+ ;;
+
+ *)
+ # MKS?
+ # Continue using dosname -s
+ pathflag='-s'
+ fixpath="dosname ${pathflag}"
+ fixpath_windows="${fixpath}"
+ fixpath_path="echo"
+ devnull=NUL
+ pathsepOut=';'
+ ;;
+esac
+
+case "${OS}" in
+ CYGWIN*|MINGW*)
+ t=`dirname ${0}`
+ wd=`cd ${t} 2> ${devnull} && pwd`
+ fixpath_script="${wd}/fixpath.pl"
+ if [ ! -f "${fixpath_script}" ] ; then
+ error "Does not exist: ${fixpath_script}"
+ fi
+ fixpath="perl ${fixpath_script} ${pathflag}"
+ fixpath_windows="perl ${fixpath_script} -d"
+ fixpath_path="${fixpath_windows}"
+ ;;
+esac
+
+shellStyle="sh"
+## As far as I can tell from hg history, this has not worked
+## for a long time because PPID is unset. When run under Cygwin
+## the script quits due to the 1 return from grep.
+##parentCsh="` ps -p ${PPID} 2> ${devnull} | grep csh `"
+##if [ "${parentCsh}" != "" ] ; then
+## shellStyle="csh"
+##fi
+
# Check environment first
if [ "${PROGRAMFILES}" != "" ] ; then
progfiles=`envpath "${PROGRAMFILES}"`
@@ -96,15 +131,19 @@
# Arch data model
if [ "${PROCESSOR_IDENTIFIER}" != "" ] ; then
arch=`echo "${PROCESSOR_IDENTIFIER}" | cut -d' ' -f1`
-elif [ "${MACHTYPE}" != "" ] ; then
- if [ "`echo ${MACHTYPE} | grep 64`" != "" ] ; then
- # Assume this is X64, not IA64
- arch="x64"
+else
+ if [ "${MACHTYPE}" != "" ] ; then
+ if [ "`echo ${MACHTYPE} | grep 64`" != "" ] ; then
+ # Assume this is X64, not IA64
+ arch="x64"
+ else
+ arch="x86"
+ fi
else
- arch="x86"
+ arch="`uname -m`"
fi
-else
- arch="`uname -m`"
+ PROCESSOR_IDENTIFIER="${arch}"
+ export PROCESSOR_IDENTIFIER
fi
if [ "${arch}" = "X86" -o \
"${arch}" = "386" -o "${arch}" = "i386" -o \
@@ -121,11 +160,11 @@
"${arch}" = "intel64" -o "${arch}" = "Intel64" -o \
"${arch}" = "64" ] ; then
arch="x64"
- binarch64="/amd64"
+ binarch64="\\amd64"
fi
if [ "${arch}" = "IA64" ] ; then
arch="ia64"
- binarch64="/ia64"
+ binarch64="\\ia64"
fi
if [ "${arch}" != "x86" -a "${arch}" != "x64" -a "${arch}" != "ia64" ] ; then
error "No PROCESSOR_IDENTIFIER or MACHTYPE environment variables and uname -m is not helping"
@@ -324,25 +363,26 @@
}
# Remove all duplicate entries
-removeDeadDups() # string sep
+removeDeadDups() # string sepIn sepOut
{
set -e
- sep="$2"
+ sepIn="$2"
+ sepOut="$3"
pathlist="${tmp}/pathlist"
printf "%s\n" "$1" | \
sed -e 's@\\@/@g' | \
sed -e 's@//@/@g' | \
- ${awk} -F"${sep}" '{for(i=1;i<=NF;i++){printf "%s\n",$i;}}' \
+ ${awk} -F"${sepIn}" '{for(i=1;i<=NF;i++){printf "%s\n",$i;}}' \
> ${pathlist}
upaths="${tmp}/upaths"
cat ${pathlist} | while read orig; do
p="${orig}"
- if [ "${cygpath_short}" != "" ] ; then
+ if [ "${fixpath}" != "" ] ; then
if [ "${p}" != "" ] ; then
if [ -d "${p}" ] ; then
- short=`${cygpath_short} "${p}"`
+ short=`${fixpath} "${p}"`
if [ "${short}" != "" -a -d "${short}" ] ; then
- p=`${cygpath} "${short}"`
+ p="${short}"
fi
echo "${p}" >> ${upaths}
fi
@@ -356,11 +396,11 @@
if [ "${newpaths}" = "" ] ; then
newpaths="${i}"
else
- newpaths="${newpaths}${sep}${i}"
+ newpaths="${newpaths}${sepOut}${i}"
fi
done
printf "%s\n" "${newpaths}" | \
- ${awk} -F"${sep}" \
+ ${awk} -F"${sepOut}" \
'{a[$1];printf "%s",$1;for(i=2;i<=NF;i++){if(!($i in a)){a[$i];printf "%s%s",FS,$i;}};printf "\n";}'
}
@@ -388,7 +428,7 @@
set VSINSTALLDIR=
set WindowsSdkDir=
REM Run the vcvars bat file, send all output to stderr
-call `${cygpath_windows} ${bdir}`\\${command} > `${cygpath_windows} "${stdout}"`
+call `${fixpath_windows} ${bdir}`\\${command} > `${fixpath_windows} "${stdout}"`
REM Echo out env var settings
echo VS_VS71COMNTOOLS="%VS71COMNTOOLS%"
echo export VS_VS71COMNTOOLS
@@ -427,9 +467,18 @@
# Create env file
createEnv() # batfile envfile
{
- rm -f ${1}.stdout
- cmd.exe /Q /C `${cygpath_short} $1` | \
- sed -e 's@\\@/@g' | \
+ rm -f ${1}.stdout ${1}.temp1 ${1}.temp2
+ batfile=`${fixpath} ${1}`
+ cmd.exe -Q -C < "$batfile" 1> ${1}.temp1 2> ${1}.temp2
+ cat ${1}.temp1 | \
+ sed -e 's@^Microsoft.*@@' \
+ -e 's@^.*Copyright.*@@' \
+ -e 's@^.*>REM.*@@' \
+ -e 's@^.*>set.*@@' \
+ -e 's@^.*>echo.*@@' \
+ -e 's@^.*>call.*@@' \
+ -e 's@^.*>$@@' \
+ -e 's@\\@/@g' | \
sed -e 's@//@/@g' > $2
if [ -f "${1}.stdout" ] ; then
cat ${1}.stdout 1>&2
@@ -465,7 +514,7 @@
#############################################################################
# Get Visual Studio settings
-if [ "${cygpath}" != "" ] ; then
+if [ "${fixpath}" != "" ] ; then
# Create bat file to run
batfile="${tmp}/vs-to-env.bat"
@@ -485,11 +534,11 @@
. ${envfile}
# Derive unix style path, save old, and define new (remove dups)
- VS_UPATH=`${cygpath_path} "${VS_WPATH}"`
+ VS_UPATH=`${fixpath_path} "${VS_WPATH}"`
export VS_UPATH
VS_OPATH=`printf "%s" "${PATH}" | sed -e 's@\\\\@/@g'`
export VS_OPATH
- VS_PATH=`removeDeadDups "${VS_UPATH}${pathsep}${VS_OPATH}" "${pathsep}"`
+ VS_PATH=`removeDeadDups "${VS_UPATH}${pathsepIn}${VS_OPATH}" "${pathsepIn}" "${pathsepOut}"`
export VS_PATH
fi
@@ -536,11 +585,13 @@
checkPaths "Windows PATH" "${VS_WPATH}" ";"
checkPaths LIB "${VS_LIB}" ";"
checkPaths INCLUDE "${VS_INCLUDE}" ";"
- checkPaths PATH "${VS_PATH}" "${pathsep}"
+ checkPaths PATH "${VS_PATH}" "${pathsepIn}"
fi
# Remove all temp files
-rm -f -r ${tmp}
+if [ "${debug}" != "true" ] ; then
+ rm -f -r ${tmp}
+fi
exit 0