7171936: LOG_G incorrectly defined in globalDefinitions.hpp
Summary: Removed LOG_G and LOG_K. Moved LOG_M to where it is being used.
Reviewed-by: twisti, johnc
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp Tue May 29 10:18:02 2012 -0700
+++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp Fri May 25 22:35:13 2012 +0200
@@ -1106,7 +1106,8 @@
void HeapRegionRemSet::setup_remset_size() {
// Setup sparse and fine-grain tables sizes.
// table_size = base * (log(region_size / 1M) + 1)
- int region_size_log_mb = MAX2((int)HeapRegion::LogOfHRGrainBytes - (int)LOG_M, 0);
+ const int LOG_M = 20;
+ int region_size_log_mb = MAX2(HeapRegion::LogOfHRGrainBytes - LOG_M, 0);
if (FLAG_IS_DEFAULT(G1RSetSparseRegionEntries)) {
G1RSetSparseRegionEntries = G1RSetSparseRegionEntriesBase * (region_size_log_mb + 1);
}
--- a/hotspot/src/share/vm/utilities/globalDefinitions.hpp Tue May 29 10:18:02 2012 -0700
+++ b/hotspot/src/share/vm/utilities/globalDefinitions.hpp Fri May 25 22:35:13 2012 +0200
@@ -161,10 +161,6 @@
const size_t G = M*K;
const size_t HWperKB = K / sizeof(HeapWord);
-const size_t LOG_K = 10;
-const size_t LOG_M = 2 * LOG_K;
-const size_t LOG_G = 2 * LOG_M;
-
const jint min_jint = (jint)1 << (sizeof(jint)*BitsPerByte-1); // 0x80000000 == smallest jint
const jint max_jint = (juint)min_jint - 1; // 0x7FFFFFFF == largest jint