forked from electron/libchromiumcontent
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
cc50696
commit d193673
Showing
2 changed files
with
218 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,218 @@ | ||
| diff --git a/src/heap/heap.cc b/src/heap/heap.cc | ||
| index 3d95373..5bcc909 100644 | ||
| --- a/src/heap/heap.cc | ||
| +++ b/src/heap/heap.cc | ||
| @@ -1854,62 +1854,17 @@ void Heap::ProcessNativeContexts(WeakObjectRetainer* retainer) { | ||
| } | ||
|
|
||
|
|
||
| -void Heap::RegisterNewArrayBufferHelper(std::map<void*, size_t>& live_buffers, | ||
| - void* data, size_t length) { | ||
| - live_buffers[data] = length; | ||
| -} | ||
| - | ||
| - | ||
| -void Heap::UnregisterArrayBufferHelper( | ||
| - std::map<void*, size_t>& live_buffers, | ||
| - std::map<void*, size_t>& not_yet_discovered_buffers, void* data) { | ||
| - DCHECK(live_buffers.count(data) > 0); | ||
| - live_buffers.erase(data); | ||
| - not_yet_discovered_buffers.erase(data); | ||
| -} | ||
| - | ||
| - | ||
| -void Heap::RegisterLiveArrayBufferHelper( | ||
| - std::map<void*, size_t>& not_yet_discovered_buffers, void* data) { | ||
| - not_yet_discovered_buffers.erase(data); | ||
| -} | ||
| - | ||
| - | ||
| -size_t Heap::FreeDeadArrayBuffersHelper( | ||
| - Isolate* isolate, std::map<void*, size_t>& live_buffers, | ||
| - std::map<void*, size_t>& not_yet_discovered_buffers) { | ||
| - size_t freed_memory = 0; | ||
| - for (auto buffer = not_yet_discovered_buffers.begin(); | ||
| - buffer != not_yet_discovered_buffers.end(); ++buffer) { | ||
| - isolate->array_buffer_allocator()->Free(buffer->first, buffer->second); | ||
| - freed_memory += buffer->second; | ||
| - live_buffers.erase(buffer->first); | ||
| - } | ||
| - not_yet_discovered_buffers = live_buffers; | ||
| - return freed_memory; | ||
| -} | ||
| - | ||
| - | ||
| -void Heap::TearDownArrayBuffersHelper( | ||
| - Isolate* isolate, std::map<void*, size_t>& live_buffers, | ||
| - std::map<void*, size_t>& not_yet_discovered_buffers) { | ||
| - for (auto buffer = live_buffers.begin(); buffer != live_buffers.end(); | ||
| - ++buffer) { | ||
| - isolate->array_buffer_allocator()->Free(buffer->first, buffer->second); | ||
| - } | ||
| - live_buffers.clear(); | ||
| - not_yet_discovered_buffers.clear(); | ||
| -} | ||
| - | ||
| - | ||
| void Heap::RegisterNewArrayBuffer(bool in_new_space, void* data, | ||
| size_t length) { | ||
| if (!data) return; | ||
| - RegisterNewArrayBufferHelper(live_array_buffers_, data, length); | ||
| if (in_new_space) { | ||
| - RegisterNewArrayBufferHelper(live_array_buffers_for_scavenge_, data, | ||
| - length); | ||
| + live_array_buffers_for_scavenge_[data] = length; | ||
| + } else { | ||
| + live_array_buffers_[data] = length; | ||
| } | ||
| + | ||
| + // We may go over the limit of externally allocated memory here. We call the | ||
| + // api function to trigger a GC in this case. | ||
| reinterpret_cast<v8::Isolate*>(isolate_) | ||
| ->AdjustAmountOfExternalAllocatedMemory(length); | ||
| } | ||
| @@ -1917,57 +1872,75 @@ void Heap::RegisterNewArrayBuffer(bool in_new_space, void* data, | ||
|
|
||
| void Heap::UnregisterArrayBuffer(bool in_new_space, void* data) { | ||
| if (!data) return; | ||
| - UnregisterArrayBufferHelper(live_array_buffers_, | ||
| - not_yet_discovered_array_buffers_, data); | ||
| - if (in_new_space) { | ||
| - UnregisterArrayBufferHelper(live_array_buffers_for_scavenge_, | ||
| - not_yet_discovered_array_buffers_for_scavenge_, | ||
| - data); | ||
| - } | ||
| + | ||
| + std::map<void*, size_t>* live_buffers = | ||
| + in_new_space ? &live_array_buffers_for_scavenge_ : &live_array_buffers_; | ||
| + std::map<void*, size_t>* not_yet_discovered_buffers = | ||
| + in_new_space ? ¬_yet_discovered_array_buffers_for_scavenge_ | ||
| + : ¬_yet_discovered_array_buffers_; | ||
| + | ||
| + DCHECK(live_buffers->count(data) > 0); | ||
| + live_buffers->erase(data); | ||
| + not_yet_discovered_buffers->erase(data); | ||
| } | ||
|
|
||
|
|
||
| void Heap::RegisterLiveArrayBuffer(bool from_scavenge, void* data) { | ||
| // ArrayBuffer might be in the middle of being constructed. | ||
| if (data == undefined_value()) return; | ||
| - RegisterLiveArrayBufferHelper( | ||
| - from_scavenge ? not_yet_discovered_array_buffers_for_scavenge_ | ||
| - : not_yet_discovered_array_buffers_, | ||
| - data); | ||
| + if (from_scavenge) { | ||
| + not_yet_discovered_array_buffers_for_scavenge_.erase(data); | ||
| + } else if (!not_yet_discovered_array_buffers_.erase(data)) { | ||
| + not_yet_discovered_array_buffers_for_scavenge_.erase(data); | ||
| + } | ||
| } | ||
|
|
||
|
|
||
| void Heap::FreeDeadArrayBuffers(bool from_scavenge) { | ||
| - if (from_scavenge) { | ||
| - for (auto& buffer : not_yet_discovered_array_buffers_for_scavenge_) { | ||
| - not_yet_discovered_array_buffers_.erase(buffer.first); | ||
| - live_array_buffers_.erase(buffer.first); | ||
| - } | ||
| - } else { | ||
| + size_t freed_memory = 0; | ||
| + for (auto& buffer : not_yet_discovered_array_buffers_for_scavenge_) { | ||
| + isolate()->array_buffer_allocator()->Free(buffer.first, buffer.second); | ||
| + freed_memory += buffer.second; | ||
| + live_array_buffers_for_scavenge_.erase(buffer.first); | ||
| + } | ||
| + | ||
| + if (!from_scavenge) { | ||
| for (auto& buffer : not_yet_discovered_array_buffers_) { | ||
| - // Scavenge can't happend during evacuation, so we only need to update | ||
| - // live_array_buffers_for_scavenge_. | ||
| - // not_yet_discovered_array_buffers_for_scanvenge_ will be reset before | ||
| - // the next scavenge run in PrepareArrayBufferDiscoveryInNewSpace. | ||
| - live_array_buffers_for_scavenge_.erase(buffer.first); | ||
| + isolate()->array_buffer_allocator()->Free(buffer.first, buffer.second); | ||
| + freed_memory += buffer.second; | ||
| + live_array_buffers_.erase(buffer.first); | ||
| } | ||
| } | ||
| - size_t freed_memory = FreeDeadArrayBuffersHelper( | ||
| - isolate_, | ||
| - from_scavenge ? live_array_buffers_for_scavenge_ : live_array_buffers_, | ||
| - from_scavenge ? not_yet_discovered_array_buffers_for_scavenge_ | ||
| - : not_yet_discovered_array_buffers_); | ||
| - if (freed_memory) { | ||
| - reinterpret_cast<v8::Isolate*>(isolate_) | ||
| - ->AdjustAmountOfExternalAllocatedMemory( | ||
| - -static_cast<int64_t>(freed_memory)); | ||
| - } | ||
| + | ||
| + not_yet_discovered_array_buffers_for_scavenge_ = | ||
| + live_array_buffers_for_scavenge_; | ||
| + if (!from_scavenge) not_yet_discovered_array_buffers_ = live_array_buffers_; | ||
| + | ||
| + // Do not call through the api as this code is triggered while doing a GC. | ||
| + amount_of_external_allocated_memory_ -= freed_memory; | ||
| } | ||
|
|
||
|
|
||
| void Heap::TearDownArrayBuffers() { | ||
| - TearDownArrayBuffersHelper(isolate_, live_array_buffers_, | ||
| - not_yet_discovered_array_buffers_); | ||
| + size_t freed_memory = 0; | ||
| + for (auto& buffer : live_array_buffers_) { | ||
| + isolate()->array_buffer_allocator()->Free(buffer.first, buffer.second); | ||
| + freed_memory += buffer.second; | ||
| + } | ||
| + for (auto& buffer : live_array_buffers_for_scavenge_) { | ||
| + isolate()->array_buffer_allocator()->Free(buffer.first, buffer.second); | ||
| + freed_memory += buffer.second; | ||
| + } | ||
| + live_array_buffers_.clear(); | ||
| + live_array_buffers_for_scavenge_.clear(); | ||
| + not_yet_discovered_array_buffers_.clear(); | ||
| + not_yet_discovered_array_buffers_for_scavenge_.clear(); | ||
| + | ||
| + if (freed_memory > 0) { | ||
| + reinterpret_cast<v8::Isolate*>(isolate_) | ||
| + ->AdjustAmountOfExternalAllocatedMemory( | ||
| + -static_cast<int64_t>(freed_memory)); | ||
| + } | ||
| } | ||
|
|
||
|
|
||
| @@ -1985,7 +1958,7 @@ void Heap::PromoteArrayBuffer(Object* obj) { | ||
| // ArrayBuffer might be in the middle of being constructed. | ||
| if (data == undefined_value()) return; | ||
| DCHECK(live_array_buffers_for_scavenge_.count(data) > 0); | ||
| - DCHECK(live_array_buffers_.count(data) > 0); | ||
| + live_array_buffers_[data] = live_array_buffers_for_scavenge_[data]; | ||
| live_array_buffers_for_scavenge_.erase(data); | ||
| not_yet_discovered_array_buffers_for_scavenge_.erase(data); | ||
| } | ||
| diff --git a/src/heap/heap.h b/src/heap/heap.h | ||
| index 4c9e3ad..0f0cfc1 100644 | ||
| --- a/src/heap/heap.h | ||
| +++ b/src/heap/heap.h | ||
| @@ -2147,21 +2147,6 @@ class Heap { | ||
| // Called on heap tear-down. Frees all remaining ArrayBuffer backing stores. | ||
| void TearDownArrayBuffers(); | ||
|
|
||
| - // These correspond to the non-Helper versions. | ||
| - void RegisterNewArrayBufferHelper(std::map<void*, size_t>& live_buffers, | ||
| - void* data, size_t length); | ||
| - void UnregisterArrayBufferHelper( | ||
| - std::map<void*, size_t>& live_buffers, | ||
| - std::map<void*, size_t>& not_yet_discovered_buffers, void* data); | ||
| - void RegisterLiveArrayBufferHelper( | ||
| - std::map<void*, size_t>& not_yet_discovered_buffers, void* data); | ||
| - size_t FreeDeadArrayBuffersHelper( | ||
| - Isolate* isolate, std::map<void*, size_t>& live_buffers, | ||
| - std::map<void*, size_t>& not_yet_discovered_buffers); | ||
| - void TearDownArrayBuffersHelper( | ||
| - Isolate* isolate, std::map<void*, size_t>& live_buffers, | ||
| - std::map<void*, size_t>& not_yet_discovered_buffers); | ||
| - | ||
| // Record statistics before and after garbage collection. | ||
| void ReportStatisticsBeforeGC(); | ||
| void ReportStatisticsAfterGC(); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters