1.1 --- a/src/share/vm/gc_implementation/g1/g1HotCardCache.cpp Tue Apr 08 14:55:16 2014 -0700
1.2 +++ b/src/share/vm/gc_implementation/g1/g1HotCardCache.cpp Thu Apr 03 17:49:31 2014 +0400
1.3 @@ -44,9 +44,9 @@
1.4 _hot_cache_idx = 0;
1.5
1.6 // For refining the cards in the hot cache in parallel
1.7 - int n_workers = (ParallelGCThreads > 0 ?
1.8 + uint n_workers = (ParallelGCThreads > 0 ?
1.9 _g1h->workers()->total_workers() : 1);
1.10 - _hot_cache_par_chunk_size = MAX2(1, _hot_cache_size / n_workers);
1.11 + _hot_cache_par_chunk_size = MAX2(1, _hot_cache_size / (int)n_workers);
1.12 _hot_cache_par_claimed_idx = 0;
1.13
1.14 _card_counts.initialize();
1.15 @@ -89,7 +89,7 @@
1.16 return res;
1.17 }
1.18
1.19 -void G1HotCardCache::drain(int worker_i,
1.20 +void G1HotCardCache::drain(uint worker_i,
1.21 G1RemSet* g1rs,
1.22 DirtyCardQueue* into_cset_dcq) {
1.23 if (!default_use_cache()) {
1.24 @@ -122,8 +122,8 @@
1.25 // RSet updating while within an evacuation pause.
1.26 // In this case worker_i should be the id of a GC worker thread
1.27 assert(SafepointSynchronize::is_at_safepoint(), "Should be at a safepoint");
1.28 - assert(worker_i < (int) (ParallelGCThreads == 0 ? 1 : ParallelGCThreads),
1.29 - err_msg("incorrect worker id: "INT32_FORMAT, worker_i));
1.30 + assert(worker_i < (ParallelGCThreads == 0 ? 1 : ParallelGCThreads),
1.31 + err_msg("incorrect worker id: "UINT32_FORMAT, worker_i));
1.32
1.33 into_cset_dcq->enqueue(card_ptr);
1.34 }
