|
|
9d475db |
diff -up openjdk/hotspot/src/share/vm/compiler/methodLiveness.cpp.sav openjdk/hotspot/src/share/vm/compiler/methodLiveness.cpp
|
|
|
9d475db |
--- openjdk/hotspot/src/share/vm/compiler/methodLiveness.cpp.sav 2012-02-14 16:11:12.000000000 -0500
|
|
|
9d475db |
+++ openjdk/hotspot/src/share/vm/compiler/methodLiveness.cpp 2012-03-09 14:48:08.223867826 -0500
|
|
|
9d475db |
@@ -572,15 +572,15 @@ void MethodLiveness::print_times() {
|
|
|
9d475db |
|
|
|
9d475db |
|
|
|
9d475db |
MethodLiveness::BasicBlock::BasicBlock(MethodLiveness *analyzer, int start, int limit) :
|
|
|
9d475db |
- _gen((size_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
|
|
|
9d475db |
+ _gen((BitMap::bm_word_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
|
|
|
9d475db |
analyzer->bit_map_size_bits()),
|
|
|
9d475db |
- _kill((size_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
|
|
|
9d475db |
+ _kill((BitMap::bm_word_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
|
|
|
9d475db |
analyzer->bit_map_size_bits()),
|
|
|
9d475db |
- _entry((size_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
|
|
|
9d475db |
+ _entry((BitMap::bm_word_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
|
|
|
9d475db |
analyzer->bit_map_size_bits()),
|
|
|
9d475db |
- _normal_exit((size_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
|
|
|
9d475db |
+ _normal_exit((BitMap::bm_word_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
|
|
|
9d475db |
analyzer->bit_map_size_bits()),
|
|
|
9d475db |
- _exception_exit((size_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
|
|
|
9d475db |
+ _exception_exit((BitMap::bm_word_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
|
|
|
9d475db |
analyzer->bit_map_size_bits()),
|
|
|
9d475db |
_last_bci(-1) {
|
|
|
9d475db |
_analyzer = analyzer;
|
|
|
9d475db |
@@ -998,7 +998,7 @@ bool MethodLiveness::BasicBlock::merge_e
|
|
|
9d475db |
}
|
|
|
9d475db |
|
|
|
9d475db |
MethodLivenessResult MethodLiveness::BasicBlock::get_liveness_at(ciMethod* method, int bci) {
|
|
|
9d475db |
- MethodLivenessResult answer(NEW_RESOURCE_ARRAY(size_t, _analyzer->bit_map_size_words()),
|
|
|
9d475db |
+ MethodLivenessResult answer(NEW_RESOURCE_ARRAY(BitMap::bm_word_t, _analyzer->bit_map_size_words()),
|
|
|
9d475db |
_analyzer->bit_map_size_bits());
|
|
|
9d475db |
answer.set_is_valid();
|
|
|
9d475db |
|
|
|
9d475db |
diff -up openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp.sav openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
|
|
|
9d475db |
--- openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp.sav 2012-02-14 16:11:12.000000000 -0500
|
|
|
9d475db |
+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp 2012-03-09 14:48:08.223867826 -0500
|
|
|
9d475db |
@@ -2656,7 +2656,7 @@ void CFLS_LAB::get_from_global_pool(size
|
|
|
9d475db |
if (ResizeOldPLAB && CMSOldPLABResizeQuicker) {
|
|
|
9d475db |
size_t multiple = _num_blocks[word_sz]/(CMSOldPLABToleranceFactor*CMSOldPLABNumRefills*n_blks);
|
|
|
9d475db |
n_blks += CMSOldPLABReactivityFactor*multiple*n_blks;
|
|
|
9d475db |
- n_blks = MIN2(n_blks, CMSOldPLABMax);
|
|
|
9d475db |
+ n_blks = MIN2(n_blks, (size_t)CMSOldPLABMax);
|
|
|
9d475db |
}
|
|
|
9d475db |
assert(n_blks > 0, "Error");
|
|
|
9d475db |
_cfls->par_get_chunk_of_blocks(word_sz, n_blks, fl);
|
|
|
9d475db |
diff -up openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp.sav openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
|
|
|
9d475db |
--- openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp.sav 2012-02-14 16:11:12.000000000 -0500
|
|
|
9d475db |
+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2012-03-09 16:30:30.426921691 -0500
|
|
Jiri Vanek |
753dfc1 |
@@ -543,7 +543,7 @@
|
|
Jiri Vanek |
753dfc1 |
#endif // _MSC_VER
|
|
Jiri Vanek |
753dfc1 |
|
|
Jiri Vanek |
753dfc1 |
uint ConcurrentMark::scale_parallel_threads(uint n_par_threads) {
|
|
Jiri Vanek |
753dfc1 |
- return MAX2((n_par_threads + 2) / 4, 1U);
|
|
Jiri Vanek |
753dfc1 |
+ return MAX2((size_t)((n_par_threads + 2) / 4), (size_t)1);
|
|
Jiri Vanek |
753dfc1 |
}
|
|
Jiri Vanek |
753dfc1 |
|
|
Jiri Vanek |
753dfc1 |
ConcurrentMark::ConcurrentMark(ReservedSpace rs,
|
|
Jiri Vanek |
753dfc1 |
@@ -571,7 +571,7 @@
|
|
|
9d475db |
_regionStack(),
|
|
|
9d475db |
// _finger set in set_non_marking_state
|
|
|
9d475db |
|
|
Jiri Vanek |
753dfc1 |
- _max_task_num(MAX2((uint)ParallelGCThreads, 1U)),
|
|
|
9d475db |
+ _max_task_num(MAX2((size_t)ParallelGCThreads, (size_t)1)),
|
|
|
9d475db |
// _active_tasks set in set_non_marking_state
|
|
|
9d475db |
// _tasks set inside the constructor
|
|
|
9d475db |
_task_queues(new CMTaskQueueSet((int) _max_task_num)),
|
|
Jiri Vanek |
753dfc1 |
@@ -1318,7 +1318,7 @@
|
|
Jiri Vanek |
753dfc1 |
assert(parallel_marking_threads() <= max_parallel_marking_threads(),
|
|
Jiri Vanek |
753dfc1 |
"Maximum number of marking threads exceeded");
|
|
|
9d475db |
|
|
Jiri Vanek |
753dfc1 |
- uint active_workers = MAX2(1U, parallel_marking_threads());
|
|
|
9d475db |
+ size_t active_workers = MAX2((size_t) 1, (size_t)parallel_marking_threads());
|
|
|
9d475db |
|
|
Jiri Vanek |
753dfc1 |
// Parallel task terminator is set in "set_phase()"
|
|
Jiri Vanek |
753dfc1 |
set_phase(active_workers, true /* concurrent */);
|
|
Jiri Vanek |
753dfc1 |
@@ -4515,7 +4515,7 @@
|
|
|
9d475db |
// of things to do) or totally (at the very end).
|
|
|
9d475db |
size_t target_size;
|
|
|
9d475db |
if (partially) {
|
|
|
9d475db |
- target_size = MIN2((size_t)_task_queue->max_elems()/3, GCDrainStackTargetSize);
|
|
|
9d475db |
+ target_size = MIN2((size_t)(_task_queue->max_elems()/3), (size_t) GCDrainStackTargetSize);
|
|
|
9d475db |
} else {
|
|
|
9d475db |
target_size = 0;
|
|
|
9d475db |
}
|
|
Jiri Vanek |
753dfc1 |
@@ -5438,7 +5438,7 @@
|
|
|
9d475db |
// The > 0 check is to deal with the prev and next live bytes which
|
|
|
9d475db |
// could be 0.
|
|
|
9d475db |
if (*hum_bytes > 0) {
|
|
Jiri Vanek |
753dfc1 |
- bytes = MIN2(HeapRegion::GrainBytes, *hum_bytes);
|
|
|
9d475db |
+ bytes = MIN2((size_t) HeapRegion::GrainBytes, (size_t)*hum_bytes);
|
|
|
9d475db |
*hum_bytes -= bytes;
|
|
|
9d475db |
}
|
|
|
9d475db |
return bytes;
|
|
|
9d475db |
diff -up openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp.sav openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
|
|
|
9d475db |
--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp.sav 2012-02-14 16:11:12.000000000 -0500
|
|
|
9d475db |
+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp 2012-03-09 14:48:08.226867784 -0500
|
|
|
9d475db |
@@ -1615,7 +1615,7 @@ HeapWord* G1CollectedHeap::expand_and_al
|
|
|
9d475db |
|
|
|
9d475db |
verify_region_sets_optional();
|
|
|
9d475db |
|
|
|
9d475db |
- size_t expand_bytes = MAX2(word_size * HeapWordSize, MinHeapDeltaBytes);
|
|
|
9d475db |
+ size_t expand_bytes = MAX2(word_size * HeapWordSize, (size_t)MinHeapDeltaBytes);
|
|
|
9d475db |
ergo_verbose1(ErgoHeapSizing,
|
|
|
9d475db |
"attempt heap expansion",
|
|
|
9d475db |
ergo_format_reason("allocation request failed")
|
|
|
9d475db |
diff -up openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp.sav openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp
|
|
|
9d475db |
--- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp.sav 2012-02-14 16:11:12.000000000 -0500
|
|
|
9d475db |
+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp 2012-03-09 14:48:08.226867784 -0500
|
|
|
9d475db |
@@ -1083,7 +1083,7 @@ OtherRegionsTable::do_cleanup_work(HRRSC
|
|
|
9d475db |
// This can be done by either mutator threads together with the
|
|
|
9d475db |
// concurrent refinement threads or GC threads.
|
|
|
9d475db |
int HeapRegionRemSet::num_par_rem_sets() {
|
|
|
9d475db |
- return (int)MAX2(DirtyCardQueueSet::num_par_ids() + ConcurrentG1Refine::thread_num(), ParallelGCThreads);
|
|
|
9d475db |
+ return (int)MAX2(DirtyCardQueueSet::num_par_ids() + ConcurrentG1Refine::thread_num(), (size_t)ParallelGCThreads);
|
|
|
9d475db |
}
|
|
|
9d475db |
|
|
|
9d475db |
HeapRegionRemSet::HeapRegionRemSet(G1BlockOffsetSharedArray* bosa,
|
|
|
9d475db |
diff -up openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp.sav openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp
|
|
|
9d475db |
--- openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp.sav 2012-02-14 16:11:12.000000000 -0500
|
|
|
9d475db |
+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp 2012-03-09 14:48:08.226867784 -0500
|
|
|
9d475db |
@@ -62,7 +62,7 @@ ParMarkBitMap::initialize(MemRegion cove
|
|
|
9d475db |
if (_virtual_space != NULL && _virtual_space->expand_by(bytes)) {
|
|
|
9d475db |
_region_start = covered_region.start();
|
|
|
9d475db |
_region_size = covered_region.word_size();
|
|
|
9d475db |
- idx_t* map = (idx_t*)_virtual_space->reserved_low_addr();
|
|
|
9d475db |
+ BitMap::bm_word_t* map = (BitMap::bm_word_t*)_virtual_space->reserved_low_addr();
|
|
|
9d475db |
_beg_bits.set_map(map);
|
|
|
9d475db |
_beg_bits.set_size(bits / 2);
|
|
|
9d475db |
_end_bits.set_map(map + words / 2);
|
|
|
9d475db |
diff -up openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp.sav openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
|
|
|
9d475db |
--- openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp.sav 2012-02-14 16:11:12.000000000 -0500
|
|
|
9d475db |
+++ openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp 2012-03-09 14:48:08.227867766 -0500
|
|
|
9d475db |
@@ -188,7 +188,7 @@ bool ParScanThreadState::take_from_overf
|
|
|
9d475db |
const size_t num_overflow_elems = of_stack->size();
|
|
|
9d475db |
const size_t space_available = queue->max_elems() - queue->size();
|
|
|
9d475db |
const size_t num_take_elems = MIN3(space_available / 4,
|
|
|
9d475db |
- ParGCDesiredObjsFromOverflowList,
|
|
|
9d475db |
+ (size_t)ParGCDesiredObjsFromOverflowList,
|
|
|
9d475db |
num_overflow_elems);
|
|
|
9d475db |
// Transfer the most recent num_take_elems from the overflow
|
|
|
9d475db |
// stack to our work queue.
|
|
|
9d475db |
diff -up openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp.sav openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp
|
|
|
9d475db |
--- openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp.sav 2012-02-14 16:11:12.000000000 -0500
|
|
|
9d475db |
+++ openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp 2012-03-09 14:48:08.227867766 -0500
|
|
|
9d475db |
@@ -354,7 +354,7 @@ void GenCollectorPolicy::initialize_size
|
|
|
9d475db |
// generally small compared to the NewRatio calculation.
|
|
|
9d475db |
_min_gen0_size = NewSize;
|
|
|
9d475db |
desired_new_size = NewSize;
|
|
|
9d475db |
- max_new_size = MAX2(max_new_size, NewSize);
|
|
|
9d475db |
+ max_new_size = MAX2(max_new_size, (size_t)NewSize);
|
|
|
9d475db |
} else {
|
|
|
9d475db |
// For the case where NewSize is the default, use NewRatio
|
|
|
9d475db |
// to size the minimum and initial generation sizes.
|
|
|
9d475db |
@@ -362,10 +362,10 @@ void GenCollectorPolicy::initialize_size
|
|
|
9d475db |
// NewRatio is overly large, the resulting sizes can be too
|
|
|
9d475db |
// small.
|
|
|
9d475db |
_min_gen0_size = MAX2(scale_by_NewRatio_aligned(min_heap_byte_size()),
|
|
|
9d475db |
- NewSize);
|
|
|
9d475db |
+ (size_t)NewSize);
|
|
|
9d475db |
desired_new_size =
|
|
|
9d475db |
MAX2(scale_by_NewRatio_aligned(initial_heap_byte_size()),
|
|
|
9d475db |
- NewSize);
|
|
|
9d475db |
+ (size_t)NewSize);
|
|
|
9d475db |
}
|
|
|
9d475db |
|
|
|
9d475db |
assert(_min_gen0_size > 0, "Sanity check");
|
|
|
9d475db |
@@ -420,14 +420,14 @@ bool TwoGenerationCollectorPolicy::adjus
|
|
|
9d475db |
// Adjust gen0 down to accomodate OldSize
|
|
|
9d475db |
*gen0_size_ptr = heap_size - min_gen0_size;
|
|
|
9d475db |
*gen0_size_ptr =
|
|
|
9d475db |
- MAX2((uintx)align_size_down(*gen0_size_ptr, min_alignment()),
|
|
|
9d475db |
+ MAX2((size_t)align_size_down(*gen0_size_ptr, min_alignment()),
|
|
|
9d475db |
min_alignment());
|
|
|
9d475db |
assert(*gen0_size_ptr > 0, "Min gen0 is too large");
|
|
|
9d475db |
result = true;
|
|
|
9d475db |
} else {
|
|
|
9d475db |
*gen1_size_ptr = heap_size - *gen0_size_ptr;
|
|
|
9d475db |
*gen1_size_ptr =
|
|
|
9d475db |
- MAX2((uintx)align_size_down(*gen1_size_ptr, min_alignment()),
|
|
|
9d475db |
+ MAX2((size_t)align_size_down(*gen1_size_ptr, min_alignment()),
|
|
|
9d475db |
min_alignment());
|
|
|
9d475db |
}
|
|
|
9d475db |
}
|
|
|
9d475db |
@@ -451,7 +451,7 @@ void TwoGenerationCollectorPolicy::initi
|
|
|
9d475db |
// for setting the gen1 maximum.
|
|
|
9d475db |
_max_gen1_size = max_heap_byte_size() - _max_gen0_size;
|
|
|
9d475db |
_max_gen1_size =
|
|
|
9d475db |
- MAX2((uintx)align_size_down(_max_gen1_size, min_alignment()),
|
|
|
9d475db |
+ MAX2((size_t)align_size_down(_max_gen1_size, min_alignment()),
|
|
|
9d475db |
min_alignment());
|
|
|
9d475db |
// If no explicit command line flag has been set for the
|
|
|
9d475db |
// gen1 size, use what is left for gen1.
|
|
|
9d475db |
@@ -465,11 +465,11 @@ void TwoGenerationCollectorPolicy::initi
|
|
|
9d475db |
"gen0 has an unexpected minimum size");
|
|
|
9d475db |
set_min_gen1_size(min_heap_byte_size() - min_gen0_size());
|
|
|
9d475db |
set_min_gen1_size(
|
|
|
9d475db |
- MAX2((uintx)align_size_down(_min_gen1_size, min_alignment()),
|
|
|
9d475db |
+ MAX2((size_t)align_size_down(_min_gen1_size, min_alignment()),
|
|
|
9d475db |
min_alignment()));
|
|
|
9d475db |
set_initial_gen1_size(initial_heap_byte_size() - initial_gen0_size());
|
|
|
9d475db |
set_initial_gen1_size(
|
|
|
9d475db |
- MAX2((uintx)align_size_down(_initial_gen1_size, min_alignment()),
|
|
|
9d475db |
+ MAX2((size_t)align_size_down(_initial_gen1_size, min_alignment()),
|
|
|
9d475db |
min_alignment()));
|
|
|
9d475db |
|
|
|
9d475db |
} else {
|
|
|
9d475db |
diff -up openjdk/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp.sav openjdk/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp
|
|
|
9d475db |
--- openjdk/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp.sav 2012-02-14 16:11:12.000000000 -0500
|
|
|
9d475db |
+++ openjdk/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp 2012-03-09 14:48:08.227867766 -0500
|
|
|
9d475db |
@@ -46,7 +46,7 @@ void objArrayKlass::objarray_follow_cont
|
|
|
9d475db |
const size_t beg_index = size_t(index);
|
|
|
9d475db |
assert(beg_index < len || len == 0, "index too large");
|
|
|
9d475db |
|
|
|
9d475db |
- const size_t stride = MIN2(len - beg_index, ObjArrayMarkingStride);
|
|
|
9d475db |
+ const size_t stride = MIN2(len - beg_index, (size_t)ObjArrayMarkingStride);
|
|
|
9d475db |
const size_t end_index = beg_index + stride;
|
|
|
9d475db |
T* const base = (T*)a->base();
|
|
|
9d475db |
T* const beg = base + beg_index;
|
|
|
9d475db |
@@ -80,7 +80,7 @@ void objArrayKlass::objarray_follow_cont
|
|
|
9d475db |
const size_t beg_index = size_t(index);
|
|
|
9d475db |
assert(beg_index < len || len == 0, "index too large");
|
|
|
9d475db |
|
|
|
9d475db |
- const size_t stride = MIN2(len - beg_index, ObjArrayMarkingStride);
|
|
|
9d475db |
+ const size_t stride = MIN2(len - beg_index, (size_t)ObjArrayMarkingStride);
|
|
|
9d475db |
const size_t end_index = beg_index + stride;
|
|
|
9d475db |
T* const base = (T*)a->base();
|
|
|
9d475db |
T* const beg = base + beg_index;
|
|
|
9d475db |
diff -up openjdk/hotspot/src/share/vm/runtime/arguments.cpp.sav openjdk/hotspot/src/share/vm/runtime/arguments.cpp
|
|
|
9d475db |
--- openjdk/hotspot/src/share/vm/runtime/arguments.cpp.sav 2012-02-14 16:11:12.000000000 -0500
|
|
|
9d475db |
+++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp 2012-03-09 14:48:08.228867748 -0500
|
|
|
9d475db |
@@ -1179,7 +1179,7 @@ void Arguments::set_cms_and_parnew_gc_fl
|
|
|
9d475db |
// so it's NewRatio x of NewSize.
|
|
|
9d475db |
if (FLAG_IS_DEFAULT(OldSize)) {
|
|
|
9d475db |
if (max_heap > NewSize) {
|
|
|
9d475db |
- FLAG_SET_ERGO(uintx, OldSize, MIN2(NewRatio*NewSize, max_heap - NewSize));
|
|
|
9d475db |
+ FLAG_SET_ERGO(uintx, OldSize, MIN2((size_t)(NewRatio*NewSize), max_heap - NewSize));
|
|
|
9d475db |
if (PrintGCDetails && Verbose) {
|
|
|
9d475db |
// Too early to use gclog_or_tty
|
|
|
9d475db |
tty->print_cr("CMS ergo set OldSize: " SIZE_FORMAT, OldSize);
|