diff --git a/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp b/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp
index 03540a9567182..478339bbe5684 100644
--- a/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp
+++ b/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp
@@ -85,7 +85,7 @@ G1ParScanThreadState::G1ParScanThreadState(G1CollectedHeap* g1h,
_num_optional_regions(optional_cset_length),
_numa(g1h->numa()),
_obj_alloc_stat(NULL),
- NOT_PRODUCT(_evac_failure_inject_counter(0) COMMA)
+ EVAC_FAILURE_INJECTOR_ONLY(_evac_failure_inject_counter(0) COMMA)
_preserved_marks(preserved_marks),
_evacuation_failed_info(),
_evac_failure_regions(evac_failure_regions)
@@ -415,7 +415,7 @@ HeapWord* G1ParScanThreadState::allocate_copy_slow(G1HeapRegionAttr* dest_attr,
return obj_ptr;
}
-#ifndef PRODUCT
+#if EVAC_FAILURE_INJECTOR
bool G1ParScanThreadState::inject_evacuation_failure() {
return _g1h->evac_failure_injector()->evacuation_should_fail(_evac_failure_inject_counter);
}
diff --git a/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp b/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp
index ea4fb10f5bd32..e9a10384b3d85 100644
--- a/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp
+++ b/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp
@@ -28,6 +28,8 @@
#include "gc/g1/g1CollectedHeap.hpp"
#include "gc/g1/g1RedirtyCardsQueue.hpp"
#include "gc/g1/g1OopClosures.hpp"
+#include "gc/g1/g1YoungGCEvacFailureInjector.hpp"
+#include "gc/g1/g1_globals.hpp"
#include "gc/shared/ageTable.hpp"
#include "gc/shared/copyFailedInfo.hpp"
#include "gc/shared/partialArrayTaskStepper.hpp"
@@ -99,14 +101,13 @@ class G1ParScanThreadState : public CHeapObj<mtGC> {
size_t* _obj_alloc_stat;
// Per-thread evacuation failure data structures.
-#ifndef PRODUCT
- size_t _evac_failure_inject_counter;
-#endif
+ EVAC_FAILURE_INJECTOR_ONLY(size_t _evac_failure_inject_counter;)
+
PreservedMarks* _preserved_marks;
EvacuationFailedInfo _evacuation_failed_info;
G1EvacFailureRegions* _evac_failure_regions;
- bool inject_evacuation_failure() PRODUCT_RETURN_( return false; );
+ bool inject_evacuation_failure() EVAC_FAILURE_INJECTOR_RETURN_( return false; );
public:
G1ParScanThreadState(G1CollectedHeap* g1h,
diff --git a/src/hotspot/share/gc/g1/g1YoungGCEvacFailureInjector.cpp b/src/hotspot/share/gc/g1/g1YoungGCEvacFailureInjector.cpp
index cedaba765ea6d..67b44263004d6 100644
--- a/src/hotspot/share/gc/g1/g1YoungGCEvacFailureInjector.cpp
+++ b/src/hotspot/share/gc/g1/g1YoungGCEvacFailureInjector.cpp
@@ -28,7 +28,7 @@
#include "gc/g1/g1YoungGCEvacFailureInjector.inline.hpp"
#include "gc/g1/g1_globals.hpp"
-#ifndef PRODUCT
+#if EVAC_FAILURE_INJECTOR
bool G1YoungGCEvacFailureInjector::arm_if_needed_for_gc_type(bool for_young_gc,
bool during_concurrent_start,
@@ -76,4 +76,4 @@ void G1YoungGCEvacFailureInjector::reset() {
_inject_evacuation_failure_for_current_gc = false;
}
-#endif // #ifndef PRODUCT
+#endif // #if EVAC_FAILURE_INJECTOR
diff --git a/src/hotspot/share/gc/g1/g1YoungGCEvacFailureInjector.hpp b/src/hotspot/share/gc/g1/g1YoungGCEvacFailureInjector.hpp
index 64d3f28b1ff42..eb0d4598c14fe 100644
--- a/src/hotspot/share/gc/g1/g1YoungGCEvacFailureInjector.hpp
+++ b/src/hotspot/share/gc/g1/g1YoungGCEvacFailureInjector.hpp
@@ -25,9 +25,20 @@
#ifndef SHARE_GC_G1_G1YOUNGGCEVACUATIONFAILUREINJECTOR_HPP
#define SHARE_GC_G1_G1YOUNGGCEVACUATIONFAILUREINJECTOR_HPP
+#include "gc/g1/g1_globals.hpp"
#include "memory/allStatic.hpp"
#include "utilities/globalDefinitions.hpp"
+#if EVAC_FAILURE_INJECTOR
+#define EVAC_FAILURE_INJECTOR_RETURN
+#define EVAC_FAILURE_INJECTOR_RETURN_(code)
+#define EVAC_FAILURE_INJECTOR_ONLY(code) code
+#else
+#define EVAC_FAILURE_INJECTOR_RETURN { return; }
+#define EVAC_FAILURE_INJECTOR_RETURN_(code) { code }
+#define EVAC_FAILURE_INJECTOR_ONLY(code)
+#endif // EVAC_FAILURE_INJECTOR
+
// Support for injecting evacuation failures based on the G1EvacuationFailureALot*
// flags. Analogous to PromotionFailureALot for the other collectors.
//
@@ -35,9 +46,9 @@
// inbetween we "arm" the injector to induce evacuation failures after
// G1EvacuationFailureALotCount successful evacuations.
//
-// Available only in non-product builds.
+// Available only when EVAC_FAILURE_INJECTOR is defined.
class G1YoungGCEvacFailureInjector {
-#ifndef PRODUCT
+#if EVAC_FAILURE_INJECTOR
// Should we inject evacuation failures in the current GC.
bool _inject_evacuation_failure_for_current_gc;
@@ -49,20 +60,20 @@ class G1YoungGCEvacFailureInjector {
bool arm_if_needed_for_gc_type(bool for_young_gc,
bool during_concurrent_start,
- bool mark_or_rebuild_in_progress) PRODUCT_RETURN_( return false; );
+ bool mark_or_rebuild_in_progress) EVAC_FAILURE_INJECTOR_RETURN_( return false; );
public:
// Arm the evacuation failure injector if needed for the current
// GC (based upon the type of GC and which command line flags are set);
- void arm_if_needed() PRODUCT_RETURN;
+ void arm_if_needed() EVAC_FAILURE_INJECTOR_RETURN;
// Return true if it's time to cause an evacuation failure; the caller
// provides the (preferably thread-local) counter to minimize performance impact.
- bool evacuation_should_fail(size_t& counter) PRODUCT_RETURN_( return false; );
+ bool evacuation_should_fail(size_t& counter) EVAC_FAILURE_INJECTOR_RETURN_( return false; );
// Reset the evacuation failure injection counters. Should be called at
// the end of an evacuation pause in which an evacuation failure occurred.
- void reset() PRODUCT_RETURN;
+ void reset() EVAC_FAILURE_INJECTOR_RETURN;
};
#endif /* SHARE_GC_G1_G1YOUNGGCEVACUATIONFAILUREINJECTOR_HPP */
diff --git a/src/hotspot/share/gc/g1/g1YoungGCEvacFailureInjector.inline.hpp b/src/hotspot/share/gc/g1/g1YoungGCEvacFailureInjector.inline.hpp
index 19499c266c22b..e259fc6137650 100644
--- a/src/hotspot/share/gc/g1/g1YoungGCEvacFailureInjector.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1YoungGCEvacFailureInjector.inline.hpp
@@ -30,7 +30,7 @@
#include "gc/g1/g1_globals.hpp"
#include "gc/g1/g1CollectedHeap.inline.hpp"
-#ifndef PRODUCT
+#if EVAC_FAILURE_INJECTOR
inline bool G1YoungGCEvacFailureInjector::evacuation_should_fail(size_t& counter) {
if (!_inject_evacuation_failure_for_current_gc) {
@@ -43,7 +43,7 @@ inline bool G1YoungGCEvacFailureInjector::evacuation_should_fail(size_t& counter
return true;
}
-#endif // #ifndef PRODUCT
+#endif // #if EVAC_FAILURE_INJECTOR
#endif /* SHARE_GC_G1_G1YOUNGGCEVACUATIONFAILUREINJECTOR_INLINE_HPP */
diff --git a/src/hotspot/share/gc/g1/g1_globals.hpp b/src/hotspot/share/gc/g1/g1_globals.hpp
index 8b87c373d5e56..34dbabe4fecc5 100644
--- a/src/hotspot/share/gc/g1/g1_globals.hpp
+++ b/src/hotspot/share/gc/g1/g1_globals.hpp
@@ -27,6 +27,62 @@
#include "runtime/globals_shared.hpp"
+// Enable evacuation failure injector by default in non-product builds.
+
+#ifdef EVAC_FAILURE_INJECTOR
+#error "EVAC_FAILURE_INJECTOR already defined"
+#endif
+#ifndef PRODUCT
+#define EVAC_FAILURE_INJECTOR 1
+#else
+#define EVAC_FAILURE_INJECTOR 0
+#endif
+
+#if EVAC_FAILURE_INJECTOR
+#define GC_G1_EVACUATION_FAILURE_FLAGS(develop, \
+ develop_pd, \
+ product, \
+ product_pd, \
+ notproduct, \
+ range, \
+ constraint) \
+ \
+ product(bool, G1EvacuationFailureALot, false, \
+ "Force use of evacuation failure handling during certain " \
+ "evacuation pauses") \
+ \
+ product(uintx, G1EvacuationFailureALotCount, 1000, \
+ "Number of successful evacuations between evacuation failures " \
+ "occurring at object copying per thread") \
+ \
+ product(uintx, G1EvacuationFailureALotInterval, 5, \
+ "Total collections between forced triggering of evacuation " \
+ "failures") \
+ \
+ product(bool, G1EvacuationFailureALotDuringConcMark, true, \
+ "Force use of evacuation failure handling during evacuation " \
+ "pauses when marking is in progress") \
+ \
+ product(bool, G1EvacuationFailureALotDuringConcurrentStart, true, \
+ "Force use of evacuation failure handling during concurrent " \
+ "start evacuation pauses") \
+ \
+ product(bool, G1EvacuationFailureALotDuringYoungGC, true, \
+ "Force use of evacuation failure handling during young " \
+ "evacuation pauses") \
+ \
+ product(bool, G1EvacuationFailureALotDuringMixedGC, true, \
+ "Force use of evacuation failure handling during mixed " \
+ "evacuation pauses")
+#else
+#define GC_G1_EVACUATION_FAILURE_FLAGS(develop, \
+ develop_pd, \
+ product, \
+ product_pd, \
+ notproduct, \
+ range, \
+ constraint)
+#endif
//
// Defines all globals flags used by the garbage-first compiler.
//
@@ -269,34 +325,6 @@
"as a percentage of the heap size.") \
range(0, 100) \
\
- notproduct(bool, G1EvacuationFailureALot, false, \
- "Force use of evacuation failure handling during certain " \
- "evacuation pauses") \
- \
- develop(uintx, G1EvacuationFailureALotCount, 1000, \
- "Number of successful evacuations between evacuation failures " \
- "occurring at object copying per thread") \
- \
- develop(uintx, G1EvacuationFailureALotInterval, 5, \
- "Total collections between forced triggering of evacuation " \
- "failures") \
- \
- develop(bool, G1EvacuationFailureALotDuringConcMark, true, \
- "Force use of evacuation failure handling during evacuation " \
- "pauses when marking is in progress") \
- \
- develop(bool, G1EvacuationFailureALotDuringConcurrentStart, true, \
- "Force use of evacuation failure handling during concurrent " \
- "start evacuation pauses") \
- \
- develop(bool, G1EvacuationFailureALotDuringYoungGC, true, \
- "Force use of evacuation failure handling during young " \
- "evacuation pauses") \
- \
- develop(bool, G1EvacuationFailureALotDuringMixedGC, true, \
- "Force use of evacuation failure handling during mixed " \
- "evacuation pauses") \
- \
product(bool, G1VerifyRSetsDuringFullGC, false, DIAGNOSTIC, \
"If true, perform verification of each heap region's " \
"remembered set when verifying the heap during a full GC.") \
@@ -343,7 +371,15 @@
product(bool, G1UsePreventiveGC, true, DIAGNOSTIC, \
"Allows collections to be triggered proactively based on the \
number of free regions and the expected survival rates in each \
- section of the heap.")
+ section of the heap.") \
+ \
+ GC_G1_EVACUATION_FAILURE_FLAGS(develop, \
+ develop_pd, \
+ product, \
+ product_pd, \
+ notproduct, \
+ range, \
+ constraint)
// end of GC_G1_FLAGS