OLD | NEW |
1 // Copyright 2012 the V8 project authors. All rights reserved. | 1 // Copyright 2012 the V8 project authors. All rights reserved. |
2 // Redistribution and use in source and binary forms, with or without | 2 // Redistribution and use in source and binary forms, with or without |
3 // modification, are permitted provided that the following conditions are | 3 // modification, are permitted provided that the following conditions are |
4 // met: | 4 // met: |
5 // | 5 // |
6 // * Redistributions of source code must retain the above copyright | 6 // * Redistributions of source code must retain the above copyright |
7 // notice, this list of conditions and the following disclaimer. | 7 // notice, this list of conditions and the following disclaimer. |
8 // * Redistributions in binary form must reproduce the above | 8 // * Redistributions in binary form must reproduce the above |
9 // copyright notice, this list of conditions and the following | 9 // copyright notice, this list of conditions and the following |
10 // disclaimer in the documentation and/or other materials provided | 10 // disclaimer in the documentation and/or other materials provided |
(...skipping 547 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
558 } | 558 } |
559 ASSERT(FLAG_incremental_marking); | 559 ASSERT(FLAG_incremental_marking); |
560 ASSERT(FLAG_incremental_marking_steps); | 560 ASSERT(FLAG_incremental_marking_steps); |
561 ASSERT(state_ == STOPPED); | 561 ASSERT(state_ == STOPPED); |
562 ASSERT(heap_->gc_state() == Heap::NOT_IN_GC); | 562 ASSERT(heap_->gc_state() == Heap::NOT_IN_GC); |
563 ASSERT(!Serializer::enabled()); | 563 ASSERT(!Serializer::enabled()); |
564 ASSERT(heap_->isolate()->IsInitialized()); | 564 ASSERT(heap_->isolate()->IsInitialized()); |
565 | 565 |
566 ResetStepCounters(); | 566 ResetStepCounters(); |
567 | 567 |
568 if (heap_->IsSweepingComplete()) { | 568 if (!heap_->mark_compact_collector()->IsConcurrentSweepingInProgress()) { |
569 StartMarking(flag); | 569 StartMarking(flag); |
570 } else { | 570 } else { |
571 if (FLAG_trace_incremental_marking) { | 571 if (FLAG_trace_incremental_marking) { |
572 PrintF("[IncrementalMarking] Start sweeping.\n"); | 572 PrintF("[IncrementalMarking] Start sweeping.\n"); |
573 } | 573 } |
574 state_ = SWEEPING; | 574 state_ = SWEEPING; |
575 } | 575 } |
576 | 576 |
577 heap_->new_space()->LowerInlineAllocationLimit(kAllocatedThreshold); | 577 heap_->new_space()->LowerInlineAllocationLimit(kAllocatedThreshold); |
578 } | 578 } |
(...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1011 bytes_scanned_ = 0; | 1011 bytes_scanned_ = 0; |
1012 write_barriers_invoked_since_last_step_ = 0; | 1012 write_barriers_invoked_since_last_step_ = 0; |
1013 } | 1013 } |
1014 | 1014 |
1015 | 1015 |
1016 int64_t IncrementalMarking::SpaceLeftInOldSpace() { | 1016 int64_t IncrementalMarking::SpaceLeftInOldSpace() { |
1017 return heap_->MaxOldGenerationSize() - heap_->PromotedSpaceSizeOfObjects(); | 1017 return heap_->MaxOldGenerationSize() - heap_->PromotedSpaceSizeOfObjects(); |
1018 } | 1018 } |
1019 | 1019 |
1020 } } // namespace v8::internal | 1020 } } // namespace v8::internal |
OLD | NEW |