Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp	Mon Jul 21 09:40:19 2014 +0200
     1.2 +++ b/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp	Mon Jul 21 09:40:19 2014 +0200
     1.3 @@ -770,30 +770,6 @@
     1.4    clear_fcc();
     1.5  }
     1.6  
     1.7 -void OtherRegionsTable::clear_incoming_entry(HeapRegion* from_hr) {
     1.8 -  MutexLockerEx x(_m, Mutex::_no_safepoint_check_flag);
     1.9 -  size_t hrs_ind = (size_t) from_hr->hrs_index();
    1.10 -  size_t ind = hrs_ind & _mod_max_fine_entries_mask;
    1.11 -  if (del_single_region_table(ind, from_hr)) {
    1.12 -    assert(!_coarse_map.at(hrs_ind), "Inv");
    1.13 -  } else {
    1.14 -    _coarse_map.par_at_put(hrs_ind, 0);
    1.15 -  }
    1.16 -  // Check to see if any of the fcc entries come from here.
    1.17 -  uint hr_ind = hr()->hrs_index();
    1.18 -  for (uint tid = 0; tid < HeapRegionRemSet::num_par_rem_sets(); tid++) {
    1.19 -    int fcc_ent = FromCardCache::at(tid, hr_ind);
    1.20 -    if (fcc_ent != FromCardCache::InvalidCard) {
    1.21 -      HeapWord* card_addr = (HeapWord*)
    1.22 -        (uintptr_t(fcc_ent) << CardTableModRefBS::card_shift);
    1.23 -      if (hr()->is_in_reserved(card_addr)) {
    1.24 -        // Clear the from card cache.
    1.25 -        FromCardCache::set(tid, hr_ind, FromCardCache::InvalidCard);
    1.26 -      }
    1.27 -    }
    1.28 -  }
    1.29 -}
    1.30 -
    1.31  bool OtherRegionsTable::del_single_region_table(size_t ind,
    1.32                                                  HeapRegion* hr) {
    1.33    assert(0 <= ind && ind < _max_fine_entries, "Preconditions.");

     2.1 --- a/src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp	Mon Jul 21 09:40:19 2014 +0200
     2.2 +++ b/src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp	Mon Jul 21 09:40:19 2014 +0200
     2.3 @@ -206,9 +206,6 @@
     2.4    // Specifically clear the from_card_cache.
     2.5    void clear_fcc();
     2.6  
     2.7 -  // "from_hr" is being cleared; remove any entries from it.
     2.8 -  void clear_incoming_entry(HeapRegion* from_hr);
     2.9 -
    2.10    void do_cleanup_work(HRRSCleanupTask* hrrs_cleanup_task);
    2.11  
    2.12    // Declare the heap size (in # of regions) to the OtherRegionsTable.