/hg/icedtea7-forest/hotspot: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Sat Feb 4 23:03:02 UTC 2017
changeset 64864fbb5a99 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=64864fbb5a99
author: jwilhelm
date: Sat Feb 04 19:38:29 2017 +0000
8000351, PR3316: Tenuring threshold should be unsigned
Summary: Change the flags and variables related to tenuring threshold to be unsigned
Reviewed-by: jmasa, johnc
changeset 9f62ddd4cf11 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=9f62ddd4cf11
author: hseigel
date: Sat Feb 04 20:00:32 2017 +0000
7102489, PR3316: RFE: cleanup jlong typedef on __APPLE__and _LLP64 systems.
Summary: Define jlong as long on all LP64 platforms and add JLONG_FORMAT macro.
Reviewed-by: dholmes, coleenp, mikael, kvn
changeset 9a1457cc02ae in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=9a1457cc02ae
author: dholmes
date: Sat Feb 04 23:06:39 2017 +0000
8170888, PR3316: [linux] Experimental support for cgroup memory limits in container (ie Docker) environments
Summary: Set apparent physical memory to cgroup memory limit when UseCGroupMemoryLimitForHeap is true
Reviewed-by: acorn, gtriantafill
Contributed-by: Christine Flood <chf at redhat.com>
diffstat:
src/cpu/x86/vm/jni_x86.h | 9 +-
src/os/bsd/vm/os_bsd.inline.hpp | 10 +--
src/os/linux/vm/os_linux.inline.hpp | 10 +--
src/os/posix/launcher/java_md.c | 7 +-
src/os/posix/launcher/java_md.h | 8 +-
src/os/solaris/vm/os_solaris.inline.hpp | 5 +-
src/os/windows/launcher/java_md.c | 7 +-
src/os/windows/launcher/java_md.h | 4 +-
src/os/windows/vm/os_windows.cpp | 6 +-
src/os/windows/vm/os_windows.inline.hpp | 3 -
src/share/tools/launcher/java.c | 4 +-
src/share/tools/launcher/java.h | 3 +-
src/share/vm/c1/c1_InstructionPrinter.cpp | 4 +-
src/share/vm/c1/c1_LIR.cpp | 4 +-
src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp | 6 +-
src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp | 4 +-
src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp | 4 +-
src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp | 6 +-
src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp | 8 +-
src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp | 4 +-
src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp | 6 +-
src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp | 2 +-
src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp | 6 +-
src/share/vm/gc_implementation/parallelScavenge/psScavenge.hpp | 6 +-
src/share/vm/gc_implementation/shared/adaptiveSizePolicy.cpp | 4 +-
src/share/vm/gc_implementation/shared/adaptiveSizePolicy.hpp | 4 +-
src/share/vm/gc_implementation/shared/ageTable.cpp | 12 +-
src/share/vm/gc_implementation/shared/ageTable.hpp | 4 +-
src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.hpp | 2 +-
src/share/vm/memory/defNewGeneration.hpp | 4 +-
src/share/vm/memory/threadLocalAllocBuffer.hpp | 2 +-
src/share/vm/memory/universe.cpp | 2 +-
src/share/vm/oops/markOop.hpp | 8 +-
src/share/vm/oops/oop.hpp | 2 +-
src/share/vm/oops/oop.inline.hpp | 2 +-
src/share/vm/opto/idealGraphPrinter.cpp | 4 +-
src/share/vm/opto/type.cpp | 10 +-
src/share/vm/runtime/aprofiler.cpp | 4 +-
src/share/vm/runtime/arguments.cpp | 39 ++++++++-
src/share/vm/runtime/biasedLocking.cpp | 2 +-
src/share/vm/runtime/globals.hpp | 22 +++--
src/share/vm/runtime/os.hpp | 4 -
src/share/vm/runtime/perfData.cpp | 4 +-
src/share/vm/runtime/virtualspace.cpp | 4 +-
src/share/vm/runtime/vmStructs.cpp | 2 +-
src/share/vm/services/diagnosticArgument.cpp | 6 +-
src/share/vm/services/heapDumper.cpp | 4 +-
src/share/vm/services/lowMemoryDetector.cpp | 4 +-
src/share/vm/utilities/globalDefinitions.hpp | 8 ++
src/share/vm/utilities/globalDefinitions_gcc.hpp | 6 +-
src/share/vm/utilities/ostream.cpp | 6 +-
src/share/vm/utilities/taskqueue.cpp | 6 +-
52 files changed, 163 insertions(+), 154 deletions(-)
diffs (truncated from 1187 to 500 lines):
diff -r 2ab0ba56ac3a -r 9a1457cc02ae src/cpu/x86/vm/jni_x86.h
--- a/src/cpu/x86/vm/jni_x86.h Fri Nov 18 13:19:50 2016 -0500
+++ b/src/cpu/x86/vm/jni_x86.h Sat Feb 04 23:06:39 2017 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -38,14 +38,9 @@
#define JNICALL
typedef int jint;
-#if defined(_LP64) && !defined(__APPLE__)
+#if defined(_LP64)
typedef long jlong;
#else
- /*
- * On _LP64 __APPLE__ "long" and "long long" are both 64 bits,
- * but we use the "long long" typedef to avoid complaints from
- * the __APPLE__ compiler about fprintf formats.
- */
typedef long long jlong;
#endif
diff -r 2ab0ba56ac3a -r 9a1457cc02ae src/os/bsd/vm/os_bsd.inline.hpp
--- a/src/os/bsd/vm/os_bsd.inline.hpp Fri Nov 18 13:19:50 2016 -0500
+++ b/src/os/bsd/vm/os_bsd.inline.hpp Sat Feb 04 23:06:39 2017 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -59,14 +59,6 @@
return ":";
}
-inline const char* os::jlong_format_specifier() {
- return "%lld";
-}
-
-inline const char* os::julong_format_specifier() {
- return "%llu";
-}
-
// File names are case-sensitive on windows only
inline int os::file_name_strcmp(const char* s1, const char* s2) {
return strcmp(s1, s2);
diff -r 2ab0ba56ac3a -r 9a1457cc02ae src/os/linux/vm/os_linux.inline.hpp
--- a/src/os/linux/vm/os_linux.inline.hpp Fri Nov 18 13:19:50 2016 -0500
+++ b/src/os/linux/vm/os_linux.inline.hpp Sat Feb 04 23:06:39 2017 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -74,14 +74,6 @@
return ":";
}
-inline const char* os::jlong_format_specifier() {
- return "%lld";
-}
-
-inline const char* os::julong_format_specifier() {
- return "%llu";
-}
-
// File names are case-sensitive on windows only
inline int os::file_name_strcmp(const char* s1, const char* s2) {
return strcmp(s1, s2);
diff -r 2ab0ba56ac3a -r 9a1457cc02ae src/os/posix/launcher/java_md.c
--- a/src/os/posix/launcher/java_md.c Fri Nov 18 13:19:50 2016 -0500
+++ b/src/os/posix/launcher/java_md.c Sat Feb 04 23:06:39 2017 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1887,11 +1887,6 @@
}
}
-const char *
-jlong_format_specifier() {
- return "%lld";
-}
-
/*
* Block current thread and continue execution in a new thread
*/
diff -r 2ab0ba56ac3a -r 9a1457cc02ae src/os/posix/launcher/java_md.h
--- a/src/os/posix/launcher/java_md.h Fri Nov 18 13:19:50 2016 -0500
+++ b/src/os/posix/launcher/java_md.h Sat Feb 04 23:06:39 2017 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -64,6 +64,12 @@
#define Counter2Micros(counts) (1)
#endif /* HAVE_GETHRTIME */
+#ifdef _LP64
+#define JLONG_FORMAT "%ld"
+#else
+#define JLONG_FORMAT "%lld"
+#endif
+
/*
* Function prototypes.
*/
diff -r 2ab0ba56ac3a -r 9a1457cc02ae src/os/solaris/vm/os_solaris.inline.hpp
--- a/src/os/solaris/vm/os_solaris.inline.hpp Fri Nov 18 13:19:50 2016 -0500
+++ b/src/os/solaris/vm/os_solaris.inline.hpp Sat Feb 04 23:06:39 2017 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -50,9 +50,6 @@
inline const char* os::line_separator() { return "\n"; }
inline const char* os::path_separator() { return ":"; }
-inline const char* os::jlong_format_specifier() { return "%lld"; }
-inline const char* os::julong_format_specifier() { return "%llu"; }
-
// File names are case-sensitive on windows only
inline int os::file_name_strcmp(const char* s1, const char* s2) {
return strcmp(s1, s2);
diff -r 2ab0ba56ac3a -r 9a1457cc02ae src/os/windows/launcher/java_md.c
--- a/src/os/windows/launcher/java_md.c Fri Nov 18 13:19:50 2016 -0500
+++ b/src/os/windows/launcher/java_md.c Sat Feb 04 23:06:39 2017 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1323,11 +1323,6 @@
}
}
-const char *
-jlong_format_specifier() {
- return "%I64d";
-}
-
/*
* Block current thread and continue execution in a new thread
*/
diff -r 2ab0ba56ac3a -r 9a1457cc02ae src/os/windows/launcher/java_md.h
--- a/src/os/windows/launcher/java_md.h Fri Nov 18 13:19:50 2016 -0500
+++ b/src/os/windows/launcher/java_md.h Sat Feb 04 23:06:39 2017 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -69,6 +69,8 @@
extern int _main(int argc, char **argv);
#endif
+#define JLONG_FORMAT "%I64d"
+
/*
* Function prototypes.
*/
diff -r 2ab0ba56ac3a -r 9a1457cc02ae src/os/windows/vm/os_windows.cpp
--- a/src/os/windows/vm/os_windows.cpp Fri Nov 18 13:19:50 2016 -0500
+++ b/src/os/windows/vm/os_windows.cpp Sat Feb 04 23:06:39 2017 +0000
@@ -3051,7 +3051,7 @@
}
if( Verbose && PrintMiscellaneous ) {
reserveTimer.stop();
- tty->print_cr("reserve_memory of %Ix bytes took %ld ms (%ld ticks)", bytes,
+ tty->print_cr("reserve_memory of %Ix bytes took " JLONG_FORMAT " ms (" JLONG_FORMAT " ticks)", bytes,
reserveTimer.milliseconds(), reserveTimer.ticks());
}
}
@@ -4484,7 +4484,7 @@
if (hFile == NULL) {
if (PrintMiscellaneous && Verbose) {
DWORD err = GetLastError();
- tty->print_cr("CreateFile() failed: GetLastError->%ld.");
+ tty->print_cr("CreateFile() failed: GetLastError->%ld.", err);
}
return NULL;
}
@@ -4534,7 +4534,7 @@
if (hMap == NULL) {
if (PrintMiscellaneous && Verbose) {
DWORD err = GetLastError();
- tty->print_cr("CreateFileMapping() failed: GetLastError->%ld.");
+ tty->print_cr("CreateFileMapping() failed: GetLastError->%ld.", err);
}
CloseHandle(hFile);
return NULL;
diff -r 2ab0ba56ac3a -r 9a1457cc02ae src/os/windows/vm/os_windows.inline.hpp
--- a/src/os/windows/vm/os_windows.inline.hpp Fri Nov 18 13:19:50 2016 -0500
+++ b/src/os/windows/vm/os_windows.inline.hpp Sat Feb 04 23:06:39 2017 +0000
@@ -37,9 +37,6 @@
inline const char* os::path_separator() { return ";"; }
inline const char* os::dll_file_extension() { return ".dll"; }
-inline const char* os::jlong_format_specifier() { return "%I64d"; }
-inline const char* os::julong_format_specifier() { return "%I64u"; }
-
inline const int os::default_file_open_flags() { return O_BINARY | O_NOINHERIT;}
// File names are case-insensitive on windows only
diff -r 2ab0ba56ac3a -r 9a1457cc02ae src/share/tools/launcher/java.c
--- a/src/share/tools/launcher/java.c Fri Nov 18 13:19:50 2016 -0500
+++ b/src/share/tools/launcher/java.c Sat Feb 04 23:06:39 2017 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -808,7 +808,7 @@
static int
parse_stack_size(const char *s, jlong *result) {
jlong n = 0;
- int args_read = sscanf(s, jlong_format_specifier(), &n);
+ int args_read = sscanf(s, JLONG_FORMAT, &n);
if (args_read != 1) {
return 0;
}
diff -r 2ab0ba56ac3a -r 9a1457cc02ae src/share/tools/launcher/java.h
--- a/src/share/tools/launcher/java.h Fri Nov 18 13:19:50 2016 -0500
+++ b/src/share/tools/launcher/java.h Sat Feb 04 23:06:39 2017 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -86,7 +86,6 @@
jboolean RemovableMachineDependentOption(char * option);
void PrintMachineDependentOptions();
-const char *jlong_format_specifier();
/*
* Block current thread and continue execution in new thread
*/
diff -r 2ab0ba56ac3a -r 9a1457cc02ae src/share/vm/c1/c1_InstructionPrinter.cpp
--- a/src/share/vm/c1/c1_InstructionPrinter.cpp Fri Nov 18 13:19:50 2016 -0500
+++ b/src/share/vm/c1/c1_InstructionPrinter.cpp Sat Feb 04 23:06:39 2017 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -360,7 +360,7 @@
ValueType* t = x->type();
switch (t->tag()) {
case intTag : output()->print("%d" , t->as_IntConstant ()->value()); break;
- case longTag : output()->print(os::jlong_format_specifier(), t->as_LongConstant()->value()); output()->print("L"); break;
+ case longTag : output()->print(JLONG_FORMAT, t->as_LongConstant()->value()); output()->print("L"); break;
case floatTag : output()->print("%g" , t->as_FloatConstant ()->value()); break;
case doubleTag : output()->print("%gD" , t->as_DoubleConstant()->value()); break;
case objectTag : print_object(x); break;
diff -r 2ab0ba56ac3a -r 9a1457cc02ae src/share/vm/c1/c1_LIR.cpp
--- a/src/share/vm/c1/c1_LIR.cpp Fri Nov 18 13:19:50 2016 -0500
+++ b/src/share/vm/c1/c1_LIR.cpp Sat Feb 04 23:06:39 2017 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1581,7 +1581,7 @@
switch (type()) {
case T_ADDRESS:out->print("address:%d",as_jint()); break;
case T_INT: out->print("int:%d", as_jint()); break;
- case T_LONG: out->print("lng:%lld", as_jlong()); break;
+ case T_LONG: out->print("lng:" JLONG_FORMAT, as_jlong()); break;
case T_FLOAT: out->print("flt:%f", as_jfloat()); break;
case T_DOUBLE: out->print("dbl:%f", as_jdouble()); break;
case T_OBJECT: out->print("obj:0x%x", as_jobject()); break;
diff -r 2ab0ba56ac3a -r 9a1457cc02ae src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp
--- a/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp Fri Nov 18 13:19:50 2016 -0500
+++ b/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp Sat Feb 04 23:06:39 2017 +0000
@@ -1198,9 +1198,9 @@
set_promo_size(desired_promo_size);
}
-int CMSAdaptiveSizePolicy::compute_survivor_space_size_and_threshold(
+uint CMSAdaptiveSizePolicy::compute_survivor_space_size_and_threshold(
bool is_survivor_overflow,
- int tenuring_threshold,
+ uint tenuring_threshold,
size_t survivor_limit) {
assert(survivor_limit >= generation_alignment(),
"survivor_limit too small");
@@ -1318,7 +1318,7 @@
gclog_or_tty->print( " avg_promoted_padded_avg: %f"
" avg_pretenured_padded_avg: %f"
- " tenuring_thresh: %d"
+ " tenuring_thresh: %u"
" target_size: " SIZE_FORMAT
" survivor_limit: " SIZE_FORMAT,
gch->gc_stats(1)->avg_promoted()->padded_average(),
diff -r 2ab0ba56ac3a -r 9a1457cc02ae src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp
--- a/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp Fri Nov 18 13:19:50 2016 -0500
+++ b/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp Sat Feb 04 23:06:39 2017 +0000
@@ -440,9 +440,9 @@
size_t max_eden_size);
// Calculates new survivor space size; returns a new tenuring threshold
// value. Stores new survivor size in _survivor_size.
- virtual int compute_survivor_space_size_and_threshold(
+ virtual uint compute_survivor_space_size_and_threshold(
bool is_survivor_overflow,
- int tenuring_threshold,
+ uint tenuring_threshold,
size_t survivor_limit);
virtual void compute_tenured_generation_free_space(size_t cur_tenured_free,
diff -r 2ab0ba56ac3a -r 9a1457cc02ae src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
--- a/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp Fri Nov 18 13:19:50 2016 -0500
+++ b/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp Sat Feb 04 23:06:39 2017 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -556,7 +556,7 @@
reportIndexedFreeListStatistics();
size_t total_size = totalSizeInIndexedFreeLists() +
_dictionary->total_chunk_size(DEBUG_ONLY(freelistLock()));
- gclog_or_tty->print(" free=%ld frag=%1.4f\n", total_size, flsFrag());
+ gclog_or_tty->print(" free=" SIZE_FORMAT " frag=%1.4f\n", total_size, flsFrag());
}
}
diff -r 2ab0ba56ac3a -r 9a1457cc02ae src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
--- a/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp Fri Nov 18 13:19:50 2016 -0500
+++ b/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp Sat Feb 04 23:06:39 2017 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -3483,7 +3483,7 @@
if (Verbose && PrintGC) {
size_t new_mem_size = _virtual_space.committed_size();
size_t old_mem_size = new_mem_size - bytes;
- gclog_or_tty->print_cr("Expanding %s from %ldK by %ldK to %ldK",
+ gclog_or_tty->print_cr("Expanding %s from " SIZE_FORMAT "K by " SIZE_FORMAT "K to " SIZE_FORMAT "K",
name(), old_mem_size/K, bytes/K, new_mem_size/K);
}
}
@@ -9538,7 +9538,7 @@
if (Verbose && PrintGCDetails) {
size_t new_mem_size = _virtual_space.committed_size();
size_t old_mem_size = new_mem_size + bytes;
- gclog_or_tty->print_cr("Shrinking %s from %ldK by %ldK to %ldK",
+ gclog_or_tty->print_cr("Shrinking %s from " SIZE_FORMAT "K by " SIZE_FORMAT "K to " SIZE_FORMAT "K",
name(), old_mem_size/K, bytes/K, new_mem_size/K);
}
}
diff -r 2ab0ba56ac3a -r 9a1457cc02ae src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp
--- a/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp Fri Nov 18 13:19:50 2016 -0500
+++ b/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp Sat Feb 04 23:06:39 2017 +0000
@@ -854,8 +854,8 @@
//
// Current tenuring threshold, set to 0 if the collector reaches the
- // maximum amount of suvivors regions.
- int _tenuring_threshold;
+ // maximum amount of survivors regions.
+ uint _tenuring_threshold;
// The limit on the number of regions allocated for survivors.
uint _max_survivor_regions;
@@ -872,7 +872,7 @@
size_t _eden_capacity_bytes_before_gc; // Eden capacity before GC
size_t _heap_capacity_bytes_before_gc; // Heap capacity before GC
- // The amount of survor regions after a collection.
+ // The amount of survivor regions after a collection.
uint _recorded_survivor_regions;
// List of survivor regions.
HeapRegion* _recorded_survivor_head;
@@ -884,7 +884,7 @@
uint tenuring_threshold() const { return _tenuring_threshold; }
inline GCAllocPurpose
- evacuation_destination(HeapRegion* src_region, int age, size_t word_sz) {
+ evacuation_destination(HeapRegion* src_region, uint age, size_t word_sz) {
if (age < _tenuring_threshold && src_region->is_young()) {
return GCAllocForSurvived;
} else {
diff -r 2ab0ba56ac3a -r 9a1457cc02ae src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp
--- a/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp Fri Nov 18 13:19:50 2016 -0500
+++ b/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp Sat Feb 04 23:06:39 2017 +0000
@@ -975,9 +975,9 @@
return promo_heap_delta;
}
-int PSAdaptiveSizePolicy::compute_survivor_space_size_and_threshold(
+uint PSAdaptiveSizePolicy::compute_survivor_space_size_and_threshold(
bool is_survivor_overflow,
- int tenuring_threshold,
+ uint tenuring_threshold,
size_t survivor_limit) {
assert(survivor_limit >= _intra_generation_alignment,
"survivor_limit too small");
diff -r 2ab0ba56ac3a -r 9a1457cc02ae src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp
--- a/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp Fri Nov 18 13:19:50 2016 -0500
+++ b/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp Sat Feb 04 23:06:39 2017 +0000
@@ -353,9 +353,9 @@
// Calculates new survivor space size; returns a new tenuring threshold
// value. Stores new survivor size in _survivor_size.
- int compute_survivor_space_size_and_threshold(bool is_survivor_overflow,
- int tenuring_threshold,
- size_t survivor_limit);
+ uint compute_survivor_space_size_and_threshold(bool is_survivor_overflow,
+ uint tenuring_threshold,
+ size_t survivor_limit);
// Return the maximum size of a survivor space if the young generation were of
// size gen_size.
diff -r 2ab0ba56ac3a -r 9a1457cc02ae src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp
--- a/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp Fri Nov 18 13:19:50 2016 -0500
+++ b/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp Sat Feb 04 23:06:39 2017 +0000
@@ -86,7 +86,7 @@
if (!promote_immediately) {
// Find the objects age, MT safe.
- int age = (test_mark->has_displaced_mark_helper() /* o->has_displaced_mark() */) ?
+ uint age = (test_mark->has_displaced_mark_helper() /* o->has_displaced_mark() */) ?
test_mark->displaced_mark_helper()->age() : test_mark->age();
// Try allocating obj in to-space (unless too old)
diff -r 2ab0ba56ac3a -r 9a1457cc02ae src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp
--- a/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp Fri Nov 18 13:19:50 2016 -0500
+++ b/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp Sat Feb 04 23:06:39 2017 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -72,7 +72,7 @@
ReferenceProcessor* PSScavenge::_ref_processor = NULL;
CardTableExtension* PSScavenge::_card_table = NULL;
bool PSScavenge::_survivor_overflow = false;
-int PSScavenge::_tenuring_threshold = 0;
+uint PSScavenge::_tenuring_threshold = 0;
HeapWord* PSScavenge::_young_generation_boundary = NULL;
elapsedTimer PSScavenge::_accumulated_time;
STWGCTimer PSScavenge::_gc_timer;
@@ -583,7 +583,7 @@
if (PrintTenuringDistribution) {
gclog_or_tty->cr();
- gclog_or_tty->print_cr("Desired survivor size %ld bytes, new threshold %d (max %d)",
+ gclog_or_tty->print_cr("Desired survivor size " SIZE_FORMAT " bytes, new threshold %u (max %u)",
size_policy->calculated_survivor_size_in_bytes(),
_tenuring_threshold, MaxTenuringThreshold);
}
diff -r 2ab0ba56ac3a -r 9a1457cc02ae src/share/vm/gc_implementation/parallelScavenge/psScavenge.hpp
--- a/src/share/vm/gc_implementation/parallelScavenge/psScavenge.hpp Fri Nov 18 13:19:50 2016 -0500
+++ b/src/share/vm/gc_implementation/parallelScavenge/psScavenge.hpp Sat Feb 04 23:06:39 2017 +0000
@@ -69,7 +69,7 @@
static PSIsAliveClosure _is_alive_closure; // Closure used for reference processing
static CardTableExtension* _card_table; // We cache the card table for fast access.
static bool _survivor_overflow; // Overflow this collection
- static int _tenuring_threshold; // tenuring threshold for next scavenge
+ static uint _tenuring_threshold; // tenuring threshold for next scavenge
static elapsedTimer _accumulated_time; // total time spent on scavenge
static STWGCTimer _gc_timer; // GC time book keeper
More information about the distro-pkg-dev
mailing list