src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp

rev 7209 : [mq]: inccms
rev 7210 : [mq]: icms-reviews

*** 434,446 ****
  #ifndef PRODUCT
  void CMSStats::print_on(outputStream *st) const {
    st->print(" gc0_alpha=%d,cms_alpha=%d", _gc0_alpha, _cms_alpha);
    st->print(",gc0_dur=%g,gc0_per=%g,gc0_promo=" SIZE_FORMAT,
                 gc0_duration(), gc0_period(), gc0_promoted());
!   st->print(",cms_dur=%g,cms_dur_per_mb=%g,cms_per=%g,cms_alloc=" SIZE_FORMAT,
!             cms_duration(), cms_duration_per_mb(),
!             cms_period(), cms_allocated());
    st->print(",cms_since_beg=%g,cms_since_end=%g",
              cms_time_since_begin(), cms_time_since_end());
    st->print(",cms_used_beg=" SIZE_FORMAT ",cms_used_end=" SIZE_FORMAT,
              _cms_used_at_gc0_begin, _cms_used_at_gc0_end);
  
--- 434,445 ----
  #ifndef PRODUCT
  void CMSStats::print_on(outputStream *st) const {
    st->print(" gc0_alpha=%d,cms_alpha=%d", _gc0_alpha, _cms_alpha);
    st->print(",gc0_dur=%g,gc0_per=%g,gc0_promo=" SIZE_FORMAT,
                 gc0_duration(), gc0_period(), gc0_promoted());
!   st->print(",cms_dur=%g,cms_per=%g,cms_alloc=" SIZE_FORMAT,
!             cms_duration(), cms_period(), cms_allocated());
    st->print(",cms_since_beg=%g,cms_since_end=%g",
              cms_time_since_begin(), cms_time_since_end());
    st->print(",cms_used_beg=" SIZE_FORMAT ",cms_used_end=" SIZE_FORMAT,
              _cms_used_at_gc0_begin, _cms_used_at_gc0_end);
  
*** 1035,1050 ****
        }
      }
    }
  }
  
- static inline size_t percent_of_space(Space* space, HeapWord* addr)
- {
-   size_t delta = pointer_delta(addr, space->bottom());
-   return (size_t)(delta * 100.0 / (space->capacity() / HeapWordSize));
- }
- 
  oop ConcurrentMarkSweepGeneration::promote(oop obj, size_t obj_size) {
    assert(obj_size == (size_t)obj->size(), "bad obj_size passed in");
    // allocate, copy and if necessary update promoinfo --
    // delegate to underlying space.
    assert_lock_strong(freelistLock());
--- 1034,1043 ----
*** 5188,5198 ****
      assert(pst->valid(), "Uninitialized use?");
      HeapWord *start, *end;
      while (!pst->is_task_claimed(/* reference */ nth_task)) {
        // We claimed task # nth_task; compute its boundaries.
        if (chunk_top == 0) {  // no samples were taken
!         assert(nth_task == 0 && n_tasks == 1, "Can have only 1 EdenSpace task");
          start = space->bottom();
          end   = space->top();
        } else if (nth_task == 0) {
          start = space->bottom();
          end   = chunk_array[nth_task];
--- 5181,5191 ----
      assert(pst->valid(), "Uninitialized use?");
      HeapWord *start, *end;
      while (!pst->is_task_claimed(/* reference */ nth_task)) {
        // We claimed task # nth_task; compute its boundaries.
        if (chunk_top == 0) {  // no samples were taken
!         assert(nth_task == 0 && n_tasks == 1, "Can have only 1 eden task");
          start = space->bottom();
          end   = space->top();
        } else if (nth_task == 0) {
          start = space->bottom();
          end   = chunk_array[nth_task];
*** 5566,5576 ****
  
    // The young gen rescan work will not be done as part of
    // process_roots (which currently doesn't know how to
    // parallelize such a scan), but rather will be broken up into
    // a set of parallel tasks (via the sampling that the [abortable]
!   // preclean phase did of EdenSpace, plus the [two] tasks of
    // scanning the [two] survivor spaces. Further fine-grain
    // parallelization of the scanning of the survivor spaces
    // themselves, and of precleaning of the younger gen itself
    // is deferred to the future.
    initialize_sequential_subtasks_for_young_gen_rescan(n_workers);
--- 5559,5569 ----
  
    // The young gen rescan work will not be done as part of
    // process_roots (which currently doesn't know how to
    // parallelize such a scan), but rather will be broken up into
    // a set of parallel tasks (via the sampling that the [abortable]
!   // preclean phase did of eden, plus the [two] tasks of
    // scanning the [two] survivor spaces. Further fine-grain
    // parallelization of the scanning of the survivor spaces
    // themselves, and of precleaning of the younger gen itself
    // is deferred to the future.
    initialize_sequential_subtasks_for_young_gen_rescan(n_workers);