OLD | NEW |
---|---|
1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file |
2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
4 | 4 |
5 #include "vm/isolate.h" | 5 #include "vm/isolate.h" |
6 | 6 |
7 #include "include/dart_api.h" | 7 #include "include/dart_api.h" |
8 #include "platform/assert.h" | 8 #include "platform/assert.h" |
9 #include "lib/mirrors.h" | 9 #include "lib/mirrors.h" |
10 #include "vm/code_observers.h" | 10 #include "vm/code_observers.h" |
11 #include "vm/compiler_stats.h" | 11 #include "vm/compiler_stats.h" |
12 #include "vm/dart_api_state.h" | 12 #include "vm/dart_api_state.h" |
13 #include "vm/dart_entry.h" | 13 #include "vm/dart_entry.h" |
14 #include "vm/debugger.h" | 14 #include "vm/debugger.h" |
15 #include "vm/heap.h" | 15 #include "vm/heap.h" |
16 #include "vm/message_handler.h" | 16 #include "vm/message_handler.h" |
17 #include "vm/object_store.h" | 17 #include "vm/object_store.h" |
18 #include "vm/parser.h" | 18 #include "vm/parser.h" |
19 #include "vm/port.h" | 19 #include "vm/port.h" |
20 #include "vm/simulator.h" | |
20 #include "vm/stack_frame.h" | 21 #include "vm/stack_frame.h" |
21 #include "vm/stub_code.h" | 22 #include "vm/stub_code.h" |
22 #include "vm/symbols.h" | 23 #include "vm/symbols.h" |
23 #include "vm/thread.h" | 24 #include "vm/thread.h" |
24 #include "vm/timer.h" | 25 #include "vm/timer.h" |
25 #include "vm/visitor.h" | 26 #include "vm/visitor.h" |
26 | 27 |
27 namespace dart { | 28 namespace dart { |
28 | 29 |
29 DEFINE_FLAG(bool, report_usage_count, false, | 30 DEFINE_FLAG(bool, report_usage_count, false, |
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
263 main_port_(0), | 264 main_port_(0), |
264 heap_(NULL), | 265 heap_(NULL), |
265 object_store_(NULL), | 266 object_store_(NULL), |
266 top_context_(Context::null()), | 267 top_context_(Context::null()), |
267 top_exit_frame_info_(0), | 268 top_exit_frame_info_(0), |
268 init_callback_data_(NULL), | 269 init_callback_data_(NULL), |
269 library_tag_handler_(NULL), | 270 library_tag_handler_(NULL), |
270 api_state_(NULL), | 271 api_state_(NULL), |
271 stub_code_(NULL), | 272 stub_code_(NULL), |
272 debugger_(NULL), | 273 debugger_(NULL), |
274 simulator_(NULL), | |
273 long_jump_base_(NULL), | 275 long_jump_base_(NULL), |
274 timer_list_(), | 276 timer_list_(), |
275 deopt_id_(0), | 277 deopt_id_(0), |
276 ic_data_array_(Array::null()), | 278 ic_data_array_(Array::null()), |
277 mutex_(new Mutex()), | 279 mutex_(new Mutex()), |
278 stack_limit_(0), | 280 stack_limit_(0), |
279 saved_stack_limit_(0), | 281 saved_stack_limit_(0), |
280 message_handler_(NULL), | 282 message_handler_(NULL), |
281 spawn_data_(0), | 283 spawn_data_(0), |
282 gc_prologue_callbacks_(), | 284 gc_prologue_callbacks_(), |
283 gc_epilogue_callbacks_(), | 285 gc_epilogue_callbacks_(), |
284 deopt_cpu_registers_copy_(NULL), | 286 deopt_cpu_registers_copy_(NULL), |
285 deopt_fpu_registers_copy_(NULL), | 287 deopt_fpu_registers_copy_(NULL), |
286 deopt_frame_copy_(NULL), | 288 deopt_frame_copy_(NULL), |
287 deopt_frame_copy_size_(0), | 289 deopt_frame_copy_size_(0), |
288 deferred_doubles_(NULL), | 290 deferred_doubles_(NULL), |
289 deferred_mints_(NULL) { | 291 deferred_mints_(NULL) { |
290 } | 292 } |
291 | 293 |
292 | 294 |
293 Isolate::~Isolate() { | 295 Isolate::~Isolate() { |
294 delete [] name_; | 296 delete [] name_; |
295 delete heap_; | 297 delete heap_; |
296 delete object_store_; | 298 delete object_store_; |
297 delete api_state_; | 299 delete api_state_; |
298 delete stub_code_; | 300 delete stub_code_; |
299 delete debugger_; | 301 delete debugger_; |
302 #if defined(USING_SIMULATOR) | |
303 delete simulator_; | |
304 #endif | |
siva
2013/01/24 02:03:09
Is the #if defined(USING_SIMULATOR) necessary here
regis
2013/01/24 21:47:48
We would need to declare a dummy empty Simulator c
| |
300 delete mutex_; | 305 delete mutex_; |
301 mutex_ = NULL; // Fail fast if interrupts are scheduled on a dead isolate. | 306 mutex_ = NULL; // Fail fast if interrupts are scheduled on a dead isolate. |
302 delete message_handler_; | 307 delete message_handler_; |
303 message_handler_ = NULL; // Fail fast if we send messages to a dead isolate. | 308 message_handler_ = NULL; // Fail fast if we send messages to a dead isolate. |
304 } | 309 } |
305 | 310 |
306 void Isolate::SetCurrent(Isolate* current) { | 311 void Isolate::SetCurrent(Isolate* current) { |
307 Thread::SetThreadLocal(isolate_key, reinterpret_cast<uword>(current)); | 312 Thread::SetThreadLocal(isolate_key, reinterpret_cast<uword>(current)); |
308 } | 313 } |
309 | 314 |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
349 result->set_main_port(PortMap::CreatePort(result->message_handler())); | 354 result->set_main_port(PortMap::CreatePort(result->message_handler())); |
350 result->BuildName(name_prefix); | 355 result->BuildName(name_prefix); |
351 | 356 |
352 result->debugger_ = new Debugger(); | 357 result->debugger_ = new Debugger(); |
353 result->debugger_->Initialize(result); | 358 result->debugger_->Initialize(result); |
354 if (FLAG_trace_isolates) { | 359 if (FLAG_trace_isolates) { |
355 if (name_prefix == NULL || strcmp(name_prefix, "vm-isolate") != 0) { | 360 if (name_prefix == NULL || strcmp(name_prefix, "vm-isolate") != 0) { |
356 OS::Print("[+] Starting isolate:\n" | 361 OS::Print("[+] Starting isolate:\n" |
357 "\tisolate: %s\n", result->name()); | 362 "\tisolate: %s\n", result->name()); |
358 } | 363 } |
359 } | 364 } |
siva
2013/01/24 02:03:09
Shouldn't we be creating a simulator here and assi
regis
2013/01/24 21:47:48
We create the simulator on demand, when it is acce
| |
360 return result; | 365 return result; |
361 } | 366 } |
362 | 367 |
363 | 368 |
364 void Isolate::BuildName(const char* name_prefix) { | 369 void Isolate::BuildName(const char* name_prefix) { |
365 ASSERT(name_ == NULL); | 370 ASSERT(name_ == NULL); |
366 if (name_prefix == NULL) { | 371 if (name_prefix == NULL) { |
367 name_prefix = "isolate"; | 372 name_prefix = "isolate"; |
368 } | 373 } |
369 const char* kFormat = "%s-%lld"; | 374 const char* kFormat = "%s-%lld"; |
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
616 | 621 |
617 | 622 |
618 void Isolate::VisitWeakPersistentHandles(HandleVisitor* visitor, | 623 void Isolate::VisitWeakPersistentHandles(HandleVisitor* visitor, |
619 bool visit_prologue_weak_handles) { | 624 bool visit_prologue_weak_handles) { |
620 if (api_state() != NULL) { | 625 if (api_state() != NULL) { |
621 api_state()->VisitWeakHandles(visitor, visit_prologue_weak_handles); | 626 api_state()->VisitWeakHandles(visitor, visit_prologue_weak_handles); |
622 } | 627 } |
623 } | 628 } |
624 | 629 |
625 } // namespace dart | 630 } // namespace dart |
OLD | NEW |