--- old/src/hotspot/share/gc/g1/g1CollectedHeap.cpp 2019-11-06 19:09:40.499602945 -0500 +++ new/src/hotspot/share/gc/g1/g1CollectedHeap.cpp 2019-11-06 19:09:40.231588572 -0500 @@ -1990,7 +1990,7 @@ } bool G1CollectedHeap::should_upgrade_to_full_gc(GCCause::Cause cause) { - if(policy()->force_upgrade_to_full()) { + if (policy()->force_upgrade_to_full()) { return true; } else if (should_do_concurrent_full_gc(_gc_cause)) { return false; @@ -2086,6 +2086,7 @@ try_collect(cause); } +// Return true if (x < y) with allowance for wraparound. static bool gc_counter_less_than(uint x, uint y) { return (x - y) > (UINT_MAX/2); } @@ -2094,13 +2095,13 @@ // Macro so msg printing is format-checked. #define LOG_COLLECT_CONCURRENTLY(cause, ...) \ do { \ - LogTarget(Debug, gc) LOG_COLLECT_CONCURRENTLY_lt; \ + LogTarget(Trace, gc) LOG_COLLECT_CONCURRENTLY_lt; \ if (LOG_COLLECT_CONCURRENTLY_lt.is_enabled()) { \ ResourceMark rm; /* For thread name. */ \ LogStream LOG_COLLECT_CONCURRENTLY_s(&LOG_COLLECT_CONCURRENTLY_lt); \ - LOG_COLLECT_CONCURRENTLY_s.print("Try Collect Concurrently (%s) for %s: ", \ - GCCause::to_string(cause), \ - Thread::current()->name()); \ + LOG_COLLECT_CONCURRENTLY_s.print("%s: Try Collect Concurrently (%s): ", \ + Thread::current()->name(), \ + GCCause::to_string(cause)); \ LOG_COLLECT_CONCURRENTLY_s.print(__VA_ARGS__); \ } \ } while (0)