comparison src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp @ 6107:5c8bd7c16119

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
author brutisso
date Fri, 25 May 2012 22:35:13 +0200
parents 720b6a76dd9d
children 7994a5a35fcf d2a62e0f25eb
comparison
equal deleted inserted replaced
6106:1d478c993020 6107:5c8bd7c16119
1104 } 1104 }
1105 1105
1106 void HeapRegionRemSet::setup_remset_size() { 1106 void HeapRegionRemSet::setup_remset_size() {
1107 // Setup sparse and fine-grain tables sizes. 1107 // Setup sparse and fine-grain tables sizes.
1108 // table_size = base * (log(region_size / 1M) + 1) 1108 // table_size = base * (log(region_size / 1M) + 1)
1109 int region_size_log_mb = MAX2((int)HeapRegion::LogOfHRGrainBytes - (int)LOG_M, 0); 1109 const int LOG_M = 20;
1110 int region_size_log_mb = MAX2(HeapRegion::LogOfHRGrainBytes - LOG_M, 0);
1110 if (FLAG_IS_DEFAULT(G1RSetSparseRegionEntries)) { 1111 if (FLAG_IS_DEFAULT(G1RSetSparseRegionEntries)) {
1111 G1RSetSparseRegionEntries = G1RSetSparseRegionEntriesBase * (region_size_log_mb + 1); 1112 G1RSetSparseRegionEntries = G1RSetSparseRegionEntriesBase * (region_size_log_mb + 1);
1112 } 1113 }
1113 if (FLAG_IS_DEFAULT(G1RSetRegionEntries)) { 1114 if (FLAG_IS_DEFAULT(G1RSetRegionEntries)) {
1114 G1RSetRegionEntries = G1RSetRegionEntriesBase * (region_size_log_mb + 1); 1115 G1RSetRegionEntries = G1RSetRegionEntriesBase * (region_size_log_mb + 1);