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

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

Issue 2210263002: [heap] Improve size profiling for ArrayBuffer tracking (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Added tests and some more fixes Created 4 years, 4 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
OLDNEW
1 // Copyright 2016 the V8 project authors. All rights reserved. 1 // Copyright 2016 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/conversions-inl.h" 5 #include "src/conversions-inl.h"
6 #include "src/heap/array-buffer-tracker.h" 6 #include "src/heap/array-buffer-tracker.h"
7 #include "src/heap/heap.h" 7 #include "src/heap/heap.h"
8 #include "src/objects.h" 8 #include "src/objects.h"
9 9
10 namespace v8 { 10 namespace v8 {
11 namespace internal { 11 namespace internal {
12 12
13 void ArrayBufferTracker::RegisterNew(Heap* heap, JSArrayBuffer* buffer) { 13 void ArrayBufferTracker::RegisterNew(Heap* heap, JSArrayBuffer* buffer) {
14 void* data = buffer->backing_store(); 14 void* data = buffer->backing_store();
15 if (!data) return; 15 if (!data) return;
16 16
17 size_t length = NumberToSize(heap->isolate(), buffer->byte_length()); 17 size_t length = NumberToSize(heap->isolate(), buffer->byte_length());
18 Page* page = Page::FromAddress(buffer->address()); 18 Page* page = Page::FromAddress(buffer->address());
19 { 19 {
20 base::LockGuard<base::Mutex> guard(page->mutex()); 20 base::LockGuard<base::Mutex> guard(page->mutex());
21 LocalArrayBufferTracker* tracker = page->local_tracker(); 21 LocalArrayBufferTracker* tracker = page->local_tracker();
22 if (tracker == nullptr) { 22 if (tracker == nullptr) {
23 page->AllocateLocalTracker(); 23 page->AllocateLocalTracker();
24 tracker = page->local_tracker(); 24 tracker = page->local_tracker();
25 } 25 }
26 DCHECK_NOT_NULL(tracker); 26 DCHECK_NOT_NULL(tracker);
27 if (heap->InNewSpace(buffer)) {
28 retained_from_new_space_.Increment(static_cast<intptr_t>(length));
29 } else {
30 retained_from_old_space_.Increment(static_cast<intptr_t>(length));
31 }
27 tracker->Add(buffer, length); 32 tracker->Add(buffer, length);
28 } 33 }
29 // We may go over the limit of externally allocated memory here. We call the 34 // We may go over the limit of externally allocated memory here. We call the
30 // api function to trigger a GC in this case. 35 // api function to trigger a GC in this case.
31 reinterpret_cast<v8::Isolate*>(heap->isolate()) 36 reinterpret_cast<v8::Isolate*>(heap->isolate())
32 ->AdjustAmountOfExternalAllocatedMemory(length); 37 ->AdjustAmountOfExternalAllocatedMemory(length);
33 } 38 }
34 39
35 void ArrayBufferTracker::Unregister(Heap* heap, JSArrayBuffer* buffer) { 40 void ArrayBufferTracker::Unregister(Heap* heap, JSArrayBuffer* buffer) {
36 void* data = buffer->backing_store(); 41 void* data = buffer->backing_store();
37 if (!data) return; 42 if (!data) return;
38 43
39 Page* page = Page::FromAddress(buffer->address()); 44 Page* page = Page::FromAddress(buffer->address());
40 size_t length = 0; 45 size_t length = 0;
41 { 46 {
42 base::LockGuard<base::Mutex> guard(page->mutex()); 47 base::LockGuard<base::Mutex> guard(page->mutex());
43 LocalArrayBufferTracker* tracker = page->local_tracker(); 48 LocalArrayBufferTracker* tracker = page->local_tracker();
44 DCHECK_NOT_NULL(tracker); 49 DCHECK_NOT_NULL(tracker);
45 length = tracker->Remove(buffer); 50 length = tracker->Remove(buffer);
51 if (heap->InNewSpace(buffer)) {
52 retained_from_new_space_.Increment(-static_cast<intptr_t>(length));
53 } else {
54 retained_from_old_space_.Increment(-static_cast<intptr_t>(length));
55 }
46 } 56 }
47 heap->update_external_memory(-static_cast<intptr_t>(length)); 57 heap->update_external_memory(-static_cast<intptr_t>(length));
48 } 58 }
49 59
50 void LocalArrayBufferTracker::Add(Key key, const Value& value) { 60 void LocalArrayBufferTracker::Add(Key key, const Value& value) {
51 auto ret = array_buffers_.insert(std::make_pair(key, value)); 61 auto ret = array_buffers_.insert(std::make_pair(key, value));
52 USE(ret); 62 USE(ret);
53 // Check that we indeed inserted a new value and did not overwrite an existing 63 // Check that we indeed inserted a new value and did not overwrite an existing
54 // one (which would be a bug). 64 // one (which would be a bug).
55 DCHECK(ret.second); 65 DCHECK(ret.second);
56 } 66 }
57 67
58 LocalArrayBufferTracker::Value LocalArrayBufferTracker::Remove(Key key) { 68 LocalArrayBufferTracker::Value LocalArrayBufferTracker::Remove(Key key) {
59 TrackingData::iterator it = array_buffers_.find(key); 69 TrackingData::iterator it = array_buffers_.find(key);
60 // Check that we indeed find a key to remove. 70 // Check that we indeed find a key to remove.
61 DCHECK(it != array_buffers_.end()); 71 DCHECK(it != array_buffers_.end());
62 Value value = it->second; 72 Value value = it->second;
63 array_buffers_.erase(it); 73 array_buffers_.erase(it);
64 return value; 74 return value;
65 } 75 }
66 76
67 } // namespace internal 77 } // namespace internal
68 } // namespace v8 78 } // namespace v8
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698