Reviewers: Hannes Payer,
Description:
Version 4.4.63.9 (cherry-pick)
Merged 839170e78536f2867ab6e42872dfa87bef0e5959
Keep track of ArrayBuffers based on collector type, not space
BUG=v8:4201
LOG=N
TBR=hpa...@chromium.org
Please review this at https://codereview.chromium.org/1206903002/
Base URL: https://chromium.googlesource.com/v8/v8.git@4.4
Affected files (+62, -30 lines):
M include/v8-version.h
M src/heap/heap.h
M src/heap/heap.cc
M src/heap/objects-visiting-inl.h
Index: include/v8-version.h
diff --git a/include/v8-version.h b/include/v8-version.h
index
98a97318a3e6b8a120f7e9e0397245544237c8cf..35bfeb710876632df1e95013490c0c466ac4d5ef
100644
--- a/include/v8-version.h
+++ b/include/v8-version.h
@@ -11,7 +11,7 @@
#define V8_MAJOR_VERSION 4
#define V8_MINOR_VERSION 4
#define V8_BUILD_NUMBER 63
-#define V8_PATCH_LEVEL 8
+#define V8_PATCH_LEVEL 9
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
Index: src/heap/heap.cc
diff --git a/src/heap/heap.cc b/src/heap/heap.cc
index
b9d5e3bf38e33b61b74842ea061a6ef0bdab41bc..6bfa4ae46629e1eff91db93706a1cafbbbd03058
100644
--- a/src/heap/heap.cc
+++ b/src/heap/heap.cc
@@ -1790,9 +1790,11 @@ void Heap::TearDownArrayBuffersHelper(
void Heap::RegisterNewArrayBuffer(bool in_new_space, void* data,
size_t length) {
if (!data) return;
- RegisterNewArrayBufferHelper(
- in_new_space ? live_new_array_buffers_ : live_array_buffers_, data,
- length);
+ RegisterNewArrayBufferHelper(live_array_buffers_, data, length);
+ if (in_new_space) {
+ RegisterNewArrayBufferHelper(live_array_buffers_for_scavenge_, data,
+ length);
+ }
reinterpret_cast<v8::Isolate*>(isolate_)
->AdjustAmountOfExternalAllocatedMemory(length);
}
@@ -1800,29 +1802,46 @@ void Heap::RegisterNewArrayBuffer(bool
in_new_space, void* data,
void Heap::UnregisterArrayBuffer(bool in_new_space, void* data) {
if (!data) return;
- UnregisterArrayBufferHelper(
- in_new_space ? live_new_array_buffers_ : live_array_buffers_,
- in_new_space ? not_yet_discovered_new_array_buffers_
- : not_yet_discovered_array_buffers_,
- data);
+ 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);
+ }
}
-void Heap::RegisterLiveArrayBuffer(bool in_new_space, void* data) {
+void Heap::RegisterLiveArrayBuffer(bool from_scavenge, void* data) {
// ArrayBuffer might be in the middle of being constructed.
if (data == undefined_value()) return;
- RegisterLiveArrayBufferHelper(in_new_space
- ? not_yet_discovered_new_array_buffers_
- : not_yet_discovered_array_buffers_,
- data);
+ RegisterLiveArrayBufferHelper(
+ from_scavenge ? not_yet_discovered_array_buffers_for_scavenge_
+ : not_yet_discovered_array_buffers_,
+ data);
}
-void Heap::FreeDeadArrayBuffers(bool in_new_space) {
+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_) {
+ // 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);
+ }
+ }
size_t freed_memory = FreeDeadArrayBuffersHelper(
- isolate_, in_new_space ? live_new_array_buffers_ :
live_array_buffers_,
- in_new_space ? not_yet_discovered_new_array_buffers_
- : not_yet_discovered_array_buffers_);
+ 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(
@@ -1834,13 +1853,12 @@ void Heap::FreeDeadArrayBuffers(bool in_new_space) {
void Heap::TearDownArrayBuffers() {
TearDownArrayBuffersHelper(isolate_, live_array_buffers_,
not_yet_discovered_array_buffers_);
- TearDownArrayBuffersHelper(isolate_, live_new_array_buffers_,
- not_yet_discovered_new_array_buffers_);
}
void Heap::PrepareArrayBufferDiscoveryInNewSpace() {
- not_yet_discovered_new_array_buffers_ = live_new_array_buffers_;
+ not_yet_discovered_array_buffers_for_scavenge_ =
+ live_array_buffers_for_scavenge_;
}
@@ -1851,10 +1869,10 @@ void Heap::PromoteArrayBuffer(Object* obj) {
if (!data) return;
// ArrayBuffer might be in the middle of being constructed.
if (data == undefined_value()) return;
- DCHECK(live_new_array_buffers_.count(data) > 0);
- live_array_buffers_[data] = live_new_array_buffers_[data];
- live_new_array_buffers_.erase(data);
- not_yet_discovered_new_array_buffers_.erase(data);
+ DCHECK(live_array_buffers_for_scavenge_.count(data) > 0);
+ DCHECK(live_array_buffers_.count(data) > 0);
+ 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
42a0886acf9017be1180303286207d80ec307272..ab08531a06bdeacea276cc3b01aac55247ac6494
100644
--- a/src/heap/heap.h
+++ b/src/heap/heap.h
@@ -1522,11 +1522,11 @@ class Heap {
void UnregisterArrayBuffer(bool in_new_space, void* data);
// A live ArrayBuffer was discovered during marking/scavenge.
- void RegisterLiveArrayBuffer(bool in_new_space, void* data);
+ void RegisterLiveArrayBuffer(bool from_scavenge, void* data);
// Frees all backing store pointers that weren't discovered in the
previous
// marking or scavenge phase.
- void FreeDeadArrayBuffers(bool in_new_space);
+ void FreeDeadArrayBuffers(bool from_scavenge);
// Prepare for a new scavenge phase. A new marking phase is implicitly
// prepared by finishing the previous one.
@@ -2216,10 +2216,24 @@ class Heap {
bool concurrent_sweeping_enabled_;
+ // |live_array_buffers_| maps externally allocated memory used as backing
+ // store for ArrayBuffers to the length of the respective memory blocks.
+ //
+ // At the beginning of mark/compact, |not_yet_discovered_array_buffers_|
is
+ // a copy of |live_array_buffers_| and we remove pointers as we discover
live
+ // ArrayBuffer objects during marking. At the end of mark/compact, the
+ // remaining memory blocks can be freed.
std::map<void*, size_t> live_array_buffers_;
- std::map<void*, size_t> live_new_array_buffers_;
std::map<void*, size_t> not_yet_discovered_array_buffers_;
- std::map<void*, size_t> not_yet_discovered_new_array_buffers_;
+
+ // To be able to free memory held by ArrayBuffers during scavenge as
well, we
+ // have a separate list of allocated memory held by ArrayBuffers in new
space.
+ //
+ // Since mark/compact also evacuates the new space, all pointers in the
+ // |live_array_buffers_for_scavenge_| list are also in the
+ // |live_array_buffers_| list.
+ std::map<void*, size_t> live_array_buffers_for_scavenge_;
+ std::map<void*, size_t> not_yet_discovered_array_buffers_for_scavenge_;
struct StrongRootsList;
StrongRootsList* strong_roots_list_;
Index: src/heap/objects-visiting-inl.h
diff --git a/src/heap/objects-visiting-inl.h
b/src/heap/objects-visiting-inl.h
index
62be04ff349afcc97ba7fbbea4282d59703bb002..c880eb74457c5d0d38bf343eadd87b79210be7ac
100644
--- a/src/heap/objects-visiting-inl.h
+++ b/src/heap/objects-visiting-inl.h
@@ -536,7 +536,7 @@ void
StaticMarkingVisitor<StaticVisitor>::VisitJSArrayBuffer(
HeapObject::RawField(object,
JSArrayBuffer::BodyDescriptor::kStartOffset),
HeapObject::RawField(object,
JSArrayBuffer::kSizeWithInternalFields));
if (!JSArrayBuffer::cast(object)->is_external()) {
- heap->RegisterLiveArrayBuffer(heap->InNewSpace(object),
+ heap->RegisterLiveArrayBuffer(false,
JSArrayBuffer::cast(object)->backing_store());
}
}
--
--
v8-dev mailing list
v8-dev@googlegroups.com
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 v8-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
