Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(457)

Side by Side Diff: src/heap/array-buffer-tracker.cc

Issue 2109913003: Reland "[heap] Optimize ArrayBuffer tracking" (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/heap/array-buffer-tracker.h ('k') | src/heap/array-buffer-tracker-inl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 the V8 project authors. All rights reserved. 1 // Copyright 2015 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 "src/heap/array-buffer-tracker.h" 5 #include "src/heap/array-buffer-tracker.h"
6 #include "src/heap/array-buffer-tracker-inl.h" 6 #include "src/heap/array-buffer-tracker-inl.h"
7 #include "src/heap/heap.h" 7 #include "src/heap/heap.h"
8 8
9 namespace v8 { 9 namespace v8 {
10 namespace internal { 10 namespace internal {
11 11
12 LocalArrayBufferTracker::~LocalArrayBufferTracker() { 12 LocalArrayBufferTracker::~LocalArrayBufferTracker() {
13 CHECK(array_buffers_.empty()); 13 CHECK(array_buffers_.empty());
14 } 14 }
15 15
16 template <LocalArrayBufferTracker::FreeMode free_mode> 16 template <LocalArrayBufferTracker::FreeMode free_mode>
17 void LocalArrayBufferTracker::Free() { 17 void LocalArrayBufferTracker::Free() {
18 size_t freed_memory = 0; 18 size_t freed_memory = 0;
19 for (TrackingMap::iterator it = array_buffers_.begin(); 19 for (TrackingData::iterator it = array_buffers_.begin();
20 it != array_buffers_.end();) { 20 it != array_buffers_.end();) {
21 JSArrayBuffer* buffer = reinterpret_cast<JSArrayBuffer*>(*it);
21 if ((free_mode == kFreeAll) || 22 if ((free_mode == kFreeAll) ||
22 Marking::IsWhite(Marking::MarkBitFrom(it->first))) { 23 Marking::IsWhite(Marking::MarkBitFrom(buffer))) {
23 heap_->isolate()->array_buffer_allocator()->Free(it->second.first, 24 const size_t len = NumberToSize(heap_->isolate(), buffer->byte_length());
24 it->second.second); 25 heap_->isolate()->array_buffer_allocator()->Free(buffer->backing_store(),
25 freed_memory += it->second.second; 26 len);
27 freed_memory += len;
26 it = array_buffers_.erase(it); 28 it = array_buffers_.erase(it);
27 } else { 29 } else {
28 it++; 30 ++it;
29 } 31 }
30 } 32 }
31 if (freed_memory > 0) { 33 if (freed_memory > 0) {
32 heap_->update_external_memory_concurrently_freed( 34 heap_->update_external_memory_concurrently_freed(
33 static_cast<intptr_t>(freed_memory)); 35 static_cast<intptr_t>(freed_memory));
34 } 36 }
35 } 37 }
36 38
37 template <typename Callback> 39 template <typename Callback>
38 void LocalArrayBufferTracker::Process(Callback callback) { 40 void LocalArrayBufferTracker::Process(Callback callback) {
39 JSArrayBuffer* new_buffer = nullptr; 41 JSArrayBuffer* new_buffer = nullptr;
40 size_t freed_memory = 0; 42 size_t freed_memory = 0;
41 for (TrackingMap::iterator it = array_buffers_.begin(); 43 for (TrackingData::iterator it = array_buffers_.begin();
42 it != array_buffers_.end();) { 44 it != array_buffers_.end();) {
43 const CallbackResult result = callback(it->first, &new_buffer); 45 const CallbackResult result = callback(*it, &new_buffer);
44 if (result == kKeepEntry) { 46 if (result == kKeepEntry) {
45 it++; 47 ++it;
46 } else if (result == kUpdateEntry) { 48 } else if (result == kUpdateEntry) {
47 DCHECK_NOT_NULL(new_buffer); 49 DCHECK_NOT_NULL(new_buffer);
48 Page* target_page = Page::FromAddress(new_buffer->address()); 50 Page* target_page = Page::FromAddress(new_buffer->address());
49 // We need to lock the target page because we cannot guarantee 51 // We need to lock the target page because we cannot guarantee
50 // exclusive access to new space pages. 52 // exclusive access to new space pages.
51 if (target_page->InNewSpace()) target_page->mutex()->Lock(); 53 if (target_page->InNewSpace()) target_page->mutex()->Lock();
52 LocalArrayBufferTracker* tracker = target_page->local_tracker(); 54 LocalArrayBufferTracker* tracker = target_page->local_tracker();
53 if (tracker == nullptr) { 55 if (tracker == nullptr) {
54 target_page->AllocateLocalTracker(); 56 target_page->AllocateLocalTracker();
55 tracker = target_page->local_tracker(); 57 tracker = target_page->local_tracker();
56 } 58 }
57 DCHECK_NOT_NULL(tracker); 59 DCHECK_NOT_NULL(tracker);
58 tracker->Add(new_buffer, it->second); 60 tracker->Add(new_buffer);
59 if (target_page->InNewSpace()) target_page->mutex()->Unlock(); 61 if (target_page->InNewSpace()) target_page->mutex()->Unlock();
60 it = array_buffers_.erase(it); 62 it = array_buffers_.erase(it);
61 } else if (result == kRemoveEntry) { 63 } else if (result == kRemoveEntry) {
62 heap_->isolate()->array_buffer_allocator()->Free(it->second.first, 64 const size_t len = NumberToSize(heap_->isolate(), (*it)->byte_length());
63 it->second.second); 65 heap_->isolate()->array_buffer_allocator()->Free((*it)->backing_store(),
64 freed_memory += it->second.second; 66 len);
67 freed_memory += len;
65 it = array_buffers_.erase(it); 68 it = array_buffers_.erase(it);
66 } else { 69 } else {
67 UNREACHABLE(); 70 UNREACHABLE();
68 } 71 }
69 } 72 }
70 if (freed_memory > 0) { 73 if (freed_memory > 0) {
71 heap_->update_external_memory_concurrently_freed( 74 heap_->update_external_memory_concurrently_freed(
72 static_cast<intptr_t>(freed_memory)); 75 static_cast<intptr_t>(freed_memory));
73 } 76 }
74 } 77 }
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 { 130 {
128 base::LockGuard<base::Mutex> guard(page->mutex()); 131 base::LockGuard<base::Mutex> guard(page->mutex());
129 LocalArrayBufferTracker* tracker = page->local_tracker(); 132 LocalArrayBufferTracker* tracker = page->local_tracker();
130 if (tracker == nullptr) return false; 133 if (tracker == nullptr) return false;
131 return tracker->IsTracked(buffer); 134 return tracker->IsTracked(buffer);
132 } 135 }
133 } 136 }
134 137
135 } // namespace internal 138 } // namespace internal
136 } // namespace v8 139 } // namespace v8
OLDNEW
« no previous file with comments | « src/heap/array-buffer-tracker.h ('k') | src/heap/array-buffer-tracker-inl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698