Reviewers: svenpanne, Michael Lippautz, indutny,
Message:
I'm no longer sure, which account was used to submit this CL. Emailing from
the
second one, just in case.
Description:
heap: make array buffer maps non-intersecting
Remove intersection from the `std::map`s representing current live
ArrayBuffers. While being simpler to understand, it poses significant
performance issue for the active ArrayBuffer users (like node.js).
Store buffers separately, and process them together during mark-sweep
phase.
BUG=
R=svenpanne
Please review this at https://codereview.chromium.org/1316873004/
Base URL: https://chromium.googlesource.com/v8/v8.git@master
Affected files (+23, -10 lines):
M src/heap/heap.h
M src/heap/heap.cc
Index: src/heap/heap.cc
diff --git a/src/heap/heap.cc b/src/heap/heap.cc
index
5d67854462dbaa5d3a6967a5696014509f9e8cf1..31884a873d53ffeaa3f4bae0931cad128c8178a2
100644
--- a/src/heap/heap.cc
+++ b/src/heap/heap.cc
@@ -1758,16 +1758,25 @@ void Heap::RegisterLiveArrayBufferHelper(
size_t Heap::FreeDeadArrayBuffersHelper(
- Isolate* isolate, std::map<void*, size_t>& live_buffers,
+ Isolate* isolate, bool from_scavenge,
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);
+ if (!from_scavenge) {
+ live_array_buffers_.erase(buffer->first);
+ }
+ live_array_buffers_for_scavenge_.erase(buffer->first);
+ }
+ if (from_scavenge) {
+ not_yet_discovered_buffers = live_array_buffers_for_scavenge_;
+ } else {
+ not_yet_discovered_buffers = live_array_buffers_;
+
not_yet_discovered_buffers.insert(live_array_buffers_for_scavenge_.begin(),
+
live_array_buffers_for_scavenge_.end());
}
- not_yet_discovered_buffers = live_buffers;
return freed_memory;
}
@@ -1787,10 +1796,11 @@ void Heap::TearDownArrayBuffersHelper(
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);
+ } else {
+ RegisterNewArrayBufferHelper(live_array_buffers_, data, length);
}
reinterpret_cast<v8::Isolate*>(isolate_)
->AdjustAmountOfExternalAllocatedMemory(length);
@@ -1799,12 +1809,14 @@ 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);
+ not_yet_discovered_array_buffers_.erase(data);
+ } else {
+ UnregisterArrayBufferHelper(live_array_buffers_,
+ not_yet_discovered_array_buffers_, data);
}
}
@@ -1823,7 +1835,6 @@ 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 {
for (auto& buffer : not_yet_discovered_array_buffers_) {
@@ -1836,7 +1847,7 @@ void Heap::FreeDeadArrayBuffers(bool from_scavenge) {
}
size_t freed_memory = FreeDeadArrayBuffersHelper(
isolate_,
- from_scavenge ? live_array_buffers_for_scavenge_ :
live_array_buffers_,
+ from_scavenge,
from_scavenge ? not_yet_discovered_array_buffers_for_scavenge_
: not_yet_discovered_array_buffers_);
if (freed_memory) {
@@ -1850,6 +1861,8 @@ void Heap::FreeDeadArrayBuffers(bool from_scavenge) {
void Heap::TearDownArrayBuffers() {
TearDownArrayBuffersHelper(isolate_, live_array_buffers_,
not_yet_discovered_array_buffers_);
+ TearDownArrayBuffersHelper(isolate_, live_array_buffers_for_scavenge_,
+
not_yet_discovered_array_buffers_for_scavenge_);
}
@@ -1867,7 +1880,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);
}
Index: src/heap/heap.h
diff --git a/src/heap/heap.h b/src/heap/heap.h
index
254b19f83cb54714fd80a897f14242331ff0fb59..5ce91fec2d266e150aa6fca1c9c7c2650c0df5cd
100644
--- a/src/heap/heap.h
+++ b/src/heap/heap.h
@@ -1796,7 +1796,7 @@ class Heap {
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,
+ Isolate* isolate, bool from_scavenge,
std::map<void*, size_t>& not_yet_discovered_buffers);
void TearDownArrayBuffersHelper(
Isolate* isolate, std::map<void*, size_t>& live_buffers,
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
