| Index: src/heap/gc-tracer.cc
|
| diff --git a/src/heap/gc-tracer.cc b/src/heap/gc-tracer.cc
|
| index 24901ddbd70e40ebdfc67b110b0db27f0036fe47..ec1ad653910007bac0f75df3bfa351bebd2011bc 100644
|
| --- a/src/heap/gc-tracer.cc
|
| +++ b/src/heap/gc-tracer.cc
|
| @@ -502,135 +502,128 @@ void GCTracer::PrintNVP() const {
|
| break;
|
| case Event::MARK_COMPACTOR:
|
| case Event::INCREMENTAL_MARK_COMPACTOR:
|
| - PrintIsolate(heap_->isolate(),
|
| - "%8.0f ms: "
|
| - "pause=%.1f "
|
| - "mutator=%.1f "
|
| - "gc=%s "
|
| - "reduce_memory=%d "
|
| - "external=%.1f "
|
| - "mark=%.1f "
|
| - "mark_inc=%.1f "
|
| - "mark_prepcodeflush=%.1f "
|
| - "mark_root=%.1f "
|
| - "mark_topopt=%.1f "
|
| - "mark_weakclosure=%.1f "
|
| - "mark_stringtable=%.1f "
|
| - "mark_weakrefs=%.1f "
|
| - "mark_globalhandles=%.1f "
|
| - "mark_codeflush=%.1f "
|
| - "store_buffer_clear=%.1f "
|
| - "slots_buffer_clear=%.1f "
|
| - "sweep=%.2f "
|
| - "sweepns=%.2f "
|
| - "sweepos=%.2f "
|
| - "sweepcode=%.2f "
|
| - "sweepcell=%.2f "
|
| - "sweepmap=%.2f "
|
| - "sweepaborted=%.2f "
|
| - "evacuate=%.1f "
|
| - "new_new=%.1f "
|
| - "root_new=%.1f "
|
| - "old_new=%.1f "
|
| - "compaction_ptrs=%.1f "
|
| - "intracompaction_ptrs=%.1f "
|
| - "misc_compaction=%.1f "
|
| - "inc_weak_closure=%.1f "
|
| - "weakcollection_process=%.1f "
|
| - "weakcollection_clear=%.1f "
|
| - "weakcollection_abort=%.1f "
|
| - "clear=%1f"
|
| - "clear_weakcell=%.1f "
|
| - "clear_map=%.1f "
|
| - "clear_dependent_code=%.1f "
|
| - "steps_count=%d "
|
| - "steps_took=%.1f "
|
| - "longest_step=%.1f "
|
| - "finalization_steps_count=%d "
|
| - "finalization_steps_took=%.1f "
|
| - "finalization_longest_step=%.1f "
|
| - "incremental_marking_throughput=%" V8_PTR_PREFIX
|
| - "d "
|
| - "total_size_before=%" V8_PTR_PREFIX
|
| - "d "
|
| - "total_size_after=%" V8_PTR_PREFIX
|
| - "d "
|
| - "holes_size_before=%" V8_PTR_PREFIX
|
| - "d "
|
| - "holes_size_after=%" V8_PTR_PREFIX
|
| - "d "
|
| - "allocated=%" V8_PTR_PREFIX
|
| - "d "
|
| - "promoted=%" V8_PTR_PREFIX
|
| - "d "
|
| - "semi_space_copied=%" V8_PTR_PREFIX
|
| - "d "
|
| - "nodes_died_in_new=%d "
|
| - "nodes_copied_in_new=%d "
|
| - "nodes_promoted=%d "
|
| - "promotion_ratio=%.1f%% "
|
| - "average_survival_ratio=%.1f%% "
|
| - "promotion_rate=%.1f%% "
|
| - "semi_space_copy_rate=%.1f%% "
|
| - "new_space_allocation_throughput=%" V8_PTR_PREFIX
|
| - "d "
|
| - "context_disposal_rate=%.1f "
|
| - "compaction_speed=%" V8_PTR_PREFIX "d\n",
|
| - heap_->isolate()->time_millis_since_init(), duration,
|
| - spent_in_mutator, current_.TypeName(true),
|
| - current_.reduce_memory, current_.scopes[Scope::EXTERNAL],
|
| - current_.scopes[Scope::MC_MARK],
|
| - current_.scopes[Scope::MC_MARK_FINISH_INCREMENTAL],
|
| - current_.scopes[Scope::MC_MARK_PREPARE_CODE_FLUSH],
|
| - current_.scopes[Scope::MC_MARK_ROOT],
|
| - current_.scopes[Scope::MC_MARK_TOPOPT],
|
| - current_.scopes[Scope::MC_MARK_WEAK_CLOSURE],
|
| - current_.scopes[Scope::MC_MARK_STRING_TABLE],
|
| - current_.scopes[Scope::MC_MARK_WEAK_REFERENCES],
|
| - current_.scopes[Scope::MC_MARK_GLOBAL_HANDLES],
|
| - current_.scopes[Scope::MC_MARK_CODE_FLUSH],
|
| - current_.scopes[Scope::MC_STORE_BUFFER_CLEAR],
|
| - current_.scopes[Scope::MC_SLOTS_BUFFER_CLEAR],
|
| - current_.scopes[Scope::MC_SWEEP],
|
| - current_.scopes[Scope::MC_SWEEP_NEWSPACE],
|
| - current_.scopes[Scope::MC_SWEEP_OLDSPACE],
|
| - current_.scopes[Scope::MC_SWEEP_CODE],
|
| - current_.scopes[Scope::MC_SWEEP_CELL],
|
| - current_.scopes[Scope::MC_SWEEP_MAP],
|
| - current_.scopes[Scope::MC_SWEEP_ABORTED],
|
| - current_.scopes[Scope::MC_EVACUATE_PAGES],
|
| - current_.scopes[Scope::MC_UPDATE_NEW_TO_NEW_POINTERS],
|
| - current_.scopes[Scope::MC_UPDATE_ROOT_TO_NEW_POINTERS],
|
| - current_.scopes[Scope::MC_UPDATE_OLD_TO_NEW_POINTERS],
|
| - current_.scopes[Scope::MC_UPDATE_POINTERS_TO_EVACUATED],
|
| - current_.scopes[Scope::MC_UPDATE_POINTERS_BETWEEN_EVACUATED],
|
| - current_.scopes[Scope::MC_UPDATE_MISC_POINTERS],
|
| - current_.scopes[Scope::MC_INCREMENTAL_FINALIZE],
|
| - current_.scopes[Scope::MC_WEAKCOLLECTION_PROCESS],
|
| - current_.scopes[Scope::MC_WEAKCOLLECTION_CLEAR],
|
| - current_.scopes[Scope::MC_WEAKCOLLECTION_ABORT],
|
| - current_.scopes[Scope::MC_CLEAR],
|
| - current_.scopes[Scope::MC_CLEAR_WEAKCELL],
|
| - current_.scopes[Scope::MC_CLEAR_MAP],
|
| - current_.scopes[Scope::MC_CLEAR_DEPENDENT_CODE],
|
| - current_.incremental_marking_steps,
|
| - current_.incremental_marking_duration,
|
| - current_.longest_incremental_marking_step,
|
| - cumulative_incremental_marking_finalization_steps_,
|
| - cumulative_incremental_marking_finalization_duration_,
|
| - longest_incremental_marking_finalization_step_,
|
| - IncrementalMarkingSpeedInBytesPerMillisecond(),
|
| - current_.start_object_size, current_.end_object_size,
|
| - current_.start_holes_size, current_.end_holes_size,
|
| - allocated_since_last_gc, heap_->promoted_objects_size(),
|
| - heap_->semi_space_copied_object_size(),
|
| - heap_->nodes_died_in_new_space_,
|
| - heap_->nodes_copied_in_new_space_, heap_->nodes_promoted_,
|
| - heap_->promotion_ratio_, AverageSurvivalRatio(),
|
| - heap_->promotion_rate_, heap_->semi_space_copied_rate_,
|
| - NewSpaceAllocationThroughputInBytesPerMillisecond(),
|
| - ContextDisposalRateInMilliseconds(),
|
| - CompactionSpeedInBytesPerMillisecond());
|
| + PrintIsolate(
|
| + heap_->isolate(),
|
| + "%8.0f ms: "
|
| + "pause=%.1f "
|
| + "mutator=%.1f "
|
| + "gc=%s "
|
| + "reduce_memory=%d "
|
| + "external=%.1f "
|
| + "clear=%1.f "
|
| + "clear.code_flush=%.1f "
|
| + "clear.dependent_code=%.1f "
|
| + "clear.global_handles=%.1f "
|
| + "clear.maps=%.1f "
|
| + "clear.slots_buffer=%.1f "
|
| + "clear.store_buffer=%.1f "
|
| + "clear.string_table=%.1f "
|
| + "clear.weak_cells=%.1f "
|
| + "clear.weak_collections=%.1f "
|
| + "clear.weak_lists=%.1f "
|
| + "evacuate=%.1f "
|
| + "evacuate.candidates=%.1f "
|
| + "evacuate.clean_up=%.1f "
|
| + "evacuate.new_space=%.1f "
|
| + "evacuate.update_pointers=%.1f "
|
| + "evacuate.update_pointers.between_evacuated=%.1f "
|
| + "evacuate.update_pointers.to_evacuated=%.1f "
|
| + "evacuate.update_pointers.to_new=%.1f "
|
| + "evacuate.update_pointers.weak=%.1f "
|
| + "finish=%.1f "
|
| + "mark=%.1f "
|
| + "mark.finish_incremental=%.1f "
|
| + "mark.prepare_code_flush=%.1f "
|
| + "mark.roots=%.1f "
|
| + "mark.weak_closure=%.1f "
|
| + "sweep=%.1f "
|
| + "sweep.code=%.1f "
|
| + "sweep.map=%.1f "
|
| + "sweep.old=%.1f "
|
| + "incremental_finalize=%.1f "
|
| + "steps_count=%d "
|
| + "steps_took=%.1f "
|
| + "longest_step=%.1f "
|
| + "finalization_steps_count=%d "
|
| + "finalization_steps_took=%.1f "
|
| + "finalization_longest_step=%.1f "
|
| + "incremental_marking_throughput=%" V8_PTR_PREFIX
|
| + "d "
|
| + "total_size_before=%" V8_PTR_PREFIX
|
| + "d "
|
| + "total_size_after=%" V8_PTR_PREFIX
|
| + "d "
|
| + "holes_size_before=%" V8_PTR_PREFIX
|
| + "d "
|
| + "holes_size_after=%" V8_PTR_PREFIX
|
| + "d "
|
| + "allocated=%" V8_PTR_PREFIX
|
| + "d "
|
| + "promoted=%" V8_PTR_PREFIX
|
| + "d "
|
| + "semi_space_copied=%" V8_PTR_PREFIX
|
| + "d "
|
| + "nodes_died_in_new=%d "
|
| + "nodes_copied_in_new=%d "
|
| + "nodes_promoted=%d "
|
| + "promotion_ratio=%.1f%% "
|
| + "average_survival_ratio=%.1f%% "
|
| + "promotion_rate=%.1f%% "
|
| + "semi_space_copy_rate=%.1f%% "
|
| + "new_space_allocation_throughput=%" V8_PTR_PREFIX
|
| + "d "
|
| + "context_disposal_rate=%.1f "
|
| + "compaction_speed=%" V8_PTR_PREFIX "d\n",
|
| + heap_->isolate()->time_millis_since_init(), duration,
|
| + spent_in_mutator, current_.TypeName(true), current_.reduce_memory,
|
| + current_.scopes[Scope::EXTERNAL], current_.scopes[Scope::MC_CLEAR],
|
| + current_.scopes[Scope::MC_CLEAR_CODE_FLUSH],
|
| + current_.scopes[Scope::MC_CLEAR_DEPENDENT_CODE],
|
| + current_.scopes[Scope::MC_CLEAR_GLOBAL_HANDLES],
|
| + current_.scopes[Scope::MC_CLEAR_MAPS],
|
| + current_.scopes[Scope::MC_CLEAR_SLOTS_BUFFER],
|
| + current_.scopes[Scope::MC_CLEAR_STORE_BUFFER],
|
| + current_.scopes[Scope::MC_CLEAR_STRING_TABLE],
|
| + current_.scopes[Scope::MC_CLEAR_WEAK_CELLS],
|
| + current_.scopes[Scope::MC_CLEAR_WEAK_COLLECTIONS],
|
| + current_.scopes[Scope::MC_CLEAR_WEAK_LISTS],
|
| + current_.scopes[Scope::MC_EVACUATE],
|
| + current_.scopes[Scope::MC_EVACUATE_CANDIDATES],
|
| + current_.scopes[Scope::MC_EVACUATE_CLEAN_UP],
|
| + current_.scopes[Scope::MC_EVACUATE_NEW_SPACE],
|
| + current_.scopes[Scope::MC_EVACUATE_UPDATE_POINTERS],
|
| + current_.scopes[Scope::MC_EVACUATE_UPDATE_POINTERS_BETWEEN_EVACUATED],
|
| + current_.scopes[Scope::MC_EVACUATE_UPDATE_POINTERS_TO_EVACUATED],
|
| + current_.scopes[Scope::MC_EVACUATE_UPDATE_POINTERS_TO_NEW],
|
| + current_.scopes[Scope::MC_EVACUATE_UPDATE_POINTERS_WEAK],
|
| + current_.scopes[Scope::MC_FINISH], current_.scopes[Scope::MC_MARK],
|
| + current_.scopes[Scope::MC_MARK_FINISH_INCREMENTAL],
|
| + current_.scopes[Scope::MC_MARK_PREPARE_CODE_FLUSH],
|
| + current_.scopes[Scope::MC_MARK_ROOTS],
|
| + current_.scopes[Scope::MC_MARK_WEAK_CLOSURE],
|
| + current_.scopes[Scope::MC_SWEEP],
|
| + current_.scopes[Scope::MC_SWEEP_CODE],
|
| + current_.scopes[Scope::MC_SWEEP_MAP],
|
| + current_.scopes[Scope::MC_SWEEP_OLD],
|
| + current_.scopes[Scope::MC_INCREMENTAL_FINALIZE],
|
| + current_.incremental_marking_steps,
|
| + current_.incremental_marking_duration,
|
| + current_.longest_incremental_marking_step,
|
| + cumulative_incremental_marking_finalization_steps_,
|
| + cumulative_incremental_marking_finalization_duration_,
|
| + longest_incremental_marking_finalization_step_,
|
| + IncrementalMarkingSpeedInBytesPerMillisecond(),
|
| + current_.start_object_size, current_.end_object_size,
|
| + current_.start_holes_size, current_.end_holes_size,
|
| + allocated_since_last_gc, heap_->promoted_objects_size(),
|
| + heap_->semi_space_copied_object_size(),
|
| + heap_->nodes_died_in_new_space_, heap_->nodes_copied_in_new_space_,
|
| + heap_->nodes_promoted_, heap_->promotion_ratio_,
|
| + AverageSurvivalRatio(), heap_->promotion_rate_,
|
| + heap_->semi_space_copied_rate_,
|
| + NewSpaceAllocationThroughputInBytesPerMillisecond(),
|
| + ContextDisposalRateInMilliseconds(),
|
| + CompactionSpeedInBytesPerMillisecond());
|
| break;
|
| case Event::START:
|
| break;
|
|
|