--- a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/SALauncher.java Fri Mar 11 16:39:38 2016 +0100
+++ b/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/SALauncher.java Mon Mar 14 13:20:14 2016 +0000
@@ -30,6 +30,7 @@
import sun.jvm.hotspot.tools.JStack;
import sun.jvm.hotspot.tools.JMap;
import sun.jvm.hotspot.tools.JInfo;
+import sun.jvm.hotspot.tools.JSnap;
public class SALauncher {
@@ -39,6 +40,7 @@
System.out.println(" jstack --help\tto get more information");
System.out.println(" jmap --help\tto get more information");
System.out.println(" jinfo --help\tto get more information");
+ System.out.println(" jsnap --help\tto get more information");
return false;
}
@@ -85,6 +87,11 @@
return commonHelp();
}
+ private static boolean jsnapHelp() {
+ System.out.println(" <no option>\tdump performance counters");
+ return commonHelp();
+ }
+
private static boolean toolHelp(String toolName) {
if (toolName.equals("jstack")) {
return jstackHelp();
@@ -95,6 +102,9 @@
if (toolName.equals("jmap")) {
return jmapHelp();
}
+ if (toolName.equals("jsnap")) {
+ return jsnapHelp();
+ }
if (toolName.equals("hsdb") || toolName.equals("clhsdb")) {
return commonHelp();
}
@@ -308,6 +318,40 @@
JInfo.main(newArgs.toArray(new String[newArgs.size()]));
}
+ private static void runJSNAP(String[] oldArgs) {
+ SAGetopt sg = new SAGetopt(oldArgs);
+ String[] longOpts = {"exe=", "core=", "pid="};
+
+ ArrayList<String> newArgs = new ArrayList();
+ String exeORpid = null;
+ String core = null;
+ String s = null;
+
+ while((s = sg.next(null, longOpts)) != null) {
+ if (s.equals("exe")) {
+ exeORpid = sg.getOptarg();
+ continue;
+ }
+ if (s.equals("core")) {
+ core = sg.getOptarg();
+ continue;
+ }
+ if (s.equals("pid")) {
+ exeORpid = sg.getOptarg();
+ continue;
+ }
+ }
+
+ if (exeORpid != null) {
+ newArgs.add(exeORpid);
+ if (core != null) {
+ newArgs.add(core);
+ }
+ }
+
+ JSnap.main(newArgs.toArray(new String[newArgs.size()]));
+ }
+
public static void main(String[] args) {
// Provide a help
if (args.length == 0) {
@@ -355,5 +399,10 @@
runJINFO(oldArgs);
return;
}
+
+ if (args[0].equals("jsnap")) {
+ runJSNAP(oldArgs);
+ return;
+ }
}
}
--- a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/CompactHashTable.java Fri Mar 11 16:39:38 2016 +0100
+++ b/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/CompactHashTable.java Mon Mar 14 13:20:14 2016 +0000
@@ -81,6 +81,12 @@
}
public Symbol probe(byte[] name, long hash) {
+
+ if (bucketCount() == 0) {
+ // The table is invalid, so don't try to lookup
+ return null;
+ }
+
long symOffset;
Symbol sym;
Address baseAddress = baseAddressField.getValue(addr);
--- a/hotspot/src/share/vm/classfile/classFileParser.cpp Fri Mar 11 16:39:38 2016 +0100
+++ b/hotspot/src/share/vm/classfile/classFileParser.cpp Mon Mar 14 13:20:14 2016 +0000
@@ -5358,12 +5358,12 @@
ik->print_loading_log(LogLevel::Debug, _loader_data, _stream);
}
- if (log_is_enabled(Info, classresolve)) {
+ if (log_is_enabled(Debug, classresolve)) {
ResourceMark rm;
// print out the superclass.
const char * from = ik->external_name();
if (ik->java_super() != NULL) {
- log_info(classresolve)("%s %s (super)",
+ log_debug(classresolve)("%s %s (super)",
from,
ik->java_super()->external_name());
}
@@ -5374,7 +5374,7 @@
for (int i = 0; i < length; i++) {
const Klass* const k = local_interfaces->at(i);
const char * to = k->external_name();
- log_info(classresolve)("%s %s (interface)", from, to);
+ log_debug(classresolve)("%s %s (interface)", from, to);
}
}
}
--- a/hotspot/src/share/vm/classfile/javaClasses.cpp Fri Mar 11 16:39:38 2016 +0100
+++ b/hotspot/src/share/vm/classfile/javaClasses.cpp Mon Mar 14 13:20:14 2016 +0000
@@ -1687,7 +1687,7 @@
public:
BacktraceIterator(objArrayHandle result, Thread* thread) {
init(result, thread);
- assert(_methods->length() == java_lang_Throwable::trace_chunk_size, "lengths don't match");
+ assert(_methods.is_null() || _methods->length() == java_lang_Throwable::trace_chunk_size, "lengths don't match");
}
BacktraceElement next(Thread* thread) {
--- a/hotspot/src/share/vm/classfile/verificationType.cpp Fri Mar 11 16:39:38 2016 +0100
+++ b/hotspot/src/share/vm/classfile/verificationType.cpp Mon Mar 14 13:20:14 2016 +0000
@@ -61,7 +61,7 @@
Klass* obj = SystemDictionary::resolve_or_fail(
name(), Handle(THREAD, klass->class_loader()),
Handle(THREAD, klass->protection_domain()), true, CHECK_false);
- if (log_is_enabled(Info, classresolve)) {
+ if (log_is_enabled(Debug, classresolve)) {
Verifier::trace_class_resolution(obj, klass());
}
@@ -80,7 +80,7 @@
Klass* from_class = SystemDictionary::resolve_or_fail(
from.name(), Handle(THREAD, klass->class_loader()),
Handle(THREAD, klass->protection_domain()), true, CHECK_false);
- if (log_is_enabled(Info, classresolve)) {
+ if (log_is_enabled(Debug, classresolve)) {
Verifier::trace_class_resolution(from_class, klass());
}
return InstanceKlass::cast(from_class)->is_subclass_of(this_class());
--- a/hotspot/src/share/vm/classfile/verifier.cpp Fri Mar 11 16:39:38 2016 +0100
+++ b/hotspot/src/share/vm/classfile/verifier.cpp Mon Mar 14 13:20:14 2016 +0000
@@ -107,9 +107,9 @@
const char* resolve = resolve_class->external_name();
// print in a single call to reduce interleaving between threads
if (source_file != NULL) {
- log_info(classresolve)("%s %s %s (verification)", verify, resolve, source_file);
+ log_debug(classresolve)("%s %s %s (verification)", verify, resolve, source_file);
} else {
- log_info(classresolve)("%s %s (verification)", verify, resolve);
+ log_debug(classresolve)("%s %s (verification)", verify, resolve);
}
}
@@ -205,7 +205,7 @@
ResourceMark rm(THREAD);
instanceKlassHandle kls =
SystemDictionary::resolve_or_fail(exception_name, true, CHECK_false);
- if (log_is_enabled(Info, classresolve)) {
+ if (log_is_enabled(Debug, classresolve)) {
Verifier::trace_class_resolution(kls(), klass());
}
@@ -1994,7 +1994,7 @@
name, Handle(THREAD, loader), Handle(THREAD, protection_domain),
true, THREAD);
- if (log_is_enabled(Info, classresolve)) {
+ if (log_is_enabled(Debug, classresolve)) {
instanceKlassHandle cur_class = current_class();
Verifier::trace_class_resolution(kls, cur_class());
}
--- a/hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp Fri Mar 11 16:39:38 2016 +0100
+++ b/hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp Mon Mar 14 13:20:14 2016 +0000
@@ -1412,7 +1412,7 @@
if (_foregroundGCShouldWait) {
// We are going to be waiting for action for the CMS thread;
// it had better not be gone (for instance at shutdown)!
- assert(ConcurrentMarkSweepThread::cmst() != NULL,
+ assert(ConcurrentMarkSweepThread::cmst() != NULL && !ConcurrentMarkSweepThread::cmst()->has_terminated(),
"CMS thread must be running");
// Wait here until the background collector gives us the go-ahead
ConcurrentMarkSweepThread::clear_CMS_flag(
@@ -2286,17 +2286,16 @@
// all marking, then check if the new marks-vector is
// a subset of the CMS marks-vector.
verify_after_remark_work_1();
- } else if (CMSRemarkVerifyVariant == 2) {
+ } else {
+ guarantee(CMSRemarkVerifyVariant == 2, "Range checking for CMSRemarkVerifyVariant should guarantee 1 or 2");
// In this second variant of verification, we flag an error
// (i.e. an object reachable in the new marks-vector not reachable
// in the CMS marks-vector) immediately, also indicating the
// identify of an object (A) that references the unmarked object (B) --
// presumably, a mutation to A failed to be picked up by preclean/remark?
verify_after_remark_work_2();
- } else {
- warning("Unrecognized value " UINTX_FORMAT " for CMSRemarkVerifyVariant",
- CMSRemarkVerifyVariant);
- }
+ }
+
return true;
}
@@ -3649,7 +3648,7 @@
// XXX FIX ME!!! YSR
size_t loops = 0, workdone = 0, cumworkdone = 0, waited = 0;
while (!(should_abort_preclean() ||
- ConcurrentMarkSweepThread::should_terminate())) {
+ ConcurrentMarkSweepThread::cmst()->should_terminate())) {
workdone = preclean_work(CMSPrecleanRefLists2, CMSPrecleanSurvivors2);
cumworkdone += workdone;
loops++;
--- a/hotspot/src/share/vm/gc/cms/concurrentMarkSweepThread.cpp Fri Mar 11 16:39:38 2016 +0100
+++ b/hotspot/src/share/vm/gc/cms/concurrentMarkSweepThread.cpp Mon Mar 14 13:20:14 2016 +0000
@@ -42,7 +42,6 @@
ConcurrentMarkSweepThread* ConcurrentMarkSweepThread::_cmst = NULL;
CMSCollector* ConcurrentMarkSweepThread::_collector = NULL;
-bool ConcurrentMarkSweepThread::_should_terminate = false;
int ConcurrentMarkSweepThread::_CMS_flag = CMS_nil;
volatile jint ConcurrentMarkSweepThread::_pending_yields = 0;
@@ -62,88 +61,60 @@
set_name("CMS Main Thread");
- if (os::create_thread(this, os::cgc_thread)) {
- // An old comment here said: "Priority should be just less
- // than that of VMThread". Since the VMThread runs at
- // NearMaxPriority, the old comment was inaccurate, but
- // changing the default priority to NearMaxPriority-1
- // could change current behavior, so the default of
- // NearMaxPriority stays in place.
- //
- // Note that there's a possibility of the VMThread
- // starving if UseCriticalCMSThreadPriority is on.
- // That won't happen on Solaris for various reasons,
- // but may well happen on non-Solaris platforms.
- int native_prio;
- if (UseCriticalCMSThreadPriority) {
- native_prio = os::java_to_os_priority[CriticalPriority];
- } else {
- native_prio = os::java_to_os_priority[NearMaxPriority];
- }
- os::set_native_priority(this, native_prio);
+ // An old comment here said: "Priority should be just less
+ // than that of VMThread". Since the VMThread runs at
+ // NearMaxPriority, the old comment was inaccurate, but
+ // changing the default priority to NearMaxPriority-1
+ // could change current behavior, so the default of
+ // NearMaxPriority stays in place.
+ //
+ // Note that there's a possibility of the VMThread
+ // starving if UseCriticalCMSThreadPriority is on.
+ // That won't happen on Solaris for various reasons,
+ // but may well happen on non-Solaris platforms.
+ create_and_start(UseCriticalCMSThreadPriority ? CriticalPriority : NearMaxPriority);
- if (!DisableStartThread) {
- os::start_thread(this);
- }
- }
_sltMonitor = SLT_lock;
}
-void ConcurrentMarkSweepThread::run() {
+void ConcurrentMarkSweepThread::run_service() {
assert(this == cmst(), "just checking");
- initialize_in_thread();
- // From this time Thread::current() should be working.
- assert(this == Thread::current(), "just checking");
if (BindCMSThreadToCPU && !os::bind_to_processor(CPUForCMSThread)) {
log_warning(gc)("Couldn't bind CMS thread to processor " UINTX_FORMAT, CPUForCMSThread);
}
- // Wait until Universe::is_fully_initialized()
+
{
- CMSLoopCountWarn loopX("CMS::run", "waiting for "
- "Universe::is_fully_initialized()", 2);
MutexLockerEx x(CGC_lock, true);
set_CMS_flag(CMS_cms_wants_token);
- // Wait until Universe is initialized and all initialization is completed.
- while (!is_init_completed() && !Universe::is_fully_initialized() &&
- !_should_terminate) {
- CGC_lock->wait(true, 200);
- loopX.tick();
- }
+ assert(is_init_completed() && Universe::is_fully_initialized(), "ConcurrentGCThread::run() should have waited for this.");
+
// Wait until the surrogate locker thread that will do
// pending list locking on our behalf has been created.
// We cannot start the SLT thread ourselves since we need
// to be a JavaThread to do so.
CMSLoopCountWarn loopY("CMS::run", "waiting for SLT installation", 2);
- while (_slt == NULL && !_should_terminate) {
+ while (_slt == NULL && !should_terminate()) {
CGC_lock->wait(true, 200);
loopY.tick();
}
clear_CMS_flag(CMS_cms_wants_token);
}
- while (!_should_terminate) {
+ while (!should_terminate()) {
sleepBeforeNextCycle();
- if (_should_terminate) break;
+ if (should_terminate()) break;
GCIdMark gc_id_mark;
GCCause::Cause cause = _collector->_full_gc_requested ?
_collector->_full_gc_cause : GCCause::_cms_concurrent_mark;
_collector->collect_in_background(cause);
}
- assert(_should_terminate, "just checking");
+
// Check that the state of any protocol for synchronization
// between background (CMS) and foreground collector is "clean"
// (i.e. will not potentially block the foreground collector,
// requiring action by us).
verify_ok_to_terminate();
- // Signal that it is terminated
- {
- MutexLockerEx mu(Terminator_lock,
- Mutex::_no_safepoint_check_flag);
- assert(_cmst == this, "Weird!");
- _cmst = NULL;
- Terminator_lock->notify();
- }
}
#ifndef PRODUCT
@@ -157,39 +128,24 @@
// create and start a new ConcurrentMarkSweep Thread for given CMS generation
ConcurrentMarkSweepThread* ConcurrentMarkSweepThread::start(CMSCollector* collector) {
- if (!_should_terminate) {
- assert(cmst() == NULL, "start() called twice?");
- ConcurrentMarkSweepThread* th = new ConcurrentMarkSweepThread(collector);
- assert(cmst() == th, "Where did the just-created CMS thread go?");
- return th;
- }
- return NULL;
+ guarantee(_cmst == NULL, "start() called twice!");
+ ConcurrentMarkSweepThread* th = new ConcurrentMarkSweepThread(collector);
+ assert(_cmst == th, "Where did the just-created CMS thread go?");
+ return th;
}
-void ConcurrentMarkSweepThread::stop() {
- // it is ok to take late safepoints here, if needed
- {
- MutexLockerEx x(Terminator_lock);
- _should_terminate = true;
- }
- { // Now post a notify on CGC_lock so as to nudge
- // CMS thread(s) that might be slumbering in
- // sleepBeforeNextCycle.
- MutexLockerEx x(CGC_lock, Mutex::_no_safepoint_check_flag);
- CGC_lock->notify_all();
- }
- { // Now wait until (all) CMS thread(s) have exited
- MutexLockerEx x(Terminator_lock);
- while(cmst() != NULL) {
- Terminator_lock->wait();
- }
- }
+void ConcurrentMarkSweepThread::stop_service() {
+ // Now post a notify on CGC_lock so as to nudge
+ // CMS thread(s) that might be slumbering in
+ // sleepBeforeNextCycle.
+ MutexLockerEx x(CGC_lock, Mutex::_no_safepoint_check_flag);
+ CGC_lock->notify_all();
}
void ConcurrentMarkSweepThread::threads_do(ThreadClosure* tc) {
assert(tc != NULL, "Null ThreadClosure");
- if (_cmst != NULL) {
- tc->do_thread(_cmst);
+ if (cmst() != NULL && !cmst()->has_terminated()) {
+ tc->do_thread(cmst());
}
assert(Universe::is_fully_initialized(),
"Called too early, make sure heap is fully initialized");
@@ -202,8 +158,8 @@
}
void ConcurrentMarkSweepThread::print_all_on(outputStream* st) {
- if (_cmst != NULL) {
- _cmst->print_on(st);
+ if (cmst() != NULL && !cmst()->has_terminated()) {
+ cmst()->print_on(st);
st->cr();
}
if (_collector != NULL) {
@@ -278,7 +234,7 @@
void ConcurrentMarkSweepThread::wait_on_cms_lock(long t_millis) {
MutexLockerEx x(CGC_lock,
Mutex::_no_safepoint_check_flag);
- if (_should_terminate || _collector->_full_gc_requested) {
+ if (should_terminate() || _collector->_full_gc_requested) {
return;
}
set_CMS_flag(CMS_cms_wants_token); // to provoke notifies
@@ -307,7 +263,7 @@
unsigned int loop_count = 0;
- while(!_should_terminate) {
+ while(!should_terminate()) {
double now_time = os::elapsedTime();
long wait_time_millis;
@@ -327,7 +283,7 @@
{
MutexLockerEx x(CGC_lock, Mutex::_no_safepoint_check_flag);
- if (_should_terminate || _collector->_full_gc_requested) {
+ if (should_terminate() || _collector->_full_gc_requested) {
return;
}
set_CMS_flag(CMS_cms_wants_token); // to provoke notifies
@@ -364,7 +320,7 @@
}
void ConcurrentMarkSweepThread::sleepBeforeNextCycle() {
- while (!_should_terminate) {
+ while (!should_terminate()) {
if(CMSWaitDuration >= 0) {
// Wait until the next synchronous GC, a concurrent full gc
// request or a timeout, whichever is earlier.
--- a/hotspot/src/share/vm/gc/cms/concurrentMarkSweepThread.hpp Fri Mar 11 16:39:38 2016 +0100
+++ b/hotspot/src/share/vm/gc/cms/concurrentMarkSweepThread.hpp Mon Mar 14 13:20:14 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -37,8 +37,6 @@
friend class VMStructs;
friend class ConcurrentMarkSweepGeneration; // XXX should remove friendship
friend class CMSCollector;
- public:
- virtual void run();
private:
static ConcurrentMarkSweepThread* _cmst;
@@ -47,8 +45,6 @@
static SurrogateLockerThread::SLT_msg_type _sltBuffer;
static Monitor* _sltMonitor;
- static bool _should_terminate;
-
enum CMS_flag_type {
CMS_nil = NoBits,
CMS_cms_wants_token = nth_bit(0),
@@ -72,6 +68,9 @@
// debugging
void verify_ok_to_terminate() const PRODUCT_RETURN;
+ void run_service();
+ void stop_service();
+
public:
// Constructor
ConcurrentMarkSweepThread(CMSCollector* collector);
@@ -91,8 +90,6 @@
// Create and start the CMS Thread, or stop it on shutdown
static ConcurrentMarkSweepThread* start(CMSCollector* collector);
- static void stop();
- static bool should_terminate() { return _should_terminate; }
// Synchronization using CMS token
static void synchronize(bool is_cms_thread);
--- a/hotspot/src/share/vm/gc/g1/concurrentG1RefineThread.cpp Fri Mar 11 16:39:38 2016 +0100
+++ b/hotspot/src/share/vm/gc/g1/concurrentG1RefineThread.cpp Mon Mar 14 13:20:14 2016 +0000
@@ -78,7 +78,7 @@
void ConcurrentG1RefineThread::wait_for_completed_buffers() {
DirtyCardQueueSet& dcqs = JavaThread::dirty_card_queue_set();
MutexLockerEx x(_monitor, Mutex::_no_safepoint_check_flag);
- while (!_should_terminate && !is_active()) {
+ while (!should_terminate() && !is_active()) {
_monitor->wait(Mutex::_no_safepoint_check_flag);
}
}
@@ -109,22 +109,13 @@
}
}
-void ConcurrentG1RefineThread::run() {
- initialize_in_thread();
- wait_for_universe_init();
-
- run_service();
-
- terminate();
-}
-
void ConcurrentG1RefineThread::run_service() {
_vtime_start = os::elapsedVTime();
- while (!_should_terminate) {
+ while (!should_terminate()) {
// Wait for work
wait_for_completed_buffers();
- if (_should_terminate) {
+ if (should_terminate()) {
break;
}
@@ -168,23 +159,6 @@
log_debug(gc, refine)("Stopping %d", _worker_id);
}
-void ConcurrentG1RefineThread::stop() {
- // it is ok to take late safepoints here, if needed
- {
- MutexLockerEx mu(Terminator_lock);
- _should_terminate = true;
- }
-
- stop_service();
-
- {
- MutexLockerEx mu(Terminator_lock);
- while (!_has_terminated) {
- Terminator_lock->wait();
- }
- }
-}
-
void ConcurrentG1RefineThread::stop_service() {
MutexLockerEx x(_monitor, Mutex::_no_safepoint_check_flag);
_monitor->notify();
--- a/hotspot/src/share/vm/gc/g1/concurrentG1RefineThread.hpp Fri Mar 11 16:39:38 2016 +0100
+++ b/hotspot/src/share/vm/gc/g1/concurrentG1RefineThread.hpp Mon Mar 14 13:20:14 2016 +0000
@@ -72,7 +72,6 @@
void stop_service();
public:
- virtual void run();
// Constructor
ConcurrentG1RefineThread(ConcurrentG1Refine* cg1r, ConcurrentG1RefineThread* next,
CardTableEntryClosure* refine_closure,
@@ -84,9 +83,6 @@
double vtime_accum() { return _vtime_accum; }
ConcurrentG1Refine* cg1r() { return _cg1r; }
-
- // shutdown
- void stop();
};
#endif // SHARE_VM_GC_G1_CONCURRENTG1REFINETHREAD_HPP
--- a/hotspot/src/share/vm/gc/g1/concurrentMarkThread.cpp Fri Mar 11 16:39:38 2016 +0100
+++ b/hotspot/src/share/vm/gc/g1/concurrentMarkThread.cpp Mon Mar 14 13:20:14 2016 +0000
@@ -105,25 +105,16 @@
}
};
-void ConcurrentMarkThread::run() {
- initialize_in_thread();
- wait_for_universe_init();
-
- run_service();
-
- terminate();
-}
-
void ConcurrentMarkThread::run_service() {
_vtime_start = os::elapsedVTime();
G1CollectedHeap* g1h = G1CollectedHeap::heap();
G1CollectorPolicy* g1_policy = g1h->g1_policy();
- while (!_should_terminate) {
+ while (!should_terminate()) {
// wait until started is set.
sleepBeforeNextCycle();
- if (_should_terminate) {
+ if (should_terminate()) {
_cm->root_regions()->cancel_scan();
break;
}
@@ -293,22 +284,6 @@
}
}
-void ConcurrentMarkThread::stop() {
- {
- MutexLockerEx ml(Terminator_lock);
- _should_terminate = true;
- }
-
- stop_service();
-
- {
- MutexLockerEx ml(Terminator_lock);
- while (!_has_terminated) {
- Terminator_lock->wait();
- }
- }
-}
-
void ConcurrentMarkThread::stop_service() {
MutexLockerEx ml(CGC_lock, Mutex::_no_safepoint_check_flag);
CGC_lock->notify_all();
@@ -320,7 +295,7 @@
assert(!in_progress(), "should have been cleared");
MutexLockerEx x(CGC_lock, Mutex::_no_safepoint_check_flag);
- while (!started() && !_should_terminate) {
+ while (!started() && !should_terminate()) {
CGC_lock->wait(Mutex::_no_safepoint_check_flag);
}
--- a/hotspot/src/share/vm/gc/g1/concurrentMarkThread.hpp Fri Mar 11 16:39:38 2016 +0100
+++ b/hotspot/src/share/vm/gc/g1/concurrentMarkThread.hpp Mon Mar 14 13:20:14 2016 +0000
@@ -38,13 +38,8 @@
double _vtime_start; // Initial virtual time.
double _vtime_accum; // Accumulated virtual time.
-
double _vtime_mark_accum;
- public:
- virtual void run();
-
- private:
G1ConcurrentMark* _cm;
enum State {
@@ -93,9 +88,6 @@
// as the CM thread might take some time to wake up before noticing
// that started() is set and set in_progress().
bool during_cycle() { return !idle(); }
-
- // shutdown
- void stop();
};
#endif // SHARE_VM_GC_G1_CONCURRENTMARKTHREAD_HPP
--- a/hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp Fri Mar 11 16:39:38 2016 +0100
+++ b/hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp Mon Mar 14 13:20:14 2016 +0000
@@ -1229,6 +1229,7 @@
ResourceMark rm;
print_heap_before_gc();
+ print_heap_regions();
trace_heap_before_gc(gc_tracer);
size_t metadata_prev_used = MetaspaceAux::used_bytes();
@@ -1447,6 +1448,7 @@
heap_transition.print();
print_heap_after_gc();
+ print_heap_regions();
trace_heap_after_gc(gc_tracer);
post_full_gc_dump(gc_timer);
@@ -2718,6 +2720,14 @@
return false; // keep some compilers happy
}
+void G1CollectedHeap::print_heap_regions() const {
+ LogHandle(gc, heap, region) log;
+ if (log.is_trace()) {
+ ResourceMark rm;
+ print_regions_on(log.trace_stream());
+ }
+}
+
void G1CollectedHeap::print_on(outputStream* st) const {
st->print(" %-20s", "garbage-first heap");
st->print(" total " SIZE_FORMAT "K, used " SIZE_FORMAT "K",
@@ -2738,11 +2748,7 @@
MetaspaceAux::print_on(st);
}
-void G1CollectedHeap::print_extended_on(outputStream* st) const {
- print_on(st);
-
- // Print the per-region information.
- st->cr();
+void G1CollectedHeap::print_regions_on(outputStream* st) const {
st->print_cr("Heap Regions: E=young(eden), S=young(survivor), O=old, "
"HS=humongous(starts), HC=humongous(continues), "
"CS=collection set, F=free, A=archive, TS=gc time stamp, "
@@ -2752,6 +2758,13 @@
heap_region_iterate(&blk);
}
+void G1CollectedHeap::print_extended_on(outputStream* st) const {
+ print_on(st);
+
+ // Print the per-region information.
+ print_regions_on(st);
+}
+
void G1CollectedHeap::print_on_error(outputStream* st) const {
this->CollectedHeap::print_on_error(st);
@@ -3203,6 +3216,7 @@
wait_for_root_region_scanning();
print_heap_before_gc();
+ print_heap_regions();
trace_heap_before_gc(_gc_tracer_stw);
_verifier->verify_region_sets_optional();
@@ -3535,6 +3549,7 @@
TASKQUEUE_STATS_ONLY(reset_taskqueue_stats());
print_heap_after_gc();
+ print_heap_regions();
trace_heap_after_gc(_gc_tracer_stw);
// We must call G1MonitoringSupport::update_sizes() in the same scoping level
--- a/hotspot/src/share/vm/gc/g1/g1CollectedHeap.hpp Fri Mar 11 16:39:38 2016 +0100
+++ b/hotspot/src/share/vm/gc/g1/g1CollectedHeap.hpp Mon Mar 14 13:20:14 2016 +0000
@@ -1470,7 +1470,11 @@
G1EvacSummary create_g1_evac_summary(G1EvacStats* stats);
// Printing
+private:
+ void print_heap_regions() const;
+ void print_regions_on(outputStream* st) const;
+public:
virtual void print_on(outputStream* st) const;
virtual void print_extended_on(outputStream* st) const;
virtual void print_on_error(outputStream* st) const;
--- a/hotspot/src/share/vm/gc/g1/g1CollectorPolicy.cpp Fri Mar 11 16:39:38 2016 +0100
+++ b/hotspot/src/share/vm/gc/g1/g1CollectorPolicy.cpp Mon Mar 14 13:20:14 2016 +0000
@@ -180,18 +180,7 @@
// First make sure that, if either parameter is set, its value is
// reasonable.
- if (!FLAG_IS_DEFAULT(MaxGCPauseMillis)) {
- if (MaxGCPauseMillis < 1) {
- vm_exit_during_initialization("MaxGCPauseMillis should be "
- "greater than 0");
- }
- }
- if (!FLAG_IS_DEFAULT(GCPauseIntervalMillis)) {
- if (GCPauseIntervalMillis < 1) {
- vm_exit_during_initialization("GCPauseIntervalMillis should be "
- "greater than 0");
- }
- }
+ guarantee(MaxGCPauseMillis >= 1, "Range checking for MaxGCPauseMillis should guarantee that value is >= 1");
// Then, if the pause time target parameter was not set, set it to
// the default value.
@@ -213,16 +202,8 @@
if (FLAG_IS_DEFAULT(GCPauseIntervalMillis)) {
FLAG_SET_DEFAULT(GCPauseIntervalMillis, MaxGCPauseMillis + 1);
}
-
- // Finally, make sure that the two parameters are consistent.
- if (MaxGCPauseMillis >= GCPauseIntervalMillis) {
- char buffer[256];
- jio_snprintf(buffer, 256,
- "MaxGCPauseMillis (%u) should be less than "
- "GCPauseIntervalMillis (%u)",
- MaxGCPauseMillis, GCPauseIntervalMillis);
- vm_exit_during_initialization(buffer);
- }
+ guarantee(GCPauseIntervalMillis >= 1, "Constraint for GCPauseIntervalMillis should guarantee that value is >= 1");
+ guarantee(GCPauseIntervalMillis > MaxGCPauseMillis, "Constraint for GCPauseIntervalMillis should guarantee that GCPauseIntervalMillis > MaxGCPauseMillis");
double max_gc_time = (double) MaxGCPauseMillis / 1000.0;
double time_slice = (double) GCPauseIntervalMillis / 1000.0;
@@ -238,14 +219,8 @@
"if a user set it to 0");
_gc_overhead_perc = 100.0 * (1.0 / (1.0 + GCTimeRatio));
- uintx reserve_perc = G1ReservePercent;
- // Put an artificial ceiling on this so that it's not set to a silly value.
- if (reserve_perc > 50) {
- reserve_perc = 50;
- warning("G1ReservePercent is set to a value that is too large, "
- "it's been updated to " UINTX_FORMAT, reserve_perc);
- }
- _reserve_factor = (double) reserve_perc / 100.0;
+ guarantee(G1ReservePercent <= 50, "Range checking should not allow values over 50.");
+ _reserve_factor = (double) G1ReservePercent / 100.0;
// This will be set when the heap is expanded
// for the first time during initialization.
_reserve_regions = 0;
@@ -287,9 +262,8 @@
FLAG_SET_ERGO(size_t, G1HeapRegionSize, HeapRegion::GrainBytes);
}
- if (SurvivorRatio < 1) {
- vm_exit_during_initialization("Invalid survivor ratio specified");
- }
+ guarantee(SurvivorRatio >= 1, "Range checking for SurvivorRatio should guarantee that value is >= 1");
+
CollectorPolicy::initialize_flags();
_young_gen_sizer = new G1YoungGenSizer(); // Must be after call to initialize_flags
}
--- a/hotspot/src/share/vm/gc/g1/g1StringDedup.cpp Fri Mar 11 16:39:38 2016 +0100
+++ b/hotspot/src/share/vm/gc/g1/g1StringDedup.cpp Mon Mar 14 13:20:14 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -47,7 +47,7 @@
void G1StringDedup::stop() {
assert(is_enabled(), "String deduplication not enabled");
- G1StringDedupThread::stop();
+ G1StringDedupThread::thread()->stop();
}
bool G1StringDedup::is_candidate_from_mark(oop obj) {
--- a/hotspot/src/share/vm/gc/g1/g1StringDedupThread.cpp Fri Mar 11 16:39:38 2016 +0100
+++ b/hotspot/src/share/vm/gc/g1/g1StringDedupThread.cpp Mon Mar 14 13:20:14 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -81,11 +81,9 @@
StringTable::shared_oops_do(&sharedStringDedup);
}
-void G1StringDedupThread::run() {
+void G1StringDedupThread::run_service() {
G1StringDedupStat total_stat;
- initialize_in_thread();
- wait_for_universe_init();
deduplicate_shared_strings(total_stat);
// Main loop
@@ -96,7 +94,7 @@
// Wait for the queue to become non-empty
G1StringDedupQueue::wait();
- if (_should_terminate) {
+ if (should_terminate()) {
break;
}
@@ -133,23 +131,10 @@
}
}
- terminate();
}
-void G1StringDedupThread::stop() {
- {
- MonitorLockerEx ml(Terminator_lock);
- _thread->_should_terminate = true;
- }
-
+void G1StringDedupThread::stop_service() {
G1StringDedupQueue::cancel_wait();
-
- {
- MonitorLockerEx ml(Terminator_lock);
- while (!_thread->_has_terminated) {
- ml.wait();
- }
- }
}
void G1StringDedupThread::print(const G1StringDedupStat& last_stat, const G1StringDedupStat& total_stat) {
--- a/hotspot/src/share/vm/gc/g1/g1StringDedupThread.hpp Fri Mar 11 16:39:38 2016 +0100
+++ b/hotspot/src/share/vm/gc/g1/g1StringDedupThread.hpp Mon Mar 14 13:20:14 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -45,14 +45,14 @@
void print(const G1StringDedupStat& last_stat, const G1StringDedupStat& total_stat);
+ void run_service();
+ void stop_service();
+
public:
static void create();
- static void stop();
static G1StringDedupThread* thread();
- virtual void run();
-
void deduplicate_shared_strings(G1StringDedupStat& stat);
};
--- a/hotspot/src/share/vm/gc/g1/g1YoungRemSetSamplingThread.cpp Fri Mar 11 16:39:38 2016 +0100
+++ b/hotspot/src/share/vm/gc/g1/g1YoungRemSetSamplingThread.cpp Mon Mar 14 13:20:14 2016 +0000
@@ -32,32 +32,6 @@
#include "gc/g1/suspendibleThreadSet.hpp"
#include "runtime/mutexLocker.hpp"
-void G1YoungRemSetSamplingThread::run() {
- initialize_in_thread();
- wait_for_universe_init();
-
- run_service();
-
- terminate();
-}
-
-void G1YoungRemSetSamplingThread::stop() {
- // it is ok to take late safepoints here, if needed
- {
- MutexLockerEx mu(Terminator_lock);
- _should_terminate = true;
- }
-
- stop_service();
-
- {
- MutexLockerEx mu(Terminator_lock);
- while (!_has_terminated) {
- Terminator_lock->wait();
- }
- }
-}
-
G1YoungRemSetSamplingThread::G1YoungRemSetSamplingThread() :
ConcurrentGCThread(),
_monitor(Mutex::nonleaf,
@@ -70,7 +44,7 @@
void G1YoungRemSetSamplingThread::sleep_before_next_cycle() {
MutexLockerEx x(&_monitor, Mutex::_no_safepoint_check_flag);
- if (!_should_terminate) {
+ if (!should_terminate()) {
uintx waitms = G1ConcRefinementServiceIntervalMillis; // 300, really should be?
_monitor.wait(Mutex::_no_safepoint_check_flag, waitms);
}
@@ -79,7 +53,7 @@
void G1YoungRemSetSamplingThread::run_service() {
double vtime_start = os::elapsedVTime();
- while (!_should_terminate) {
+ while (!should_terminate()) {
sample_young_list_rs_lengths();
if (os::supports_vtime()) {
--- a/hotspot/src/share/vm/gc/g1/g1YoungRemSetSamplingThread.hpp Fri Mar 11 16:39:38 2016 +0100
+++ b/hotspot/src/share/vm/gc/g1/g1YoungRemSetSamplingThread.hpp Mon Mar 14 13:20:14 2016 +0000
@@ -55,9 +55,6 @@
public:
G1YoungRemSetSamplingThread();
double vtime_accum() { return _vtime_accum; }
-
- virtual void run();
- void stop();
};
#endif // SHARE_VM_GC_G1_G1YOUNGREMSETSAMPLINGTHREAD_HPP
--- a/hotspot/src/share/vm/gc/g1/g1_globals.hpp Fri Mar 11 16:39:38 2016 +0100
+++ b/hotspot/src/share/vm/gc/g1/g1_globals.hpp Mon Mar 14 13:20:14 2016 +0000
@@ -233,10 +233,6 @@
"Raise a fatal VM exit out of memory failure in the event " \
" that heap expansion fails due to running out of swap.") \
\
- develop(uintx, G1ConcMarkForceOverflow, 0, \
- "The number of times we'll force an overflow during " \
- "concurrent marking") \
- \
experimental(uintx, G1MaxNewSizePercent, 60, \
"Percentage (0-100) of the heap size to use as default " \
" maximum young gen size.") \
--- a/hotspot/src/share/vm/gc/shared/collectorPolicy.cpp Fri Mar 11 16:39:38 2016 +0100
+++ b/hotspot/src/share/vm/gc/shared/collectorPolicy.cpp Mon Mar 14 13:20:14 2016 +0000
@@ -96,6 +96,9 @@
}
// Check heap parameter properties
+ if (MaxHeapSize < 2 * M) {
+ vm_exit_during_initialization("Too small maximum heap");
+ }
if (InitialHeapSize < M) {
vm_exit_during_initialization("Too small initial heap");
}
--- a/hotspot/src/share/vm/gc/shared/concurrentGCThread.cpp Fri Mar 11 16:39:38 2016 +0100
+++ b/hotspot/src/share/vm/gc/shared/concurrentGCThread.cpp Mon Mar 14 13:20:14 2016 +0000
@@ -37,12 +37,12 @@
_should_terminate(false), _has_terminated(false) {
};
-void ConcurrentGCThread::create_and_start() {
+void ConcurrentGCThread::create_and_start(ThreadPriority prio) {
if (os::create_thread(this, os::cgc_thread)) {
// XXX: need to set this to low priority
// unless "aggressive mode" set; priority
// should be just less than that of VMThread.
- os::set_priority(this, NearMaxPriority);
+ os::set_priority(this, prio);
if (!_should_terminate && !DisableStartThread) {
os::start_thread(this);
}
@@ -75,6 +75,34 @@
}
}
+void ConcurrentGCThread::run() {
+ initialize_in_thread();
+ wait_for_universe_init();
+
+ run_service();
+
+ terminate();
+}
+
+void ConcurrentGCThread::stop() {
+ // it is ok to take late safepoints here, if needed
+ {
+ MutexLockerEx mu(Terminator_lock);
+ assert(!_has_terminated, "stop should only be called once");
+ assert(!_should_terminate, "stop should only be called once");
+ _should_terminate = true;
+ }
+
+ stop_service();
+
+ {
+ MutexLockerEx mu(Terminator_lock);
+ while (!_has_terminated) {
+ Terminator_lock->wait();
+ }
+ }
+}
+
static void _sltLoop(JavaThread* thread, TRAPS) {
SurrogateLockerThread* slt = (SurrogateLockerThread*)thread;
slt->loop();
--- a/hotspot/src/share/vm/gc/shared/concurrentGCThread.hpp Fri Mar 11 16:39:38 2016 +0100
+++ b/hotspot/src/share/vm/gc/shared/concurrentGCThread.hpp Mon Mar 14 13:20:14 2016 +0000
@@ -31,13 +31,9 @@
class ConcurrentGCThread: public NamedThread {
friend class VMStructs;
-protected:
bool volatile _should_terminate;
bool _has_terminated;
- // Create and start the thread (setting it's priority high.)
- void create_and_start();
-
// Do initialization steps in the thread: record stack base and size,
// init thread local storage, set JNI handle block.
void initialize_in_thread();
@@ -49,11 +45,29 @@
// concurrent work.
void terminate();
+protected:
+ // Create and start the thread (setting it's priority.)
+ void create_and_start(ThreadPriority prio = NearMaxPriority);
+
+ // Do the specific GC work. Called by run() after initialization complete.
+ virtual void run_service() = 0;
+
+ // Shut down the specific GC work. Called by stop() as part of termination protocol.
+ virtual void stop_service() = 0;
+
public:
ConcurrentGCThread();
// Tester
bool is_ConcurrentGC_thread() const { return true; }
+
+ virtual void run();
+
+ // shutdown following termination protocol
+ virtual void stop();
+
+ bool should_terminate() { return _should_terminate; }
+ bool has_terminated() { return _has_terminated; }
};
// The SurrogateLockerThread is used by concurrent GC threads for
--- a/hotspot/src/share/vm/gc/shared/genCollectedHeap.cpp Fri Mar 11 16:39:38 2016 +0100
+++ b/hotspot/src/share/vm/gc/shared/genCollectedHeap.cpp Mon Mar 14 13:20:14 2016 +0000
@@ -1281,7 +1281,7 @@
void GenCollectedHeap::stop() {
#if INCLUDE_ALL_GCS
if (UseConcMarkSweepGC) {
- ConcurrentMarkSweepThread::stop();
+ ConcurrentMarkSweepThread::cmst()->stop();
}
#endif
}
--- a/hotspot/src/share/vm/logging/logPrefix.hpp Fri Mar 11 16:39:38 2016 +0100
+++ b/hotspot/src/share/vm/logging/logPrefix.hpp Mon Mar 14 13:20:14 2016 +0000
@@ -52,6 +52,7 @@
LOG_PREFIX(GCId::print_prefix, LOG_TAGS(gc, ergo, heap)) \
LOG_PREFIX(GCId::print_prefix, LOG_TAGS(gc, ergo, ihop)) \
LOG_PREFIX(GCId::print_prefix, LOG_TAGS(gc, heap)) \
+ LOG_PREFIX(GCId::print_prefix, LOG_TAGS(gc, heap, region)) \
LOG_PREFIX(GCId::print_prefix, LOG_TAGS(gc, freelist)) \
LOG_PREFIX(GCId::print_prefix, LOG_TAGS(gc, ihop)) \
LOG_PREFIX(GCId::print_prefix, LOG_TAGS(gc, liveness)) \
--- a/hotspot/src/share/vm/logging/logTag.hpp Fri Mar 11 16:39:38 2016 +0100
+++ b/hotspot/src/share/vm/logging/logTag.hpp Mon Mar 14 13:20:14 2016 +0000
@@ -24,6 +24,7 @@
#ifndef SHARE_VM_LOGGING_LOGTAG_HPP
#define SHARE_VM_LOGGING_LOGTAG_HPP
+#include "logging/logTag_ext.hpp"
#include "memory/allocation.hpp"
#include "utilities/globalDefinitions.hpp"
@@ -91,7 +92,8 @@
LOG_TAG(verboseverification) \
LOG_TAG(verify) \
LOG_TAG(vmoperation) \
- LOG_TAG(vtables)
+ LOG_TAG(vtables) \
+ LOG_TAG_LIST_EXT
#define PREFIX_LOG_TAG(T) (LogTag::_##T)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/src/share/vm/logging/logTag_ext.hpp Mon Mar 14 13:20:14 2016 +0000
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 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
+ * 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.
+ *
+ */
+#ifndef SHARE_VM_LOGGING_LOGTAG_EXT_HPP
+#define SHARE_VM_LOGGING_LOGTAG_EXT_HPP
+
+#define LOG_TAG_LIST_EXT
+
+#endif // SHARE_VM_LOGGING_LOGTAG_EXT_HPP
--- a/hotspot/src/share/vm/memory/universe.cpp Fri Mar 11 16:39:38 2016 +0100
+++ b/hotspot/src/share/vm/memory/universe.cpp Mon Mar 14 13:20:14 2016 +0000
@@ -1093,19 +1093,19 @@
void Universe::print_heap_before_gc() {
LogHandle(gc, heap) log;
- if (log.is_trace()) {
- log.trace("Heap before GC invocations=%u (full %u):", heap()->total_collections(), heap()->total_full_collections());
+ if (log.is_debug()) {
+ log.debug("Heap before GC invocations=%u (full %u):", heap()->total_collections(), heap()->total_full_collections());
ResourceMark rm;
- heap()->print_on(log.trace_stream());
+ heap()->print_on(log.debug_stream());
}
}
void Universe::print_heap_after_gc() {
LogHandle(gc, heap) log;
- if (log.is_trace()) {
- log.trace("Heap after GC invocations=%u (full %u):", heap()->total_collections(), heap()->total_full_collections());
+ if (log.is_debug()) {
+ log.debug("Heap after GC invocations=%u (full %u):", heap()->total_collections(), heap()->total_full_collections());
ResourceMark rm;
- heap()->print_on(log.trace_stream());
+ heap()->print_on(log.debug_stream());
}
}
--- a/hotspot/src/share/vm/oops/constantPool.cpp Fri Mar 11 16:39:38 2016 +0100
+++ b/hotspot/src/share/vm/oops/constantPool.cpp Mon Mar 14 13:20:14 2016 +0000
@@ -208,11 +208,11 @@
if (k() != this_cp->pool_holder()) {
// only print something if the classes are different
if (source_file != NULL) {
- log_info(classresolve)("%s %s %s:%d",
+ log_debug(classresolve)("%s %s %s:%d",
this_cp->pool_holder()->external_name(),
k->external_name(), source_file, line_number);
} else {
- log_info(classresolve)("%s %s",
+ log_debug(classresolve)("%s %s",
this_cp->pool_holder()->external_name(),
k->external_name());
}
@@ -281,15 +281,10 @@
ClassLoaderData* this_key = this_cp->pool_holder()->class_loader_data();
this_key->record_dependency(k(), CHECK_NULL); // Can throw OOM
- if (log_is_enabled(Info, classresolve) && !k->is_array_klass()) {
- // skip resolving the constant pool so that this code gets
- // called the next time some bytecodes refer to this class.
- trace_class_resolution(this_cp, k);
- return k();
- } else {
- this_cp->klass_at_put(which, k());
- }
+ // logging for classresolve tag.
+ trace_class_resolution(this_cp, k);
+ this_cp->klass_at_put(which, k());
entry = this_cp->resolved_klass_at(which);
assert(entry.is_resolved() && entry.get_klass()->is_klass(), "must be resolved at this point");
return entry.get_klass();
--- a/hotspot/src/share/vm/prims/jni.cpp Fri Mar 11 16:39:38 2016 +0100
+++ b/hotspot/src/share/vm/prims/jni.cpp Mon Mar 14 13:20:14 2016 +0000
@@ -347,7 +347,7 @@
&st,
CHECK_NULL);
- if (log_is_enabled(Info, classresolve) && k != NULL) {
+ if (log_is_enabled(Debug, classresolve) && k != NULL) {
trace_class_resolution(k);
}
@@ -417,7 +417,7 @@
result = find_class_from_class_loader(env, sym, true, loader,
protection_domain, true, thread);
- if (log_is_enabled(Info, classresolve) && result != NULL) {
+ if (log_is_enabled(Debug, classresolve) && result != NULL) {
trace_class_resolution(java_lang_Class::as_Klass(JNIHandles::resolve_non_null(result)));
}
@@ -3269,7 +3269,7 @@
TempNewSymbol sym = SymbolTable::new_symbol(name, CHECK_NULL);
jclass result = find_class_from_class_loader(env, sym, true, loader, protection_domain, true, CHECK_NULL);
- if (log_is_enabled(Info, classresolve) && result != NULL) {
+ if (log_is_enabled(Debug, classresolve) && result != NULL) {
trace_class_resolution(java_lang_Class::as_Klass(JNIHandles::resolve_non_null(result)));
}
return result;
--- a/hotspot/src/share/vm/prims/jvm.cpp Fri Mar 11 16:39:38 2016 +0100
+++ b/hotspot/src/share/vm/prims/jvm.cpp Mon Mar 14 13:20:14 2016 +0000
@@ -206,9 +206,9 @@
const char * to = to_class->external_name();
// print in a single call to reduce interleaving between threads
if (source_file != NULL) {
- log_info(classresolve)("%s %s %s:%d (%s)", from, to, source_file, line_number, trace);
+ log_debug(classresolve)("%s %s %s:%d (%s)", from, to, source_file, line_number, trace);
} else {
- log_info(classresolve)("%s %s (%s)", from, to, trace);
+ log_debug(classresolve)("%s %s (%s)", from, to, trace);
}
}
}
@@ -829,7 +829,7 @@
return NULL;
}
- if (log_is_enabled(Info, classresolve)) {
+ if (log_is_enabled(Debug, classresolve)) {
trace_class_resolution(k);
}
return (jclass) JNIHandles::make_local(env, k->java_mirror());
@@ -866,7 +866,7 @@
jclass result = find_class_from_class_loader(env, h_name, init, h_loader,
h_prot, false, THREAD);
- if (log_is_enabled(Info, classresolve) && result != NULL) {
+ if (log_is_enabled(Debug, classresolve) && result != NULL) {
trace_class_resolution(java_lang_Class::as_Klass(JNIHandles::resolve_non_null(result)));
}
return result;
@@ -896,7 +896,7 @@
jclass result = find_class_from_class_loader(env, h_name, init, h_loader,
h_prot, true, thread);
- if (log_is_enabled(Info, classresolve) && result != NULL) {
+ if (log_is_enabled(Debug, classresolve) && result != NULL) {
// this function is generally only used for class loading during verification.
ResourceMark rm;
oop from_mirror = JNIHandles::resolve_non_null(from);
@@ -906,7 +906,7 @@
oop mirror = JNIHandles::resolve_non_null(result);
Klass* to_class = java_lang_Class::as_Klass(mirror);
const char * to = to_class->external_name();
- log_info(classresolve)("%s %s (verification)", from_name, to);
+ log_debug(classresolve)("%s %s (verification)", from_name, to);
}
return result;
@@ -974,7 +974,7 @@
&st,
CHECK_NULL);
- if (log_is_enabled(Info, classresolve) && k != NULL) {
+ if (log_is_enabled(Debug, classresolve) && k != NULL) {
trace_class_resolution(k);
}
--- a/hotspot/src/share/vm/runtime/arguments.cpp Fri Mar 11 16:39:38 2016 +0100
+++ b/hotspot/src/share/vm/runtime/arguments.cpp Mon Mar 14 13:20:14 2016 +0000
@@ -408,7 +408,7 @@
{ "TraceBiasedLocking", LogLevel::Info, true, LogTag::_biasedlocking },
{ "TraceClassLoading", LogLevel::Info, true, LogTag::_classload },
{ "TraceClassPaths", LogLevel::Info, true, LogTag::_classpath },
- { "TraceClassResolution", LogLevel::Info, true, LogTag::_classresolve },
+ { "TraceClassResolution", LogLevel::Debug, true, LogTag::_classresolve },
{ "TraceClassUnloading", LogLevel::Info, true, LogTag::_classunload },
{ "TraceExceptions", LogLevel::Info, true, LogTag::_exceptions },
{ "TraceMonitorInflation", LogLevel::Debug, true, LogTag::_monitorinflation },
--- a/hotspot/src/share/vm/runtime/globals.hpp Fri Mar 11 16:39:38 2016 +0100
+++ b/hotspot/src/share/vm/runtime/globals.hpp Mon Mar 14 13:20:14 2016 +0000
@@ -1049,9 +1049,6 @@
"directory) of the dump file (defaults to java_pid<pid>.hprof " \
"in the working directory)") \
\
- develop(size_t, HeapDumpSegmentSize, 1*G, \
- "Approximate segment size when generating a segmented heap dump") \
- \
develop(bool, BreakAtWarning, false, \
"Execute breakpoint upon encountering VM warning") \
\
@@ -2065,9 +2062,6 @@
develop(uintx, MetadataAllocationFailALotInterval, 1000, \
"Metadata allocation failure a lot interval") \
\
- develop(bool, TraceMetadataChunkAllocation, false, \
- "Trace chunk metadata allocations") \
- \
notproduct(bool, ExecuteInternalVMTests, false, \
"Enable execution of internal VM tests") \
\
@@ -2774,10 +2768,6 @@
"Produce histogram of IC misses") \
\
/* interpreter */ \
- develop(bool, ClearInterpreterLocals, false, \
- "Always clear local variables of interpreter activations upon " \
- "entry") \
- \
product_pd(bool, RewriteBytecodes, \
"Allow rewriting of bytecodes (bytecodes are not immutable)") \
\
--- a/hotspot/src/share/vm/runtime/reflection.cpp Fri Mar 11 16:39:38 2016 +0100
+++ b/hotspot/src/share/vm/runtime/reflection.cpp Mon Mar 14 13:20:14 2016 +0000
@@ -74,9 +74,9 @@
const char * to = to_class->external_name();
// print in a single call to reduce interleaving between threads
if (source_file != NULL) {
- log_info(classresolve)("%s %s %s:%d (reflection)", from, to, source_file, line_number);
+ log_debug(classresolve)("%s %s %s:%d (reflection)", from, to, source_file, line_number);
} else {
- log_info(classresolve)("%s %s (reflection)", from, to);
+ log_debug(classresolve)("%s %s (reflection)", from, to);
}
}
}
@@ -599,7 +599,7 @@
Handle(THREAD, protection_domain),
true,
CHECK_NULL);
- if (log_is_enabled(Info, classresolve)) {
+ if (log_is_enabled(Debug, classresolve)) {
trace_class_resolution(k);
}
return k->java_mirror();
@@ -654,7 +654,7 @@
Handle(THREAD, k->protection_domain()),
true, CHECK_(Handle()));
- if (log_is_enabled(Info, classresolve)) {
+ if (log_is_enabled(Debug, classresolve)) {
trace_class_resolution(result);
}
--- a/hotspot/test/gc/arguments/TestMaxHeapSizeTools.java Fri Mar 11 16:39:38 2016 +0100
+++ b/hotspot/test/gc/arguments/TestMaxHeapSizeTools.java Mon Mar 14 13:20:14 2016 +0000
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2013, 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
@@ -112,10 +112,12 @@
}
private static void checkInvalidMinInitialHeapCombinations(String gcflag) throws Exception {
+ expectError(new String[] { gcflag, "-XX:InitialHeapSize=1023K", "-version" });
expectError(new String[] { gcflag, "-Xms64M", "-XX:InitialHeapSize=32M", "-version" });
}
private static void checkValidMinInitialHeapCombinations(String gcflag) throws Exception {
+ expectValid(new String[] { gcflag, "-XX:InitialHeapSize=1024K", "-version" });
expectValid(new String[] { gcflag, "-XX:InitialHeapSize=8M", "-Xms4M", "-version" });
expectValid(new String[] { gcflag, "-Xms4M", "-XX:InitialHeapSize=8M", "-version" });
expectValid(new String[] { gcflag, "-XX:InitialHeapSize=8M", "-Xms8M", "-version" });
@@ -124,11 +126,13 @@
}
private static void checkInvalidInitialMaxHeapCombinations(String gcflag) throws Exception {
+ expectError(new String[] { gcflag, "-XX:MaxHeapSize=2047K", "-version" });
expectError(new String[] { gcflag, "-XX:MaxHeapSize=4M", "-XX:InitialHeapSize=8M", "-version" });
expectError(new String[] { gcflag, "-XX:InitialHeapSize=8M", "-XX:MaxHeapSize=4M", "-version" });
}
private static void checkValidInitialMaxHeapCombinations(String gcflag) throws Exception {
+ expectValid(new String[] { gcflag, "-XX:MaxHeapSize=2048K", "-version" });
expectValid(new String[] { gcflag, "-XX:InitialHeapSize=4M", "-XX:MaxHeapSize=8M", "-version" });
expectValid(new String[] { gcflag, "-XX:MaxHeapSize=8M", "-XX:InitialHeapSize=4M", "-version" });
expectValid(new String[] { gcflag, "-XX:MaxHeapSize=4M", "-XX:InitialHeapSize=4M", "-version" });
--- a/hotspot/test/runtime/logging/ClassResolutionTest.java Fri Mar 11 16:39:38 2016 +0100
+++ b/hotspot/test/runtime/logging/ClassResolutionTest.java Mon Mar 14 13:20:14 2016 +0000
@@ -58,13 +58,13 @@
public static void main(String... args) throws Exception {
// (1) classresolve should turn on.
- ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-Xlog:classresolve=info",
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-Xlog:classresolve=debug",
ClassResolutionTestMain.class.getName());
OutputAnalyzer o = new OutputAnalyzer(pb.start());
o.shouldContain("[classresolve] ClassResolutionTest$ClassResolutionTestMain$Thing1Handler ClassResolutionTest$ClassResolutionTestMain$Thing1");
// (2) classresolve should turn off.
- pb = ProcessTools.createJavaProcessBuilder("-Xlog",
+ pb = ProcessTools.createJavaProcessBuilder("-Xlog:classresolve=debug",
"-Xlog:classresolve=off",
ClassResolutionTestMain.class.getName());
o = new OutputAnalyzer(pb.start());
@@ -77,12 +77,12 @@
o.shouldContain("[classresolve] ClassResolutionTest$ClassResolutionTestMain$Thing1Handler ClassResolutionTest$ClassResolutionTestMain$Thing1");
// (4) TraceClassResolution should turn off.
- pb = ProcessTools.createJavaProcessBuilder("-Xlog",
+ pb = ProcessTools.createJavaProcessBuilder("-Xlog:classresolve=debug",
"-XX:-TraceClassResolution",
ClassResolutionTestMain.class.getName());
o = new OutputAnalyzer(pb.start());
o.shouldNotContain("[classresolve]");
+ };
- };
}