| OLD | NEW |
| 1 // Copyright 2011 the V8 project authors. All rights reserved. | 1 // Copyright 2011 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 <algorithm> | 5 #include <algorithm> |
| 6 | 6 |
| 7 #include "src/v8.h" | 7 #include "src/v8.h" |
| 8 | 8 |
| 9 #include "src/counters.h" | 9 #include "src/counters.h" |
| 10 #include "src/heap/store-buffer-inl.h" | 10 #include "src/heap/store-buffer-inl.h" |
| (...skipping 454 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 465 heap_object->address() + Map::kPointerFieldsBeginOffset, | 465 heap_object->address() + Map::kPointerFieldsBeginOffset, |
| 466 heap_object->address() + Map::kPointerFieldsEndOffset, | 466 heap_object->address() + Map::kPointerFieldsEndOffset, |
| 467 slot_callback); | 467 slot_callback); |
| 468 } | 468 } |
| 469 } | 469 } |
| 470 } else { | 470 } else { |
| 471 if (!page->SweepingCompleted()) { | 471 if (!page->SweepingCompleted()) { |
| 472 heap_->mark_compact_collector()->SweepInParallel(page, owner); | 472 heap_->mark_compact_collector()->SweepInParallel(page, owner); |
| 473 if (!page->SweepingCompleted()) { | 473 if (!page->SweepingCompleted()) { |
| 474 // We were not able to sweep that page, i.e., a concurrent | 474 // We were not able to sweep that page, i.e., a concurrent |
| 475 // sweeper thread currently owns this page. | 475 // sweeper thread currently owns this page. Wait for the sweeper |
| 476 // TODO(hpayer): This may introduce a huge pause here. We | 476 // thread to be done with this page. |
| 477 // just care about finish sweeping of the scan on scavenge page. | 477 page->WaitUntilSweepingCompleted(); |
| 478 heap_->mark_compact_collector()->EnsureSweepingCompleted(); | |
| 479 } | 478 } |
| 480 } | 479 } |
| 481 CHECK(page->owner() == heap_->old_space()); | 480 CHECK(page->owner() == heap_->old_space()); |
| 482 HeapObjectIterator iterator(page, NULL); | 481 HeapObjectIterator iterator(page, NULL); |
| 483 for (HeapObject* heap_object = iterator.Next(); heap_object != NULL; | 482 for (HeapObject* heap_object = iterator.Next(); heap_object != NULL; |
| 484 heap_object = iterator.Next()) { | 483 heap_object = iterator.Next()) { |
| 485 // We iterate over objects that contain new space pointers only. | 484 // We iterate over objects that contain new space pointers only. |
| 486 Address obj_address = heap_object->address(); | 485 Address obj_address = heap_object->address(); |
| 487 const int start_offset = HeapObject::kHeaderSize; | 486 const int start_offset = HeapObject::kHeaderSize; |
| 488 const int end_offset = heap_object->Size(); | 487 const int end_offset = heap_object->Size(); |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 585 } | 584 } |
| 586 old_buffer_is_sorted_ = false; | 585 old_buffer_is_sorted_ = false; |
| 587 old_buffer_is_filtered_ = false; | 586 old_buffer_is_filtered_ = false; |
| 588 *old_top_++ = reinterpret_cast<Address>(int_addr << kPointerSizeLog2); | 587 *old_top_++ = reinterpret_cast<Address>(int_addr << kPointerSizeLog2); |
| 589 DCHECK(old_top_ <= old_limit_); | 588 DCHECK(old_top_ <= old_limit_); |
| 590 } | 589 } |
| 591 heap_->isolate()->counters()->store_buffer_compactions()->Increment(); | 590 heap_->isolate()->counters()->store_buffer_compactions()->Increment(); |
| 592 } | 591 } |
| 593 } // namespace internal | 592 } // namespace internal |
| 594 } // namespace v8 | 593 } // namespace v8 |
| OLD | NEW |