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

Side by Side Diff: Source/core/inspector/PromiseTracker.cpp

Issue 529723002: [WIP] Protocol for sending information about Promises to frontend. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Address review comments + add a simple test Created 6 years, 3 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium 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 "config.h" 5 #include "config.h"
6 #include "core/inspector/PromiseTracker.h" 6 #include "core/inspector/PromiseTracker.h"
7 7
8 #include "bindings/core/v8/ScopedPersistent.h" 8 #include "bindings/core/v8/ScopedPersistent.h"
9 #include "bindings/core/v8/ScriptCallStackFactory.h" 9 #include "bindings/core/v8/ScriptCallStackFactory.h"
10 #include "bindings/core/v8/ScriptState.h" 10 #include "bindings/core/v8/ScriptState.h"
11 #include "wtf/PassOwnPtr.h" 11 #include "wtf/PassOwnPtr.h"
12 #include "wtf/WeakPtr.h" 12 #include "wtf/WeakPtr.h"
13 13
14 using blink::TypeBuilder::Array;
15 using blink::TypeBuilder::Console::CallFrame;
16 using blink::TypeBuilder::Debugger::PromiseDetails;
17
14 namespace blink { 18 namespace blink {
15 19
16 class PromiseTracker::PromiseData : public RefCounted<PromiseData> { 20 class PromiseTracker::PromiseData : public RefCounted<PromiseData> {
17 public: 21 public:
18 PromiseData(v8::Isolate* isolate, int promiseHash, v8::Handle<v8::Object> pr omise) 22 PromiseData(v8::Isolate* isolate, int promiseHash, int promiseId, v8::Handle <v8::Object> promise)
19 : m_promiseHash(promiseHash) 23 : m_promiseHash(promiseHash)
24 , m_promiseId(promiseId)
20 , m_promise(isolate, promise) 25 , m_promise(isolate, promise)
26 , m_parentPromiseId(0)
21 , m_status(0) 27 , m_status(0)
22 , m_weakPtrFactory(this) 28 , m_weakPtrFactory(this)
23 { 29 {
24 } 30 }
25 31
26 int promiseHash() const { return m_promiseHash; } 32 int promiseHash() const { return m_promiseHash; }
27 ScopedPersistent<v8::Object>& promise() { return m_promise; } 33 ScopedPersistent<v8::Object>& promise() { return m_promise; }
28 34
29 private: 35 private:
30 friend class PromiseTracker; 36 friend class PromiseTracker;
31 37
32 int m_promiseHash; 38 int m_promiseHash;
33 39 int m_promiseId;
34 ScopedPersistent<v8::Object> m_promise; 40 ScopedPersistent<v8::Object> m_promise;
35 ScriptCallFrame m_callFrame; 41 RefPtr<ScriptCallStack> m_callStack;
aandrey 2014/09/02 14:34:49 move after m_weakPtrFactory
Alexandra Mikhaylova 2014/09/03 14:28:54 Done.
42 int m_parentPromiseId;
36 ScopedPersistent<v8::Object> m_parentPromise; 43 ScopedPersistent<v8::Object> m_parentPromise;
aandrey 2014/09/02 14:34:49 ditto
Alexandra Mikhaylova 2014/09/03 14:28:54 Done.
37 int m_status; 44 int m_status;
38 45
aandrey 2014/09/02 14:34:49 extra line
Alexandra Mikhaylova 2014/09/03 14:28:54 Done.
39 WeakPtrFactory<PromiseData> m_weakPtrFactory; 46 WeakPtrFactory<PromiseData> m_weakPtrFactory;
40 }; 47 };
41 48
42 static int indexOf(PromiseTracker::PromiseDataVector* vector, const ScopedPersis tent<v8::Object>& promise) 49 static int indexOf(PromiseTracker::PromiseDataVector* vector, const ScopedPersis tent<v8::Object>& promise)
43 { 50 {
44 for (size_t index = 0; index < vector->size(); ++index) { 51 for (size_t index = 0; index < vector->size(); ++index) {
45 if (vector->at(index)->promise() == promise) 52 if (vector->at(index)->promise() == promise)
46 return index; 53 return index;
47 } 54 }
48 return -1; 55 return -1;
(...skipping 27 matching lines...) Expand all
76 83
77 private: 84 private:
78 WeakPtr<PromiseTracker::PromiseData> m_data; 85 WeakPtr<PromiseTracker::PromiseData> m_data;
79 PromiseTracker::PromiseDataMap* m_promiseDataMap; 86 PromiseTracker::PromiseDataMap* m_promiseDataMap;
80 }; 87 };
81 88
82 } 89 }
83 90
84 PromiseTracker::PromiseTracker() 91 PromiseTracker::PromiseTracker()
85 : m_isEnabled(false) 92 : m_isEnabled(false)
93 , m_circularSequentialId(0)
86 { 94 {
87 } 95 }
88 96
89 PromiseTracker::~PromiseTracker() 97 PromiseTracker::~PromiseTracker()
90 { 98 {
91 } 99 }
92 100
93 void PromiseTracker::enable() 101 void PromiseTracker::setEnabled(bool enabled)
94 { 102 {
95 m_isEnabled = true; 103 m_isEnabled = enabled;
96 } 104 if (!enabled)
97 105 clear();
98 void PromiseTracker::disable()
99 {
100 m_isEnabled = false;
101 clear();
102 } 106 }
103 107
104 void PromiseTracker::clear() 108 void PromiseTracker::clear()
105 { 109 {
106 m_promiseDataMap.clear(); 110 m_promiseDataMap.clear();
111 m_circularSequentialId = 0;
aandrey 2014/09/02 14:34:49 remove. let's not reset the ID counter upon disabl
Alexandra Mikhaylova 2014/09/03 14:28:54 Done.
107 } 112 }
108 113
109 void PromiseTracker::didReceiveV8PromiseEvent(ScriptState* scriptState, v8::Hand le<v8::Object> promise, v8::Handle<v8::Value> parentPromise, int status) 114 int PromiseTracker::circularSequentialId()
110 { 115 {
111 ASSERT(isEnabled()); 116 ++m_circularSequentialId;
117 if (m_circularSequentialId <= 0)
118 m_circularSequentialId = 1;
119 return m_circularSequentialId;
120 }
112 121
122 PassRefPtr<PromiseTracker::PromiseData> PromiseTracker::createPromiseDataIfNeede d(v8::Isolate* isolate, v8::Handle<v8::Object> promise)
123 {
113 int promiseHash = promise->GetIdentityHash(); 124 int promiseHash = promise->GetIdentityHash();
114 PromiseDataVector* vector; 125 PromiseDataVector* vector;
115 PromiseDataMap::iterator it = m_promiseDataMap.find(promiseHash); 126 PromiseDataMap::iterator it = m_promiseDataMap.find(promiseHash);
116 if (it != m_promiseDataMap.end()) 127 if (it != m_promiseDataMap.end())
117 vector = &it->value; 128 vector = &it->value;
118 else 129 else
119 vector = &m_promiseDataMap.add(promiseHash, PromiseDataVector()).storedV alue->value; 130 vector = &m_promiseDataMap.add(promiseHash, PromiseDataVector()).storedV alue->value;
120 131
121 v8::Isolate* isolate = scriptState->isolate();
122 RefPtr<PromiseData> data; 132 RefPtr<PromiseData> data;
123 int index = indexOf(vector, ScopedPersistent<v8::Object>(isolate, promise)); 133 int index = indexOf(vector, ScopedPersistent<v8::Object>(isolate, promise));
124 if (index == -1) { 134 if (index == -1) {
125 data = adoptRef(new PromiseData(isolate, promiseHash, promise)); 135 data = adoptRef(new PromiseData(isolate, promiseHash, circularSequential Id(), promise));
126 OwnPtr<PromiseDataWrapper> wrapper = adoptPtr(new PromiseDataWrapper(dat a->m_weakPtrFactory.createWeakPtr(), &m_promiseDataMap)); 136 OwnPtr<PromiseDataWrapper> wrapper = adoptPtr(new PromiseDataWrapper(dat a->m_weakPtrFactory.createWeakPtr(), &m_promiseDataMap));
127 data->m_promise.setWeak(wrapper.leakPtr(), &PromiseDataWrapper::didRemov ePromise); 137 data->m_promise.setWeak(wrapper.leakPtr(), &PromiseDataWrapper::didRemov ePromise);
128 vector->append(data); 138 vector->append(data);
129 } else { 139 } else {
130 data = vector->at(index); 140 data = vector->at(index);
131 } 141 }
132 142
133 if (!parentPromise.IsEmpty()) { 143 return data.release();
134 ASSERT(parentPromise->IsObject()); 144 }
135 data->m_parentPromise.set(isolate, parentPromise->ToObject()); 145
146 void PromiseTracker::didReceiveV8PromiseEvent(ScriptState* scriptState, v8::Hand le<v8::Object> promise, v8::Handle<v8::Value> parentPromise, int status)
147 {
148 ASSERT(isEnabled());
149
150 v8::Isolate* isolate = scriptState->isolate();
151 RefPtr<PromiseData> data = createPromiseDataIfNeeded(isolate, promise);
152 if (!parentPromise.IsEmpty() && parentPromise->IsObject()) {
153 v8::Handle<v8::Object> handle = parentPromise->ToObject();
154 RefPtr<PromiseData> parentData = createPromiseDataIfNeeded(isolate, hand le);
155 data->m_parentPromiseId = parentData->m_promiseId;
156 data->m_parentPromise.set(isolate, handle);
136 } else { 157 } else {
137 data->m_status = status; 158 data->m_status = status;
138 if (!status) { 159 if (!status) {
aandrey 2014/09/02 14:34:49 if (!status && !data->m_callStack)
Alexandra Mikhaylova 2014/09/03 14:28:55 Done.
139 v8::Handle<v8::StackTrace> stackTrace(v8::StackTrace::CurrentStackTr ace(isolate, 1)); 160 v8::Handle<v8::StackTrace> stackTrace(v8::StackTrace::CurrentStackTr ace(isolate, 1));
140 RefPtrWillBeRawPtr<ScriptCallStack> stack = createScriptCallStack(st ackTrace, 1, isolate); 161 RefPtrWillBeRawPtr<ScriptCallStack> stack = createScriptCallStack(st ackTrace, 1, isolate);
141 if (stack->size()) 162 if (stack->size())
142 data->m_callFrame = stack->at(0); 163 data->m_callStack = stack;
143 } 164 }
144 } 165 }
145 } 166 }
146 167
168 PassRefPtr<Array<PromiseDetails> > PromiseTracker::promises()
169 {
170 ASSERT(isEnabled());
171
172 RefPtr<Array<PromiseDetails> > result = Array<PromiseDetails>::create();
173 for (PromiseDataMap::iterator it = m_promiseDataMap.begin(); it != m_promise DataMap.end(); ++it) {
174 PromiseDataVector* vector = &it->value;
175 for (size_t index = 0; index < vector->size(); ++index) {
176 RefPtr<PromiseData> data = vector->at(index);
177 RefPtr<PromiseDetails> promiseDetails = PromiseDetails::create()
178 .setId(data->m_promiseId)
179 .setStatus(data->m_status);
180 if (data->m_parentPromiseId)
181 promiseDetails->setParentId(data->m_parentPromiseId);
182 if (data->m_callStack.get())
aandrey 2014/09/02 14:34:49 drop ".get()"
Alexandra Mikhaylova 2014/09/03 14:28:54 Done.
183 promiseDetails->setCallFrame(data->m_callStack->at(0).buildInspe ctorObject());
184 result->addItem(promiseDetails);
185 }
186 }
187
188 return result.release();
189 }
190
147 } // namespace blink 191 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698