src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp

*** 275,285 ****
                _g1h->heap_region_containing((HeapWord*) objAddr)), "invariant");
    assert(!_g1h->is_obj_ill(obj), "invariant");
    assert(_nextMarkBitMap->isMarked(objAddr), "invariant");
  
    if (_cm->verbose_high()) {
!     gclog_or_tty->print_cr("[%u] pushing "PTR_FORMAT, _worker_id, (void*) obj);
    }
  
    if (!_task_queue->push(obj)) {
      // The local task queue looks full. We need to push some entries
      // to the global stack.
--- 275,285 ----
                _g1h->heap_region_containing((HeapWord*) objAddr)), "invariant");
    assert(!_g1h->is_obj_ill(obj), "invariant");
    assert(_nextMarkBitMap->isMarked(objAddr), "invariant");
  
    if (_cm->verbose_high()) {
!     gclog_or_tty->print_cr("[%u] pushing " PTR_FORMAT, _worker_id, p2i((void*) obj));
    }
  
    if (!_task_queue->push(obj)) {
      // The local task queue looks full. We need to push some entries
      // to the global stack.
*** 315,325 ****
  #define _CHECK_BOTH_FINGERS_      1
  
  inline void CMTask::deal_with_reference(oop obj) {
    if (_cm->verbose_high()) {
      gclog_or_tty->print_cr("[%u] we're dealing with reference = "PTR_FORMAT,
!                            _worker_id, (void*) obj);
    }
  
    ++_refs_reached;
  
    HeapWord* objAddr = (HeapWord*) obj;
--- 315,325 ----
  #define _CHECK_BOTH_FINGERS_      1
  
  inline void CMTask::deal_with_reference(oop obj) {
    if (_cm->verbose_high()) {
      gclog_or_tty->print_cr("[%u] we're dealing with reference = "PTR_FORMAT,
!                            _worker_id, p2i((void*) obj));
    }
  
    ++_refs_reached;
  
    HeapWord* objAddr = (HeapWord*) obj;
*** 332,342 ****
        // anything with it).
        HeapRegion* hr = _g1h->heap_region_containing_raw(obj);
        if (!hr->obj_allocated_since_next_marking(obj)) {
          if (_cm->verbose_high()) {
            gclog_or_tty->print_cr("[%u] "PTR_FORMAT" is not considered marked",
!                                  _worker_id, (void*) obj);
          }
  
          // we need to mark it first
          if (_cm->par_mark_and_count(obj, hr, _marked_bytes_array, _card_bm)) {
            // No OrderAccess:store_load() is needed. It is implicit in the
--- 332,342 ----
        // anything with it).
        HeapRegion* hr = _g1h->heap_region_containing_raw(obj);
        if (!hr->obj_allocated_since_next_marking(obj)) {
          if (_cm->verbose_high()) {
            gclog_or_tty->print_cr("[%u] "PTR_FORMAT" is not considered marked",
!                                  _worker_id, p2i((void*) obj));
          }
  
          // we need to mark it first
          if (_cm->par_mark_and_count(obj, hr, _marked_bytes_array, _card_bm)) {
            // No OrderAccess:store_load() is needed. It is implicit in the
*** 347,357 ****
            // we will check both the local and global fingers
  
            if (_finger != NULL && objAddr < _finger) {
              if (_cm->verbose_high()) {
                gclog_or_tty->print_cr("[%u] below the local finger ("PTR_FORMAT"), "
!                                      "pushing it", _worker_id, _finger);
              }
              push(obj);
            } else if (_curr_region != NULL && objAddr < _region_limit) {
              // do nothing
            } else if (objAddr < global_finger) {
--- 347,357 ----
            // we will check both the local and global fingers
  
            if (_finger != NULL && objAddr < _finger) {
              if (_cm->verbose_high()) {
                gclog_or_tty->print_cr("[%u] below the local finger ("PTR_FORMAT"), "
!                                      "pushing it", _worker_id, p2i(_finger));
              }
              push(obj);
            } else if (_curr_region != NULL && objAddr < _region_limit) {
              // do nothing
            } else if (objAddr < global_finger) {
*** 365,375 ****
              // correctness problems.
  
              if (_cm->verbose_high()) {
                gclog_or_tty->print_cr("[%u] below the global finger "
                                       "("PTR_FORMAT"), pushing it",
!                                      _worker_id, global_finger);
              }
              push(obj);
            } else {
              // do nothing
            }
--- 365,375 ----
              // correctness problems.
  
              if (_cm->verbose_high()) {
                gclog_or_tty->print_cr("[%u] below the global finger "
                                       "("PTR_FORMAT"), pushing it",
!                                      _worker_id, p2i(global_finger));
              }
              push(obj);
            } else {
              // do nothing
            }
*** 380,390 ****
              // see long comment above
  
              if (_cm->verbose_high()) {
                gclog_or_tty->print_cr("[%u] below the global finger "
                                       "("PTR_FORMAT"), pushing it",
!                                      _worker_id, global_finger);
              }
              push(obj);
            }
  #endif // _CHECK_BOTH_FINGERS_
          }
--- 380,390 ----
              // see long comment above
  
              if (_cm->verbose_high()) {
                gclog_or_tty->print_cr("[%u] below the global finger "
                                       "("PTR_FORMAT"), pushing it",
!                                      _worker_id, p2i(global_finger));
              }
              push(obj);
            }
  #endif // _CHECK_BOTH_FINGERS_
          }