[heap] Fine-grained JSArrayBuffer tracking

src/heap/array-buffer-tracker.cc

Index: src/heap/array-buffer-tracker.cc
diff --git a/src/heap/array-buffer-tracker.cc b/src/heap/array-buffer-tracker.cc
index 6e389c1cbf6abe216c782bae30fedcba5b283443..360e7dd6006d3d2fba22b1cfcf14c4f53f33741e 100644
--- a/src/heap/array-buffer-tracker.cc
+++ b/src/heap/array-buffer-tracker.cc
@@ -12,44 +12,82 @@
 namespace v8 {
 namespace internal {
 
-ArrayBufferTracker::~ArrayBufferTracker() {
-  Isolate* isolate = heap()->isolate();
+LocalArrayBufferTracker::~LocalArrayBufferTracker() {
   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_) {
+    heap_->isolate()->array_buffer_allocator()->Free(buffer.second.first,
+                                                     buffer.second.second);
   }
-  for (auto& buffer : live_array_buffers_for_scavenge_) {
-    isolate->array_buffer_allocator()->Free(buffer.first, buffer.second);
-    freed_memory += buffer.second;
+  if (freed_memory > 0) {
+    heap_->update_amount_of_external_allocated_memory(
+        -static_cast<intptr_t>(freed_memory));
   }
-  live_array_buffers_.clear();
-  live_array_buffers_for_scavenge_.clear();
-  not_yet_discovered_array_buffers_.clear();
-  not_yet_discovered_array_buffers_for_scavenge_.clear();
+  live_.clear();
+  not_yet_discovered_.clear();
+}
+
+void LocalArrayBufferTracker::Add(Key key, const Value& value) {
+  live_[key] = value;
+  not_yet_discovered_[key] = value;
+}
+
+void LocalArrayBufferTracker::AddLive(Key key, const Value& value) {
+  DCHECK_EQ(not_yet_discovered_.count(key), 0);
+  live_[key] = value;
+}
+
+void LocalArrayBufferTracker::MarkLive(Key key) {
+  DCHECK_EQ(live_.count(key), 1);
+  not_yet_discovered_.erase(key);
+}
+
+LocalArrayBufferTracker::Value LocalArrayBufferTracker::Remove(Key key) {
+  DCHECK_EQ(live_.count(key), 1);
+  Value value = live_[key];
+  live_.erase(key);
+  not_yet_discovered_.erase(key);
+  return value;
+}
 
+void LocalArrayBufferTracker::FreeDeadAndReset() {
+  size_t freed_memory = 0;
+  for (auto& buffer : not_yet_discovered_) {
+    heap_->isolate()->array_buffer_allocator()->Free(buffer.second.first,
+                                                     buffer.second.second);
+    freed_memory += buffer.second.second;
+    live_.erase(buffer.first);
+  }
   if (freed_memory > 0) {
-    heap()->update_amount_of_external_allocated_memory(
-        -static_cast<int64_t>(freed_memory));
+    heap_->update_amount_of_external_allocated_memory(
+        -static_cast<intptr_t>(freed_memory));
   }
+  not_yet_discovered_ = live_;
 }
 
+bool LocalArrayBufferTracker::IsEmpty() {
+  return live_.empty() && not_yet_discovered_.empty();
+}
 
-void ArrayBufferTracker::RegisterNew(JSArrayBuffer* buffer) {
+bool LocalArrayBufferTracker::IsTrackedForTesting(Key key) {
+  return live_.find(key) != live_.end();
+}
+
+ArrayBufferTracker::~ArrayBufferTracker() {}
+
+void ArrayBufferTracker::RegisterNew(JSArrayBuffer* buffer, bool track_live) {
   void* data = buffer->backing_store();
   if (!data) return;
 
-  bool in_new_space = heap()->InNewSpace(buffer);
-  size_t length = NumberToSize(heap()->isolate(), buffer->byte_length());
-  if (in_new_space) {
-    live_array_buffers_for_scavenge_[data] = length;
+  size_t length = NumberToSize(heap_->isolate(), buffer->byte_length());
+  Page* page = Page::FromAddress(buffer->address());
+  if (track_live) {
+    page->local_tracker()->AddLive(buffer, std::make_pair(data, length));
   } else {
-    live_array_buffers_[data] = length;
+    page->local_tracker()->Add(buffer, std::make_pair(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*>(heap()->isolate())
+  reinterpret_cast<v8::Isolate*>(heap_->isolate())
       ->AdjustAmountOfExternalAllocatedMemory(length);
 }
 
@@ -58,84 +96,78 @@ void ArrayBufferTracker::Unregister(JSArrayBuffer* buffer) {
   void* data = buffer->backing_store();
   if (!data) return;
 
-  bool in_new_space = heap()->InNewSpace(buffer);
-  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 ? &not_yet_discovered_array_buffers_for_scavenge_
-                   : &not_yet_discovered_array_buffers_;
-
-  DCHECK(live_buffers->count(data) > 0);
-
-  size_t length = (*live_buffers)[data];
-  live_buffers->erase(data);
-  not_yet_discovered_buffers->erase(data);
-
-  heap()->update_amount_of_external_allocated_memory(
-      -static_cast<int64_t>(length));
+  size_t length = Page::FromAddress(buffer->address())
+                      ->local_tracker()
+                      ->Remove(buffer)
+                      .second;
+  heap_->update_amount_of_external_allocated_memory(
+      -static_cast<intptr_t>(length));
 }
 
-
-void ArrayBufferTracker::MarkLive(JSArrayBuffer* buffer) {
-  base::LockGuard<base::Mutex> guard(&mutex_);
-  void* data = buffer->backing_store();
-
-  // ArrayBuffer might be in the middle of being constructed.
-  if (data == heap()->undefined_value()) return;
-  if (heap()->InNewSpace(buffer)) {
-    not_yet_discovered_array_buffers_for_scavenge_.erase(data);
-  } else {
-    not_yet_discovered_array_buffers_.erase(data);
+void ArrayBufferTracker::FreeDeadInNewSpace() {
+  NewSpacePageIterator from_it(heap_->new_space()->from_space());
+  while (from_it.has_next()) {
+    Page* p = from_it.next();
+    p->FreeDeadArraybuffersAndResetTracker();
+  }
+  NewSpacePageIterator to_it(heap_->new_space()->to_space());
+  while (to_it.has_next()) {
+    Page* p = to_it.next();
+    // Needed to reset the set.
+    p->FreeDeadArraybuffersAndResetTracker();
   }
 }
 
+#define UPDATE_GUARD(buffer, data)   \
+  if (buffer->is_external()) return; \
+  data = buffer->backing_store();    \
+  if (data == nullptr) return;       \
+  if (data == heap_->undefined_value()) return;
 
-void ArrayBufferTracker::FreeDead(bool from_scavenge) {
-  size_t freed_memory = 0;
-  Isolate* isolate = heap()->isolate();
-  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);
-  }
+void ArrayBufferTracker::MarkLive(JSArrayBuffer* buffer) {
+  void* data = nullptr;
+  UPDATE_GUARD(buffer, data);
 
-  if (!from_scavenge) {
-    for (auto& buffer : not_yet_discovered_array_buffers_) {
-      isolate->array_buffer_allocator()->Free(buffer.first, buffer.second);
-      freed_memory += buffer.second;
-      live_array_buffers_.erase(buffer.first);
-    }
-  }
+  Page::FromAddress(buffer->address())->local_tracker()->MarkLive(buffer);
+}
 
-  not_yet_discovered_array_buffers_for_scavenge_ =
-      live_array_buffers_for_scavenge_;
-  if (!from_scavenge) not_yet_discovered_array_buffers_ = live_array_buffers_;
+void ArrayBufferTracker::Promote(JSArrayBuffer* new_buffer,
+                                 JSArrayBuffer* old_buffer) {
+  void* data = nullptr;
+  UPDATE_GUARD(new_buffer, data);
 
-  // Do not call through the api as this code is triggered while doing a GC.
-  heap()->update_amount_of_external_allocated_memory(
-      -static_cast<int64_t>(freed_memory));
+  Page::FromAddress(new_buffer->address())
+      ->local_tracker()
+      ->AddLive(new_buffer, Page::FromAddress(old_buffer->address())
+                                ->local_tracker()
+                                ->Remove(old_buffer));
 }
 
+void ArrayBufferTracker::Compact(JSArrayBuffer* new_buffer,
+                                 JSArrayBuffer* old_buffer) {
+  void* data = nullptr;
+  UPDATE_GUARD(new_buffer, data);
 
-void ArrayBufferTracker::PrepareDiscoveryInNewSpace() {
-  not_yet_discovered_array_buffers_for_scavenge_ =
-      live_array_buffers_for_scavenge_;
+  Page::FromAddress(new_buffer->address())
+      ->local_tracker()
+      ->AddLive(new_buffer, Page::FromAddress(old_buffer->address())
+                                ->local_tracker()
+                                ->Remove(old_buffer));
 }
 
+void ArrayBufferTracker::SemiSpaceCopy(JSArrayBuffer* new_buffer,
+                                       JSArrayBuffer* old_buffer) {
+  void* data = nullptr;
+  UPDATE_GUARD(new_buffer, data);
 
-void ArrayBufferTracker::Promote(JSArrayBuffer* buffer) {
-  base::LockGuard<base::Mutex> guard(&mutex_);
-
-  if (buffer->is_external()) return;
-  void* data = buffer->backing_store();
-  if (!data) return;
-  // ArrayBuffer might be in the middle of being constructed.
-  if (data == heap()->undefined_value()) return;
-  DCHECK(live_array_buffers_for_scavenge_.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);
+  Page::FromAddress(new_buffer->address())
+      ->local_tracker()
+      ->AddLive(new_buffer, Page::FromAddress(old_buffer->address())
+                                ->local_tracker()
+                                ->Remove(old_buffer));
 }
 
+#undef UPDATE_GUARD
+
 }  // namespace internal
 }  // namespace v8