OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 <vector> | 5 #include <vector> |
6 | 6 |
7 #include "dart/runtime/include/dart_api.h" | 7 #include "dart/runtime/include/dart_api.h" |
8 #include "dart/runtime/include/dart_debugger_api.h" | 8 #include "dart/runtime/include/dart_debugger_api.h" |
9 #include "dart/runtime/include/dart_native_api.h" | 9 #include "dart/runtime/include/dart_native_api.h" |
10 #include "mojo/dart/embedder/dart_debugger.h" | 10 #include "dart_debugger.h" |
11 | 11 |
12 namespace mojo { | 12 namespace mojo { |
13 namespace dart { | 13 namespace dart { |
14 | 14 |
15 void DartDebuggerIsolate::MessageLoop() { | 15 void DartDebuggerIsolate::MessageLoop() { |
16 MonitorLocker ml(&monitor_); | 16 MonitorLocker ml(&monitor_); |
17 // Request notification on isolate messages. This allows us to | 17 // Request notification on isolate messages. This allows us to |
18 // respond to vm service messages while at breakpoint. | 18 // respond to vm service messages while at breakpoint. |
19 Dart_SetMessageNotifyCallback(DartDebugger::NotifyIsolate); | 19 Dart_SetMessageNotifyCallback(DartDebugger::NotifyIsolate); |
20 while (true) { | 20 while (true) { |
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
125 isolates_.push_back(debugger_isolate); | 125 isolates_.push_back(debugger_isolate); |
126 return debugger_isolate; | 126 return debugger_isolate; |
127 } | 127 } |
128 | 128 |
129 void DartDebugger::RemoveIsolate(Dart_IsolateId id) { | 129 void DartDebugger::RemoveIsolate(Dart_IsolateId id) { |
130 base::AutoLock al(*lock_); | 130 base::AutoLock al(*lock_); |
131 for (size_t i = 0; i < isolates_.size(); i++) { | 131 for (size_t i = 0; i < isolates_.size(); i++) { |
132 DartDebuggerIsolate* isolate = isolates_[i]; | 132 DartDebuggerIsolate* isolate = isolates_[i]; |
133 if (id == isolate->id()) { | 133 if (id == isolate->id()) { |
134 isolates_.erase(isolates_.begin() + i); | 134 isolates_.erase(isolates_.begin() + i); |
| 135 delete isolate; |
135 return; | 136 return; |
136 } | 137 } |
137 } | 138 } |
138 NOTREACHED(); | 139 NOTREACHED(); |
139 } | 140 } |
140 | 141 |
141 base::Lock* DartDebugger::lock_ = nullptr; | 142 base::Lock* DartDebugger::lock_ = nullptr; |
142 std::vector<DartDebuggerIsolate*> DartDebugger::isolates_; | 143 std::vector<DartDebuggerIsolate*> DartDebugger::isolates_; |
143 | 144 |
144 } // namespace apps | 145 } // namespace apps |
145 } // namespace mojo | 146 } // namespace mojo |
OLD | NEW |