src/hotspot/share/gc/g1/g1RemSet.cpp

*** 175,187 ****
      void add_dirty_region(uint region) {
        if (_contains[region]) {
          return;
        }
  
!       bool marked_as_dirty = Atomic::cmpxchg(true, &_contains[region], false) == false;
        if (marked_as_dirty) {
!         uint allocated = Atomic::add(1u, &_cur_idx) - 1;
          _buffer[allocated] = region;
        }
      }
  
      // Creates the union of this and the other G1DirtyRegions.
--- 175,187 ----
      void add_dirty_region(uint region) {
        if (_contains[region]) {
          return;
        }
  
!       bool marked_as_dirty = Atomic::cmpxchg(&_contains[region], false, true) == false;
        if (marked_as_dirty) {
!         uint allocated = Atomic::add(&_cur_idx, 1u) - 1;
          _buffer[allocated] = region;
        }
      }
  
      // Creates the union of this and the other G1DirtyRegions.
*** 253,263 ****
  
      static uint chunk_size() { return M; }
  
      void work(uint worker_id) {
        while (_cur_dirty_regions < _regions->size()) {
!         uint next = Atomic::add(_chunk_length, &_cur_dirty_regions) - _chunk_length;
          uint max = MIN2(next + _chunk_length, _regions->size());
  
          for (uint i = next; i < max; i++) {
            HeapRegion* r = _g1h->region_at(_regions->at(i));
            if (!r->is_survivor()) {
--- 253,263 ----
  
      static uint chunk_size() { return M; }
  
      void work(uint worker_id) {
        while (_cur_dirty_regions < _regions->size()) {
!         uint next = Atomic::add(&_cur_dirty_regions, _chunk_length) - _chunk_length;
          uint max = MIN2(next + _chunk_length, _regions->size());
  
          for (uint i = next; i < max; i++) {
            HeapRegion* r = _g1h->region_at(_regions->at(i));
            if (!r->is_survivor()) {
*** 435,455 ****
    inline bool claim_collection_set_region(uint region) {
      assert(region < _max_regions, "Tried to access invalid region %u", region);
      if (_collection_set_iter_state[region]) {
        return false;
      }
!     return !Atomic::cmpxchg(true, &_collection_set_iter_state[region], false);
    }
  
    bool has_cards_to_scan(uint region) {
      assert(region < _max_regions, "Tried to access invalid region %u", region);
      return _card_table_scan_state[region] < HeapRegion::CardsPerRegion;
    }
  
    uint claim_cards_to_scan(uint region, uint increment) {
      assert(region < _max_regions, "Tried to access invalid region %u", region);
!     return Atomic::add(increment, &_card_table_scan_state[region]) - increment;
    }
  
    void add_dirty_region(uint const region) {
  #ifdef ASSERT
     HeapRegion* hr = G1CollectedHeap::heap()->region_at(region);
--- 435,455 ----
    inline bool claim_collection_set_region(uint region) {
      assert(region < _max_regions, "Tried to access invalid region %u", region);
      if (_collection_set_iter_state[region]) {
        return false;
      }
!     return !Atomic::cmpxchg(&_collection_set_iter_state[region], false, true);
    }
  
    bool has_cards_to_scan(uint region) {
      assert(region < _max_regions, "Tried to access invalid region %u", region);
      return _card_table_scan_state[region] < HeapRegion::CardsPerRegion;
    }
  
    uint claim_cards_to_scan(uint region, uint increment) {
      assert(region < _max_regions, "Tried to access invalid region %u", region);
!     return Atomic::add(&_card_table_scan_state[region], increment) - increment;
    }
  
    void add_dirty_region(uint const region) {
  #ifdef ASSERT
     HeapRegion* hr = G1CollectedHeap::heap()->region_at(region);
*** 1135,1145 ****
      // We schedule flushing the remembered sets of humongous fast reclaim candidates
      // onto the card table first to allow the remaining parallelized tasks hide it.
      if (_initial_evacuation &&
          p->fast_reclaim_humongous_candidates() > 0 &&
          !_fast_reclaim_handled &&
!         !Atomic::cmpxchg(true, &_fast_reclaim_handled, false)) {
  
        G1GCParPhaseTimesTracker x(p, G1GCPhaseTimes::MergeER, worker_id);
  
        G1FlushHumongousCandidateRemSets cl(_scan_state);
        g1h->heap_region_iterate(&cl);
--- 1135,1145 ----
      // We schedule flushing the remembered sets of humongous fast reclaim candidates
      // onto the card table first to allow the remaining parallelized tasks hide it.
      if (_initial_evacuation &&
          p->fast_reclaim_humongous_candidates() > 0 &&
          !_fast_reclaim_handled &&
!         !Atomic::cmpxchg(&_fast_reclaim_handled, false, true)) {
  
        G1GCParPhaseTimesTracker x(p, G1GCPhaseTimes::MergeER, worker_id);
  
        G1FlushHumongousCandidateRemSets cl(_scan_state);
        g1h->heap_region_iterate(&cl);