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

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

Issue 2006183003: Revert of [heap] Fine-grained JSArrayBuffer tracking (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 4 years, 7 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"
7 #include "src/heap/heap.h" 6 #include "src/heap/heap.h"
8 #include "src/isolate.h" 7 #include "src/isolate.h"
8 #include "src/objects.h"
9 #include "src/objects-inl.h" 9 #include "src/objects-inl.h"
10 #include "src/objects.h"
11 #include "src/v8.h" 10 #include "src/v8.h"
12 11
13 namespace v8 { 12 namespace v8 {
14 namespace internal { 13 namespace internal {
15 14
16 LocalArrayBufferTracker::~LocalArrayBufferTracker() { 15 ArrayBufferTracker::~ArrayBufferTracker() {
16 Isolate* isolate = heap()->isolate();
17 size_t freed_memory = 0; 17 size_t freed_memory = 0;
18 for (auto& buffer : live_) { 18 for (auto& buffer : live_array_buffers_) {
19 heap_->isolate()->array_buffer_allocator()->Free(buffer.second.first, 19 isolate->array_buffer_allocator()->Free(buffer.first, buffer.second);
20 buffer.second.second); 20 freed_memory += buffer.second;
21 freed_memory += buffer.second.second;
22 } 21 }
22 for (auto& buffer : live_array_buffers_for_scavenge_) {
23 isolate->array_buffer_allocator()->Free(buffer.first, buffer.second);
24 freed_memory += buffer.second;
25 }
26 live_array_buffers_.clear();
27 live_array_buffers_for_scavenge_.clear();
28 not_yet_discovered_array_buffers_.clear();
29 not_yet_discovered_array_buffers_for_scavenge_.clear();
30
23 if (freed_memory > 0) { 31 if (freed_memory > 0) {
24 heap_->update_amount_of_external_allocated_freed_memory( 32 heap()->update_amount_of_external_allocated_memory(
25 static_cast<intptr_t>(freed_memory)); 33 -static_cast<int64_t>(freed_memory));
26 }
27 live_.clear();
28 not_yet_discovered_.clear();
29 }
30
31 void LocalArrayBufferTracker::Add(Key key, const Value& value) {
32 live_[key] = value;
33 not_yet_discovered_[key] = value;
34 }
35
36 void LocalArrayBufferTracker::AddLive(Key key, const Value& value) {
37 DCHECK_EQ(not_yet_discovered_.count(key), 0);
38 live_[key] = value;
39 }
40
41 void LocalArrayBufferTracker::MarkLive(Key key) {
42 DCHECK_EQ(live_.count(key), 1);
43 not_yet_discovered_.erase(key);
44 }
45
46 LocalArrayBufferTracker::Value LocalArrayBufferTracker::Remove(Key key) {
47 DCHECK_EQ(live_.count(key), 1);
48 Value value = live_[key];
49 live_.erase(key);
50 not_yet_discovered_.erase(key);
51 return value;
52 }
53
54 void LocalArrayBufferTracker::FreeDead() {
55 size_t freed_memory = 0;
56 for (TrackingMap::iterator it = not_yet_discovered_.begin();
57 it != not_yet_discovered_.end();) {
58 heap_->isolate()->array_buffer_allocator()->Free(it->second.first,
59 it->second.second);
60 freed_memory += it->second.second;
61 live_.erase(it->first);
62 not_yet_discovered_.erase(it++);
63 }
64 if (freed_memory > 0) {
65 heap_->update_amount_of_external_allocated_freed_memory(
66 static_cast<intptr_t>(freed_memory));
67 }
68 started_ = false;
69 }
70
71 void LocalArrayBufferTracker::Reset() {
72 if (!started_) {
73 not_yet_discovered_ = live_;
74 started_ = true;
75 } 34 }
76 } 35 }
77 36
78 bool LocalArrayBufferTracker::IsEmpty() {
79 return live_.empty() && not_yet_discovered_.empty();
80 }
81 37
82 ArrayBufferTracker::~ArrayBufferTracker() {} 38 void ArrayBufferTracker::RegisterNew(JSArrayBuffer* buffer) {
83
84 void ArrayBufferTracker::RegisterNew(JSArrayBuffer* buffer, bool track_live) {
85 void* data = buffer->backing_store(); 39 void* data = buffer->backing_store();
86 if (!data) return; 40 if (!data) return;
87 41
88 size_t length = NumberToSize(heap_->isolate(), buffer->byte_length()); 42 bool in_new_space = heap()->InNewSpace(buffer);
89 Page* page = Page::FromAddress(buffer->address()); 43 size_t length = NumberToSize(heap()->isolate(), buffer->byte_length());
90 if (track_live) { 44 if (in_new_space) {
91 page->local_tracker()->AddLive(buffer, std::make_pair(data, length)); 45 live_array_buffers_for_scavenge_[data] = length;
92 } else { 46 } else {
93 page->local_tracker()->Add(buffer, std::make_pair(data, length)); 47 live_array_buffers_[data] = length;
94 } 48 }
49
95 // We may go over the limit of externally allocated memory here. We call the 50 // We may go over the limit of externally allocated memory here. We call the
96 // api function to trigger a GC in this case. 51 // api function to trigger a GC in this case.
97 reinterpret_cast<v8::Isolate*>(heap_->isolate()) 52 reinterpret_cast<v8::Isolate*>(heap()->isolate())
98 ->AdjustAmountOfExternalAllocatedMemory(length); 53 ->AdjustAmountOfExternalAllocatedMemory(length);
99 } 54 }
100 55
101 56
102 void ArrayBufferTracker::Unregister(JSArrayBuffer* buffer) { 57 void ArrayBufferTracker::Unregister(JSArrayBuffer* buffer) {
103 void* data = buffer->backing_store(); 58 void* data = buffer->backing_store();
104 if (!data) return; 59 if (!data) return;
105 60
106 size_t length = Page::FromAddress(buffer->address()) 61 bool in_new_space = heap()->InNewSpace(buffer);
107 ->local_tracker() 62 std::map<void*, size_t>* live_buffers =
108 ->Remove(buffer) 63 in_new_space ? &live_array_buffers_for_scavenge_ : &live_array_buffers_;
109 .second; 64 std::map<void*, size_t>* not_yet_discovered_buffers =
110 heap_->update_amount_of_external_allocated_memory( 65 in_new_space ? &not_yet_discovered_array_buffers_for_scavenge_
111 -static_cast<intptr_t>(length)); 66 : &not_yet_discovered_array_buffers_;
67
68 DCHECK(live_buffers->count(data) > 0);
69
70 size_t length = (*live_buffers)[data];
71 live_buffers->erase(data);
72 not_yet_discovered_buffers->erase(data);
73
74 heap()->update_amount_of_external_allocated_memory(
75 -static_cast<int64_t>(length));
112 } 76 }
113 77
114 void ArrayBufferTracker::FreeDeadInNewSpace() {
115 NewSpacePageIterator from_it(heap_->new_space()->FromSpaceStart(),
116 heap_->new_space()->FromSpaceEnd());
117 while (from_it.has_next()) {
118 Page* p = from_it.next();
119 p->ScanAndFreeDeadArrayBuffers<
120 LocalArrayBufferTracker::kForwardingPointer>();
121 }
122 heap_->account_amount_of_external_allocated_freed_memory();
123 }
124
125 void ArrayBufferTracker::ResetTrackersInOldSpace() {
126 heap_->old_space()->ForAllPages([](Page* p) { p->ResetTracker(); });
127 }
128
129 #define UPDATE_GUARD(buffer, data) \
130 if (buffer->is_external()) return; \
131 data = buffer->backing_store(); \
132 if (data == nullptr) return; \
133 if (data == heap_->undefined_value()) return;
134 78
135 void ArrayBufferTracker::MarkLive(JSArrayBuffer* buffer) { 79 void ArrayBufferTracker::MarkLive(JSArrayBuffer* buffer) {
136 void* data = nullptr; 80 base::LockGuard<base::Mutex> guard(&mutex_);
137 UPDATE_GUARD(buffer, data); 81 void* data = buffer->backing_store();
138 82
139 LocalArrayBufferTracker* tracker = 83 // ArrayBuffer might be in the middle of being constructed.
140 Page::FromAddress(buffer->address())->local_tracker(); 84 if (data == heap()->undefined_value()) return;
141 if (tracker->IsTracked(buffer)) { 85 if (heap()->InNewSpace(buffer)) {
142 tracker->MarkLive((buffer)); 86 not_yet_discovered_array_buffers_for_scavenge_.erase(data);
143 } else { 87 } else {
144 heap_->RegisterNewArrayBuffer(buffer); 88 not_yet_discovered_array_buffers_.erase(data);
145 } 89 }
146 } 90 }
147 91
148 #undef UPDATE_GUARD 92
93 void ArrayBufferTracker::FreeDead(bool from_scavenge) {
94 size_t freed_memory = 0;
95 Isolate* isolate = heap()->isolate();
96 for (auto& buffer : not_yet_discovered_array_buffers_for_scavenge_) {
97 isolate->array_buffer_allocator()->Free(buffer.first, buffer.second);
98 freed_memory += buffer.second;
99 live_array_buffers_for_scavenge_.erase(buffer.first);
100 }
101
102 if (!from_scavenge) {
103 for (auto& buffer : not_yet_discovered_array_buffers_) {
104 isolate->array_buffer_allocator()->Free(buffer.first, buffer.second);
105 freed_memory += buffer.second;
106 live_array_buffers_.erase(buffer.first);
107 }
108 }
109
110 not_yet_discovered_array_buffers_for_scavenge_ =
111 live_array_buffers_for_scavenge_;
112 if (!from_scavenge) not_yet_discovered_array_buffers_ = live_array_buffers_;
113
114 // Do not call through the api as this code is triggered while doing a GC.
115 heap()->update_amount_of_external_allocated_memory(
116 -static_cast<int64_t>(freed_memory));
117 }
118
119
120 void ArrayBufferTracker::PrepareDiscoveryInNewSpace() {
121 not_yet_discovered_array_buffers_for_scavenge_ =
122 live_array_buffers_for_scavenge_;
123 }
124
125
126 void ArrayBufferTracker::Promote(JSArrayBuffer* buffer) {
127 base::LockGuard<base::Mutex> guard(&mutex_);
128
129 if (buffer->is_external()) return;
130 void* data = buffer->backing_store();
131 if (!data) return;
132 // ArrayBuffer might be in the middle of being constructed.
133 if (data == heap()->undefined_value()) return;
134 DCHECK(live_array_buffers_for_scavenge_.count(data) > 0);
135 live_array_buffers_[data] = live_array_buffers_for_scavenge_[data];
136 live_array_buffers_for_scavenge_.erase(data);
137 not_yet_discovered_array_buffers_for_scavenge_.erase(data);
138 }
149 139
150 } // namespace internal 140 } // namespace internal
151 } // namespace v8 141 } // 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