Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(59)

Side by Side Diff: src/heap.cc

Issue 281573002: Do not scavenge while marking incrementally when FLAG_gc_global is on. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 the V8 project authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "v8.h" 5 #include "v8.h"
6 6
7 #include "accessors.h" 7 #include "accessors.h"
8 #include "api.h" 8 #include "api.h"
9 #include "bootstrapper.h" 9 #include "bootstrapper.h"
10 #include "codegen.h" 10 #include "codegen.h"
(...skipping 772 matching lines...) Expand 10 before | Expand all | Expand 10 after
783 783
784 if (collector == MARK_COMPACTOR && 784 if (collector == MARK_COMPACTOR &&
785 !mark_compact_collector()->abort_incremental_marking() && 785 !mark_compact_collector()->abort_incremental_marking() &&
786 !incremental_marking()->IsStopped() && 786 !incremental_marking()->IsStopped() &&
787 !incremental_marking()->should_hurry() && 787 !incremental_marking()->should_hurry() &&
788 FLAG_incremental_marking_steps) { 788 FLAG_incremental_marking_steps) {
789 // Make progress in incremental marking. 789 // Make progress in incremental marking.
790 const intptr_t kStepSizeWhenDelayedByScavenge = 1 * MB; 790 const intptr_t kStepSizeWhenDelayedByScavenge = 1 * MB;
791 incremental_marking()->Step(kStepSizeWhenDelayedByScavenge, 791 incremental_marking()->Step(kStepSizeWhenDelayedByScavenge,
792 IncrementalMarking::NO_GC_VIA_STACK_GUARD); 792 IncrementalMarking::NO_GC_VIA_STACK_GUARD);
793 if (!incremental_marking()->IsComplete()) { 793 if (!incremental_marking()->IsComplete() && !FLAG_gc_global) {
794 if (FLAG_trace_incremental_marking) { 794 if (FLAG_trace_incremental_marking) {
795 PrintF("[IncrementalMarking] Delaying MarkSweep.\n"); 795 PrintF("[IncrementalMarking] Delaying MarkSweep.\n");
796 } 796 }
797 collector = SCAVENGER; 797 collector = SCAVENGER;
798 collector_reason = "incremental marking delaying mark-sweep"; 798 collector_reason = "incremental marking delaying mark-sweep";
799 } 799 }
800 } 800 }
801 801
802 bool next_gc_likely_to_collect_more = false; 802 bool next_gc_likely_to_collect_more = false;
803 803
(...skipping 5676 matching lines...) Expand 10 before | Expand all | Expand 10 after
6480 static_cast<int>(object_sizes_last_time_[index])); 6480 static_cast<int>(object_sizes_last_time_[index]));
6481 CODE_AGE_LIST_COMPLETE(ADJUST_LAST_TIME_OBJECT_COUNT) 6481 CODE_AGE_LIST_COMPLETE(ADJUST_LAST_TIME_OBJECT_COUNT)
6482 #undef ADJUST_LAST_TIME_OBJECT_COUNT 6482 #undef ADJUST_LAST_TIME_OBJECT_COUNT
6483 6483
6484 OS::MemCopy(object_counts_last_time_, object_counts_, sizeof(object_counts_)); 6484 OS::MemCopy(object_counts_last_time_, object_counts_, sizeof(object_counts_));
6485 OS::MemCopy(object_sizes_last_time_, object_sizes_, sizeof(object_sizes_)); 6485 OS::MemCopy(object_sizes_last_time_, object_sizes_, sizeof(object_sizes_));
6486 ClearObjectStats(); 6486 ClearObjectStats();
6487 } 6487 }
6488 6488
6489 } } // namespace v8::internal 6489 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698