Hello community,
here is the log from the commit of package java-1_9_0-openjdk for
openSUSE:Factory checked in at 2016-02-08 09:48:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/java-1_9_0-openjdk (Old)
and /work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-1_9_0-openjdk"
Changes:
--------
--- /work/SRC/openSUSE:Factory/java-1_9_0-openjdk/java-1_9_0-openjdk.changes
2016-01-28 17:25:15.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new/java-1_9_0-openjdk.changes
2016-02-08 09:48:08.000000000 +0100
@@ -1,0 +2,14 @@
+Fri Jan 29 14:55:05 UTC 2016 - [email protected]
+
+- Upgrade to upstream tag jdk-9+103
+- Modified patches:
+ * 1015432.patch
+ * PStack-808293.patch
+ * zero-ranges.patch
+ * s390-size_t.patch
+ + rediff to the changed context
+- Added patch:
+ * register_ppc.patch
+ + if/endif mismatch in the file register_ppc.hpp
+
+-------------------------------------------------------------------
Old:
----
0868b93587cc.tar.bz2
6149fc30cd71.tar.bz2
6406ecf5d394.tar.bz2
6eb3c8132e48.tar.bz2
9c4662334d93.tar.bz2
9dcf193c0b6c.tar.bz2
d5239fc1b697.tar.bz2
e56208758885.tar.bz2
New:
----
0680fb7dae4d.tar.bz2
47d6462e514b.tar.bz2
94cfc50c1b8a.tar.bz2
bdbf2342b21b.tar.bz2
c5f55130b1b6.tar.bz2
c9406f325a23.tar.bz2
eb5e005a17e5.tar.bz2
eee1ced1d8e7.tar.bz2
register_ppc.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-1_9_0-openjdk.spec ++++++
--- /var/tmp/diff_new_pack.1x09Rr/_old 2016-02-08 09:48:10.000000000 +0100
+++ /var/tmp/diff_new_pack.1x09Rr/_new 2016-02-08 09:48:10.000000000 +0100
@@ -33,17 +33,17 @@
%global minorver 0
%global securityver 0
%global patchver 0
-%global buildver 102
+%global buildver 103
%global root_project jdk9
%global root_repository jdk9
-%global root_revision 6406ecf5d394
-%global corba_revision 9c4662334d93
-%global hotspot_revision d5239fc1b697
-%global jaxp_revision 9dcf193c0b6c
-%global jaxws_revision 0868b93587cc
-%global jdk_revision 6eb3c8132e48
-%global langtools_revision 6149fc30cd71
-%global nashorn_revision e56208758885
+%global root_revision 47d6462e514b
+%global corba_revision 0680fb7dae4d
+%global hotspot_revision c5f55130b1b6
+%global jaxp_revision bdbf2342b21b
+%global jaxws_revision eb5e005a17e5
+%global jdk_revision eee1ced1d8e7
+%global langtools_revision 94cfc50c1b8a
+%global nashorn_revision c9406f325a23
%global icedtea_sound_version 1.0.1
# priority must be 6 digits in total
%global priority 1905
@@ -208,6 +208,8 @@
Patch13: implicit-pointer-decl.patch
# Disable -Werror in hotspot
Patch14: hotspot-nowerror.patch
+# Fix: if(n)def/endif mismatch in register_ppc.hpp
+Patch15: register_ppc.patch
#
# OpenJDK specific patches
#
@@ -476,6 +478,7 @@
%patch12 -p1
%patch13 -p1
%patch14 -p1
+%patch15 -p1
# s390 build fixes
++++++ 0868b93587cc.tar.bz2 -> 0680fb7dae4d.tar.bz2 ++++++
++++ 791854 lines of diff (skipped)
++++++ 1015432.patch ++++++
--- /var/tmp/diff_new_pack.1x09Rr/_old 2016-02-08 09:48:13.000000000 +0100
+++ /var/tmp/diff_new_pack.1x09Rr/_new 2016-02-08 09:48:13.000000000 +0100
@@ -1,9 +1,9 @@
---- jdk9/hotspot/src/os/linux/vm/os_linux.cpp 2014-10-04 01:20:50.155262356
+0200
-+++ jdk9/hotspot/src/os/linux/vm/os_linux.cpp 2014-10-04 01:25:29.323990892
+0200
-@@ -4750,7 +4750,15 @@
- // class initialization depending on 32 or 64 bit VM.
+--- jdk9/hotspot/src/os/linux/vm/os_linux.cpp 2016-01-21 19:16:09.000000000
+0100
++++ jdk9/hotspot/src/os/linux/vm/os_linux.cpp 2016-01-29 15:44:56.154570698
+0100
+@@ -4639,7 +4639,15 @@
os::Linux::min_stack_allowed = MAX2(os::Linux::min_stack_allowed,
-
(size_t)(StackYellowPages+StackRedPages+StackShadowPages) * Linux::page_size() +
+ JavaThread::stack_guard_zone_size() +
+ JavaThread::stack_shadow_zone_size() +
- (2*BytesPerWord COMPILER2_PRESENT(+1))
* Linux::vm_default_page_size());
+ (2*BytesPerWord COMPILER2_PRESENT(+1))
+ *
++++++ 0868b93587cc.tar.bz2 -> 47d6462e514b.tar.bz2 ++++++
++++ 721776 lines of diff (skipped)
++++++ 0868b93587cc.tar.bz2 -> 94cfc50c1b8a.tar.bz2 ++++++
++++ 1355479 lines of diff (skipped)
++++++ PStack-808293.patch ++++++
--- /var/tmp/diff_new_pack.1x09Rr/_old 2016-02-08 09:48:21.000000000 +0100
+++ /var/tmp/diff_new_pack.1x09Rr/_new 2016-02-08 09:48:21.000000000 +0100
@@ -1,5 +1,5 @@
---- jdk8/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/PStack.java
2012-04-06 02:26:33.322164601 +0200
-+++ jdk8/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/PStack.java
2012-04-06 02:26:57.958514071 +0200
+---
jdk9/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/PStack.java
2016-01-21 19:16:09.000000000 +0100
++++
jdk9/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/PStack.java
2016-01-29 15:49:47.815913736 +0100
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights
reserved.
@@ -7,7 +7,7 @@
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
-@@ -84,7 +85,8 @@
+@@ -88,7 +89,8 @@
out.print("----------------- ");
out.print(th);
out.println(" -----------------");
++++++ 0868b93587cc.tar.bz2 -> bdbf2342b21b.tar.bz2 ++++++
++++ 1278607 lines of diff (skipped)
++++++ 0868b93587cc.tar.bz2 -> c5f55130b1b6.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/java-1_9_0-openjdk/0868b93587cc.tar.bz2
/work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new/c5f55130b1b6.tar.bz2 differ:
char 11, line 1
++++++ 0868b93587cc.tar.bz2 -> c9406f325a23.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/java-1_9_0-openjdk/0868b93587cc.tar.bz2
/work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new/c9406f325a23.tar.bz2 differ:
char 11, line 1
++++++ 0868b93587cc.tar.bz2 -> eb5e005a17e5.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaxws-0868b93587cc/.hg_archival.txt
new/jaxws-eb5e005a17e5/.hg_archival.txt
--- old/jaxws-0868b93587cc/.hg_archival.txt 2016-01-14 17:08:18.000000000
+0100
+++ new/jaxws-eb5e005a17e5/.hg_archival.txt 2016-01-21 19:15:38.000000000
+0100
@@ -1,4 +1,4 @@
repo: 0961a4a211765fea071b8dac419003ee0c3d5973
-node: 0868b93587cc99df3a4f4d3817a1aa756bea60ab
+node: eb5e005a17e50d7d8340daaf21a5c3c5ae358d68
branch: default
-tag: jdk-9+102
+tag: jdk-9+103
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaxws-0868b93587cc/.hgtags
new/jaxws-eb5e005a17e5/.hgtags
--- old/jaxws-0868b93587cc/.hgtags 2016-01-14 17:08:18.000000000 +0100
+++ new/jaxws-eb5e005a17e5/.hgtags 2016-01-21 19:15:38.000000000 +0100
@@ -347,3 +347,4 @@
97b31ca0dd77483cf20ff99a033a455673639578 jdk-9+99
d0a97e57d2336238edf6a4cd60aafe67deb7258d jdk-9+100
3e99318616da903e0dc8f07f9f9203dc1bd49921 jdk-9+101
+0868b93587cc99df3a4f4d3817a1aa756bea60ab jdk-9+102
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxws-0868b93587cc/src/java.xml.bind/share/classes/javax/xml/bind/JAXBContextFactory.java
new/jaxws-eb5e005a17e5/src/java.xml.bind/share/classes/javax/xml/bind/JAXBContextFactory.java
---
old/jaxws-0868b93587cc/src/java.xml.bind/share/classes/javax/xml/bind/JAXBContextFactory.java
2016-01-14 17:08:18.000000000 +0100
+++
new/jaxws-eb5e005a17e5/src/java.xml.bind/share/classes/javax/xml/bind/JAXBContextFactory.java
2016-01-21 19:15:38.000000000 +0100
@@ -32,7 +32,7 @@
*
* JAXBContextFactory can be located using {@link
java.util.ServiceLoader#load(Class)}
*
- * @since 1.9, JAXB 2.3
+ * @since 9, JAXB 2.3
*/
public interface JAXBContextFactory {
@@ -68,7 +68,7 @@
* @throws IllegalArgumentException
* if the parameter contains {@code null} (i.e., {@code
newInstance(null,someMap);})
*
- * @since 1.9, JAXB 2.3
+ * @since 9, JAXB 2.3
*/
JAXBContext createContext(Class<?>[] classesToBeBound,
Map<String, ?> properties ) throws JAXBException;
@@ -100,7 +100,7 @@
* <li>failure to locate a value for the context factory provider
property</li>
* <li>mixing schema derived packages from different providers on the
same contextPath</li>
* </ol>
- * @since 1.9, JAXB 2.3
+ * @since 9, JAXB 2.3
*/
JAXBContext createContext(String contextPath,
ClassLoader classLoader,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxws-0868b93587cc/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerMgr.java
new/jaxws-eb5e005a17e5/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerMgr.java
---
old/jaxws-0868b93587cc/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerMgr.java
2016-01-14 17:08:18.000000000 +0100
+++
new/jaxws-eb5e005a17e5/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerMgr.java
2016-01-21 19:15:38.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, 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
@@ -38,6 +38,8 @@
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.logging.Logger;
+import java.util.Optional;
+
/**
* Manages all the WebService HTTP servers created by JAXWS runtime.
@@ -81,24 +83,38 @@
synchronized(servers) {
state = servers.get(inetAddress);
if (state == null) {
- logger.fine("Creating new HTTP Server at "+inetAddress);
- // Creates server with default socket backlog
- server = HttpServer.create(inetAddress, 0);
- server.setExecutor(Executors.newCachedThreadPool());
- String path = url.toURI().getPath();
- logger.fine("Creating HTTP Context at = "+path);
- HttpContext context = server.createContext(path);
- server.start();
-
- // we have to get actual inetAddress from server, which
can differ from the original in some cases.
- // e.g. A port number of zero will let the system pick up
an ephemeral port in a bind operation,
- // or IP: 0.0.0.0 - which is used to monitor network
traffic from any valid IP address
- inetAddress = server.getAddress();
-
- logger.fine("HTTP server started = "+inetAddress);
- state = new ServerState(server, path);
- servers.put(inetAddress, state);
- return context;
+ final int finalPortNum = port;
+ Optional<ServerState> stateOpt =
+ servers.values()
+ .stream()
+ .filter(s -> s.getServer()
+ .getAddress()
+ .getPort() ==
finalPortNum)
+ .findAny();
+
+ if (inetAddress.getAddress().isAnyLocalAddress() &&
+ stateOpt.isPresent()) {
+ state = stateOpt.get();
+ } else {
+ logger.fine("Creating new HTTP Server at
"+inetAddress);
+ // Creates server with default socket backlog
+ server = HttpServer.create(inetAddress, 0);
+ server.setExecutor(Executors.newCachedThreadPool());
+ String path = url.toURI().getPath();
+ logger.fine("Creating HTTP Context at = "+path);
+ HttpContext context = server.createContext(path);
+ server.start();
+
+ // we have to get actual inetAddress from server,
which can differ from the original in some cases.
+ // e.g. A port number of zero will let the system pick
up an ephemeral port in a bind operation,
+ // or IP: 0.0.0.0 - which is used to monitor network
traffic from any valid IP address
+ inetAddress = server.getAddress();
+
+ logger.fine("HTTP server started = "+inetAddress);
+ state = new ServerState(server, path);
+ servers.put(inetAddress, state);
+ return context;
+ }
}
}
server = state.getServer();
++++++ 0868b93587cc.tar.bz2 -> eee1ced1d8e7.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/java-1_9_0-openjdk/0868b93587cc.tar.bz2
/work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new/eee1ced1d8e7.tar.bz2 differ:
char 11, line 1
++++++ register_ppc.patch ++++++
--- jdk9/hotspot/src/cpu/ppc/vm/register_ppc.hpp 2016-01-21
19:16:09.000000000 +0100
+++ jdk9/hotspot/src/cpu/ppc/vm/register_ppc.hpp 2016-01-29
20:17:13.100500168 +0100
@@ -638,7 +638,6 @@
#define R26_monitor AS_REGISTER(Register, R26)
#define R27_constPoolCache AS_REGISTER(Register, R27)
#define R28_mdx AS_REGISTER(Register, R28)
-#endif
#define R19_inline_cache_reg AS_REGISTER(Register, R19)
#define R29_TOC AS_REGISTER(Register, R29)
++++++ s390-size_t.patch ++++++
--- /var/tmp/diff_new_pack.1x09Rr/_old 2016-02-08 09:48:28.000000000 +0100
+++ /var/tmp/diff_new_pack.1x09Rr/_new 2016-02-08 09:48:28.000000000 +0100
@@ -1,6 +1,6 @@
---- jdk9/hotspot/src/share/vm/code/codeCache.cpp 2015-10-30
18:28:53.000000000 +0100
-+++ jdk9/hotspot/src/share/vm/code/codeCache.cpp 2015-11-12
07:58:54.003086663 +0100
-@@ -300,7 +300,7 @@
+--- jdk9/hotspot/src/share/vm/code/codeCache.cpp 2016-01-21
19:16:09.000000000 +0100
++++ jdk9/hotspot/src/share/vm/code/codeCache.cpp 2016-01-29
19:21:47.292805291 +0100
+@@ -376,7 +376,7 @@
_heaps->append(heap);
// Reserve Space
@@ -9,38 +9,38 @@
size_initial = round_to(size_initial, os::vm_page_size());
if (!heap->reserve(rs, size_initial, CodeCacheSegmentSize)) {
vm_exit_during_initialization("Could not reserve enough space for code
cache");
---- jdk9/hotspot/src/share/vm/gc/cms/compactibleFreeListSpace.cpp
2015-10-30 18:28:53.000000000 +0100
-+++ jdk9/hotspot/src/share/vm/gc/cms/compactibleFreeListSpace.cpp
2015-11-12 07:58:54.003086663 +0100
-@@ -2627,7 +2627,7 @@
- if (ResizeOldPLAB && CMSOldPLABResizeQuicker) {
- size_t multiple =
_num_blocks[word_sz]/(CMSOldPLABToleranceFactor*CMSOldPLABNumRefills*n_blks);
+--- jdk9/hotspot/src/share/vm/gc/cms/compactibleFreeListSpace.cpp
2016-01-21 19:16:09.000000000 +0100
++++ jdk9/hotspot/src/share/vm/gc/cms/compactibleFreeListSpace.cpp
2016-01-29 19:21:47.292805291 +0100
+@@ -2517,7 +2517,7 @@
+ //
+ size_t multiple = (size_t)
(_num_blocks[word_sz]/(((double)CMSOldPLABToleranceFactor)*CMSOldPLABNumRefills*n_blks));
n_blks += CMSOldPLABReactivityFactor*multiple*n_blks;
- n_blks = MIN2(n_blks, CMSOldPLABMax);
+ n_blks = MIN2(n_blks, (size_t)CMSOldPLABMax);
}
assert(n_blks > 0, "Error");
_cfls->par_get_chunk_of_blocks(word_sz, n_blks, fl);
---- jdk9/hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp
2015-10-30 18:28:53.000000000 +0100
-+++ jdk9/hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp
2015-11-12 07:58:54.007086572 +0100
-@@ -789,7 +789,7 @@
+--- jdk9/hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp
2016-01-21 19:16:09.000000000 +0100
++++ jdk9/hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp
2016-01-29 19:22:54.235278152 +0100
+@@ -752,7 +752,7 @@
if (free_percentage < desired_free_percentage) {
size_t desired_capacity = (size_t)(used() / ((double) 1 -
desired_free_percentage));
assert(desired_capacity >= capacity(), "invalid expansion size");
- size_t expand_bytes = MAX2(desired_capacity - capacity(),
MinHeapDeltaBytes);
+ size_t expand_bytes = MAX2(desired_capacity - capacity(),
(size_t)MinHeapDeltaBytes);
- if (PrintGCDetails && Verbose) {
+ LogHandle(gc) log;
+ if (log.is_trace()) {
size_t desired_capacity = (size_t)(used() / ((double) 1 -
desired_free_percentage));
- gclog_or_tty->print_cr("\nFrom compute_new_size: ");
-@@ -5723,7 +5723,7 @@
- HeapWord* curAddr = _markBitMap.startWord();
- while (curAddr < _markBitMap.endWord()) {
- size_t remaining = pointer_delta(_markBitMap.endWord(), curAddr);
-- MemRegion chunk(curAddr, MIN2(CMSBitMapYieldQuantum, remaining));
+@@ -5494,7 +5494,7 @@
+ HeapWord* curAddr = _markBitMap.startWord();
+ while (curAddr < _markBitMap.endWord()) {
+ size_t remaining = pointer_delta(_markBitMap.endWord(), curAddr);
+- MemRegion chunk(curAddr, MIN2(CMSBitMapYieldQuantum, remaining));
+ MemRegion chunk(curAddr, MIN2((size_t)CMSBitMapYieldQuantum,
remaining));
- _markBitMap.clear_large_range(chunk);
- if (ConcurrentMarkSweepThread::should_yield() &&
- !foregroundGCIsActive() &&
-@@ -6011,7 +6011,7 @@
+ _markBitMap.clear_large_range(chunk);
+ if (ConcurrentMarkSweepThread::should_yield() &&
+ !foregroundGCIsActive() &&
+@@ -5776,7 +5776,7 @@
return;
}
// Double capacity if possible
@@ -49,9 +49,9 @@
// Do not give up existing stack until we have managed to
// get the double capacity that we desired.
ReservedSpace rs(ReservedSpace::allocation_align_size_up(
---- jdk9/hotspot/src/share/vm/gc/cms/parNewGeneration.cpp 2015-10-30
18:28:53.000000000 +0100
-+++ jdk9/hotspot/src/share/vm/gc/cms/parNewGeneration.cpp 2015-11-12
07:58:54.007086572 +0100
-@@ -200,7 +200,7 @@
+--- jdk9/hotspot/src/share/vm/gc/cms/parNewGeneration.cpp 2016-01-21
19:16:09.000000000 +0100
++++ jdk9/hotspot/src/share/vm/gc/cms/parNewGeneration.cpp 2016-01-29
19:21:47.300805109 +0100
+@@ -194,7 +194,7 @@
const size_t num_overflow_elems = of_stack->size();
const size_t space_available = queue->max_elems() - queue->size();
const size_t num_take_elems = MIN3(space_available / 4,
@@ -60,9 +60,9 @@
num_overflow_elems);
// Transfer the most recent num_take_elems from the overflow
// stack to our work queue.
---- jdk9/hotspot/src/share/vm/gc/g1/concurrentMark.cpp 2015-10-30
18:28:53.000000000 +0100
-+++ jdk9/hotspot/src/share/vm/gc/g1/concurrentMark.cpp 2015-11-12
07:58:54.007086572 +0100
-@@ -3430,7 +3430,7 @@
+--- jdk9/hotspot/src/share/vm/gc/g1/concurrentMark.cpp 2016-01-21
19:16:09.000000000 +0100
++++ jdk9/hotspot/src/share/vm/gc/g1/concurrentMark.cpp 2016-01-29
19:21:47.300805109 +0100
+@@ -2933,7 +2933,7 @@
// of things to do) or totally (at the very end).
size_t target_size;
if (partially) {
@@ -71,19 +71,19 @@
} else {
target_size = 0;
}
---- jdk9/hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp 2015-10-30
18:28:53.000000000 +0100
-+++ jdk9/hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp 2015-11-12
07:58:54.011086482 +0100
-@@ -1700,7 +1700,7 @@
+--- jdk9/hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp 2016-01-21
19:16:09.000000000 +0100
++++ jdk9/hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp 2016-01-29
19:21:47.300805109 +0100
+@@ -1641,7 +1641,7 @@
verify_region_sets_optional();
- size_t expand_bytes = MAX2(word_size * HeapWordSize, MinHeapDeltaBytes);
+ size_t expand_bytes = MAX2(word_size * HeapWordSize,
(size_t)MinHeapDeltaBytes);
- ergo_verbose1(ErgoHeapSizing,
- "attempt heap expansion",
- ergo_format_reason("allocation request failed")
---- jdk9/hotspot/src/share/vm/gc/g1/g1PageBasedVirtualSpace.hpp
2015-10-30 18:28:53.000000000 +0100
-+++ jdk9/hotspot/src/share/vm/gc/g1/g1PageBasedVirtualSpace.hpp
2015-11-12 07:58:54.011086482 +0100
+ log_debug(gc, ergo, heap)("Attempt heap expansion (allocation request
failed). Allocation request: " SIZE_FORMAT "B",
+ word_size * HeapWordSize);
+
+--- jdk9/hotspot/src/share/vm/gc/g1/g1PageBasedVirtualSpace.hpp
2016-01-21 19:16:09.000000000 +0100
++++ jdk9/hotspot/src/share/vm/gc/g1/g1PageBasedVirtualSpace.hpp
2016-01-29 19:21:47.304805017 +0100
@@ -89,7 +89,7 @@
void pretouch_internal(size_t start_page, size_t end_page);
@@ -93,8 +93,8 @@
// Returns the address of the given page index.
char* page_start(size_t index) const;
---- jdk9/hotspot/src/share/vm/gc/parallel/psCompactionManager.inline.hpp
2015-10-30 18:28:53.000000000 +0100
-+++ jdk9/hotspot/src/share/vm/gc/parallel/psCompactionManager.inline.hpp
2015-11-12 07:58:54.011086482 +0100
+--- jdk9/hotspot/src/share/vm/gc/parallel/psCompactionManager.inline.hpp
2016-01-21 19:16:09.000000000 +0100
++++ jdk9/hotspot/src/share/vm/gc/parallel/psCompactionManager.inline.hpp
2016-01-29 19:21:47.304805017 +0100
@@ -119,7 +119,7 @@
const size_t beg_index = size_t(index);
assert(beg_index < len || len == 0, "index too large");
@@ -104,9 +104,9 @@
const size_t end_index = beg_index + stride;
T* const base = (T*)obj->base();
T* const beg = base + beg_index;
---- jdk9/hotspot/src/share/vm/gc/parallel/psParallelCompact.cpp
2015-10-30 18:28:53.000000000 +0100
-+++ jdk9/hotspot/src/share/vm/gc/parallel/psParallelCompact.cpp
2015-11-12 07:58:54.011086482 +0100
-@@ -893,8 +893,8 @@
+--- jdk9/hotspot/src/share/vm/gc/parallel/psParallelCompact.cpp
2016-01-21 19:16:09.000000000 +0100
++++ jdk9/hotspot/src/share/vm/gc/parallel/psParallelCompact.cpp
2016-01-29 19:21:47.304805017 +0100
+@@ -898,8 +898,8 @@
void PSParallelCompact::initialize_dead_wood_limiter()
{
const size_t max = 100;
@@ -117,9 +117,9 @@
_dwl_first_term = 1.0 / (sqrt(2.0 * M_PI) * _dwl_std_dev);
DEBUG_ONLY(_dwl_initialized = true;)
_dwl_adjustment = normal_distribution(1.0);
---- jdk9/hotspot/src/share/vm/gc/shared/collectorPolicy.cpp 2015-10-30
18:28:53.000000000 +0100
-+++ jdk9/hotspot/src/share/vm/gc/shared/collectorPolicy.cpp 2015-11-12
07:58:54.011086482 +0100
-@@ -454,7 +454,7 @@
+--- jdk9/hotspot/src/share/vm/gc/shared/collectorPolicy.cpp 2016-01-21
19:16:09.000000000 +0100
++++ jdk9/hotspot/src/share/vm/gc/shared/collectorPolicy.cpp 2016-01-29
19:21:47.304805017 +0100
+@@ -452,7 +452,7 @@
// yield a size that is too small) and bound it by MaxNewSize above.
// Ergonomics plays here by previously calculating the desired
// NewSize and MaxNewSize.
@@ -128,7 +128,7 @@
}
// Given the maximum young size, determine the initial and
-@@ -484,7 +484,7 @@
+@@ -482,7 +482,7 @@
// NewSize as the floor, because if NewRatio is overly large, the
resulting
// size can be too small.
_initial_young_size =
@@ -137,9 +137,9 @@
}
}
---- jdk9/hotspot/src/share/vm/gc/shared/plab.cpp 2015-10-30
18:28:53.000000000 +0100
-+++ jdk9/hotspot/src/share/vm/gc/shared/plab.cpp 2015-11-12
07:58:54.011086482 +0100
-@@ -31,7 +31,7 @@
+--- jdk9/hotspot/src/share/vm/gc/shared/plab.cpp 2016-01-21
19:16:09.000000000 +0100
++++ jdk9/hotspot/src/share/vm/gc/shared/plab.cpp 2016-01-29
19:21:47.304805017 +0100
+@@ -32,7 +32,7 @@
size_t PLAB::min_size() {
// Make sure that we return something that is larger than AlignmentReserve
@@ -148,9 +148,9 @@
}
size_t PLAB::max_size() {
---- jdk9/hotspot/src/share/vm/memory/metaspace.cpp 2015-10-30
18:28:53.000000000 +0100
-+++ jdk9/hotspot/src/share/vm/memory/metaspace.cpp 2015-11-12
07:58:54.011086482 +0100
-@@ -1435,7 +1435,7 @@
+--- jdk9/hotspot/src/share/vm/memory/metaspace.cpp 2016-01-21
19:16:09.000000000 +0100
++++ jdk9/hotspot/src/share/vm/memory/metaspace.cpp 2016-01-29
19:21:47.304805017 +0100
+@@ -1438,7 +1438,7 @@
void MetaspaceGC::post_initialize() {
// Reset the high-water mark once the VM initialization is done.
@@ -159,25 +159,25 @@
}
bool MetaspaceGC::can_expand(size_t word_size, bool is_class) {
-@@ -1495,7 +1495,7 @@
+@@ -1498,7 +1498,7 @@
(size_t)MIN2(min_tmp, double(max_uintx));
// Don't shrink less than the initial generation size
minimum_desired_capacity = MAX2(minimum_desired_capacity,
- MetaspaceSize);
+ (size_t)MetaspaceSize);
- if (PrintGCDetails && Verbose) {
- gclog_or_tty->print_cr("\nMetaspaceGC::compute_new_size: ");
-@@ -1554,7 +1554,7 @@
+ log_trace(gc, metaspace)("MetaspaceGC::compute_new_size: ");
+ log_trace(gc, metaspace)(" minimum_free_percentage: %6.2f
maximum_used_percentage: %6.2f",
+@@ -1544,7 +1544,7 @@
const double max_tmp = used_after_gc / minimum_used_percentage;
size_t maximum_desired_capacity = (size_t)MIN2(max_tmp,
double(max_uintx));
maximum_desired_capacity = MAX2(maximum_desired_capacity,
- MetaspaceSize);
+ (size_t)MetaspaceSize);
- if (PrintGCDetails && Verbose) {
- gclog_or_tty->print_cr(" "
- " maximum_free_percentage: %6.2f"
-@@ -3343,7 +3343,7 @@
+ log_trace(gc, metaspace)(" maximum_free_percentage: %6.2f
minimum_used_percentage: %6.2f",
+ maximum_free_percentage,
minimum_used_percentage);
+ log_trace(gc, metaspace)(" minimum_desired_capacity: %6.1fKB
maximum_desired_capacity: %6.1fKB",
+@@ -3231,7 +3231,7 @@
// on the medium chunk list. The next chunk will be small and progress
// from there. This size calculated by -version.
_first_class_chunk_word_size = MIN2((size_t)MediumChunk*6,
@@ -186,9 +186,9 @@
_first_class_chunk_word_size =
align_word_size_up(_first_class_chunk_word_size);
// Arbitrarily set the initial virtual space to a multiple
// of the boot class loader size.
---- jdk9/hotspot/src/share/vm/prims/whitebox.cpp 2015-10-30
18:28:53.000000000 +0100
-+++ jdk9/hotspot/src/share/vm/prims/whitebox.cpp 2015-11-12
07:58:54.011086482 +0100
-@@ -821,7 +821,7 @@
+--- jdk9/hotspot/src/share/vm/prims/whitebox.cpp 2016-01-21
19:16:09.000000000 +0100
++++ jdk9/hotspot/src/share/vm/prims/whitebox.cpp 2016-01-29
19:21:47.304805017 +0100
+@@ -880,7 +880,7 @@
WB_END
WB_ENTRY(jobject, WB_GetSizeTVMFlag(JNIEnv* env, jobject o, jstring name))
@@ -197,9 +197,9 @@
if (GetVMFlag <size_t> (thread, env, name, &result,
&CommandLineFlags::size_tAt)) {
ThreadToNativeFromVM ttnfv(thread); // can't be in VM when we call JNI
return longBox(thread, env, result);
---- jdk9/hotspot/src/share/vm/runtime/arguments.cpp 2015-10-30
18:28:53.000000000 +0100
-+++ jdk9/hotspot/src/share/vm/runtime/arguments.cpp 2015-11-12
07:58:54.011086482 +0100
-@@ -1448,7 +1448,7 @@
+--- jdk9/hotspot/src/share/vm/runtime/arguments.cpp 2016-01-21
19:16:09.000000000 +0100
++++ jdk9/hotspot/src/share/vm/runtime/arguments.cpp 2016-01-29
19:21:47.304805017 +0100
+@@ -1490,7 +1490,7 @@
// Increase the code cache size - tiered compiles a lot more.
if (FLAG_IS_DEFAULT(ReservedCodeCacheSize)) {
FLAG_SET_ERGO(uintx, ReservedCodeCacheSize,
@@ -208,9 +208,9 @@
}
// Enable SegmentedCodeCache if TieredCompilation is enabled and
ReservedCodeCacheSize >= 240M
if (FLAG_IS_DEFAULT(SegmentedCodeCache) && ReservedCodeCacheSize >= 240*M) {
---- jdk9/hotspot/src/share/vm/runtime/arguments.hpp 2015-10-30
18:28:53.000000000 +0100
-+++ jdk9/hotspot/src/share/vm/runtime/arguments.hpp 2015-11-12
07:58:54.015086392 +0100
-@@ -286,7 +286,7 @@
+--- jdk9/hotspot/src/share/vm/runtime/arguments.hpp 2016-01-21
19:16:09.000000000 +0100
++++ jdk9/hotspot/src/share/vm/runtime/arguments.hpp 2016-01-29
19:21:47.304805017 +0100
+@@ -287,7 +287,7 @@
// Value of the conservative maximum heap alignment needed
static size_t _conservative_max_heap_alignment;
++++++ zero-ranges.patch ++++++
--- /var/tmp/diff_new_pack.1x09Rr/_old 2016-02-08 09:48:28.000000000 +0100
+++ /var/tmp/diff_new_pack.1x09Rr/_new 2016-02-08 09:48:28.000000000 +0100
@@ -1,8 +1,8 @@
---- jdk9/hotspot/src/cpu/zero/vm/globals_zero.hpp 2015-10-29
16:42:24.000000000 +0100
-+++ jdk9/hotspot/src/cpu/zero/vm/globals_zero.hpp 2015-11-11
11:37:35.414294308 +0100
-@@ -49,9 +49,9 @@
- #define DEFAULT_STACK_RED_PAGES (1)
+--- jdk9/hotspot/src/cpu/zero/vm/globals_zero.hpp 2016-01-21
19:16:09.000000000 +0100
++++ jdk9/hotspot/src/cpu/zero/vm/globals_zero.hpp 2016-01-29
15:52:57.611610069 +0100
+@@ -50,9 +50,9 @@
#define DEFAULT_STACK_SHADOW_PAGES (5 LP64_ONLY(+1) DEBUG_ONLY(+3))
+ #define DEFAULT_STACK_RESERVED_PAGES (0)
-#define MIN_STACK_YELLOW_PAGES DEFAULT_STACK_YELLOW_PAGES
-#define MIN_STACK_RED_PAGES DEFAULT_STACK_RED_PAGES
@@ -10,6 +10,6 @@
+#define MIN_STACK_YELLOW_PAGES 1
+#define MIN_STACK_RED_PAGES 1
+#define MIN_STACK_SHADOW_PAGES 1
+ #define MIN_STACK_RESERVED_PAGES (0)
define_pd_global(intx, StackYellowPages, DEFAULT_STACK_YELLOW_PAGES);
- define_pd_global(intx, StackRedPages, DEFAULT_STACK_RED_PAGES);
