src/share/vm/gc_implementation/g1/g1HotCardCache.cpp

rev 7209 : 6979279
rev 7210 : imported patch rev1

*** 41,51 ****
  
      _n_hot = 0;
      _hot_cache_idx = 0;
  
      // For refining the cards in the hot cache in parallel
!     _hot_cache_par_chunk_size = (ParallelGCThreads > 0 ? ClaimChunkSize : _hot_cache_size);
      _hot_cache_par_claimed_idx = 0;
  
      _card_counts.initialize(card_counts_storage);
    }
  }
--- 41,51 ----
  
      _n_hot = 0;
      _hot_cache_idx = 0;
  
      // For refining the cards in the hot cache in parallel
!     _hot_cache_par_chunk_size = ClaimChunkSize;
      _hot_cache_par_claimed_idx = 0;
  
      _card_counts.initialize(card_counts_storage);
    }
  }
*** 117,127 ****
              // The only time we care about recording cards that contain
              // references that point into the collection set is during
              // RSet updating while within an evacuation pause.
              // In this case worker_i should be the id of a GC worker thread
              assert(SafepointSynchronize::is_at_safepoint(), "Should be at a safepoint");
!             assert(worker_i < (ParallelGCThreads == 0 ? 1 : ParallelGCThreads),
                     err_msg("incorrect worker id: %u", worker_i));
  
              into_cset_dcq->enqueue(card_ptr);
            }
          }
--- 117,127 ----
              // The only time we care about recording cards that contain
              // references that point into the collection set is during
              // RSet updating while within an evacuation pause.
              // In this case worker_i should be the id of a GC worker thread
              assert(SafepointSynchronize::is_at_safepoint(), "Should be at a safepoint");
!             assert(worker_i < ParallelGCThreads,
                     err_msg("incorrect worker id: %u", worker_i));
  
              into_cset_dcq->enqueue(card_ptr);
            }
          }