Refactor Thread lifecycle interface, add Thread::Enter/ExitIsolate.

runtime/vm/isolate.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/isolate.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/json.h"
 #include "vm/code_observers.h"
@@ skipping 518 matching lines @@
 #define REUSABLE_HANDLE_SCOPE_INIT(object)                                     \
   reusable_##object##_handle_scope_active_(false),
 #else
 #define REUSABLE_HANDLE_SCOPE_INIT(object)
 #endif  // defined(DEBUG)
 
 #define REUSABLE_HANDLE_INITIALIZERS(object)                                   \
   object##_handle_(NULL),
 
 Isolate::Isolate()
-  :   mutator_thread_(new Thread(this)),
+  :   mutator_thread_(NULL),
       vm_tag_(0),
       store_buffer_(),
       message_notify_callback_(NULL),
       name_(NULL),
       debugger_name_(NULL),
       start_time_(OS::GetCurrentTimeMicros()),
       main_port_(0),
       origin_id_(0),
       pause_capability_(0),
       terminate_capability_(0),
@@ skipping 47 matching lines @@
       metrics_list_head_(NULL),
       next_(NULL),
       REUSABLE_HANDLE_LIST(REUSABLE_HANDLE_INITIALIZERS)
       REUSABLE_HANDLE_LIST(REUSABLE_HANDLE_SCOPE_INIT)
       reusable_handles_() {
   set_vm_tag(VMTag::kIdleTagId);
   set_user_tag(UserTags::kDefaultUserTag);
 }
 
 Isolate::Isolate(Isolate* original)
-  :   mutator_thread_(new Thread(this)),
+  :   mutator_thread_(NULL),
       vm_tag_(0),
       store_buffer_(true),
       class_table_(original->class_table()),
       message_notify_callback_(NULL),
       name_(NULL),
       debugger_name_(NULL),
       start_time_(OS::GetCurrentTimeMicros()),
       main_port_(0),
       pause_capability_(0),
       terminate_capability_(0),
@@ skipping 60 matching lines @@
   delete simulator_;
 #endif
   delete mutex_;
   mutex_ = NULL;  // Fail fast if interrupts are scheduled on a dead isolate.
   delete message_handler_;
   message_handler_ = NULL;  // Fail fast if we send messages to a dead isolate.
   ASSERT(deopt_context_ == NULL);  // No deopt in progress when isolate deleted.
   delete spawn_state_;
   delete log_;
   log_ = NULL;
-  delete mutator_thread_;
 }
 
 
 #if defined(DEBUG)
 bool Isolate::IsIsolateOf(Thread* thread) {
   return this == thread->isolate();
 }
 #endif  // DEBUG
 
 
-void Isolate::SetCurrent(Isolate* current) {
-  Isolate* old_current = Current();
-  if (old_current != NULL) {
-    old_current->set_vm_tag(VMTag::kIdleTagId);
-    old_current->set_thread_state(NULL);
-    Profiler::EndExecution(old_current);
-  }
-  if (current != NULL) {
-    Thread::SetCurrent(current->mutator_thread());
-    ASSERT(current->thread_state() == NULL);
-    InterruptableThreadState* thread_state =
-        ThreadInterrupter::GetCurrentThreadState();
-#if defined(DEBUG)
-    CheckForDuplicateThreadState(thread_state);
-#endif
-    ASSERT(thread_state != NULL);
-    Profiler::BeginExecution(current);
-    current->set_thread_state(thread_state);
-    current->set_vm_tag(VMTag::kVMTagId);
-  } else {
-    Thread::SetCurrent(NULL);
-  }
-}
-
-
 void Isolate::InitOnce() {
   create_callback_ = NULL;
   isolates_list_monitor_ = new Monitor();
   ASSERT(isolates_list_monitor_ != NULL);
 }
 
 
 Isolate* Isolate::Init(const char* name_prefix, bool is_vm_isolate) {
   Isolate* result = new Isolate();
   ASSERT(result != NULL);
 
   // Initialize metrics.
 #define ISOLATE_METRIC_INIT(type, variable, name, unit)                        \
   result->metric_##variable##_.Init(result, name, NULL, Metric::unit);
   ISOLATE_METRIC_LIST(ISOLATE_METRIC_INIT);
 #undef ISOLATE_METRIC_INIT
 
   // TODO(5411455): For now just set the recently created isolate as
   // the current isolate.
-  SetCurrent(result);
+  Thread::EnterIsolate(result);
 
   // Setup the isolate specific resuable handles.
 #define REUSABLE_HANDLE_ALLOCATION(object)                                     \
   result->object##_handle_ = result->AllocateReusableHandle<object>();
   REUSABLE_HANDLE_LIST(REUSABLE_HANDLE_ALLOCATION)
 #undef REUSABLE_HANDLE_ALLOCATION
 
   // Setup the isolate message handler.
   MessageHandler* handler = new IsolateMessageHandler(result);
   ASSERT(handler != NULL);
@@ skipping 680 matching lines @@
       heap()->PrintSizes();
       megamorphic_cache_table()->PrintSizes();
       Symbols::DumpStats();
       OS::Print("[-] Stopping isolate:\n"
                 "\tisolate:    %s\n", name());
     }
   }
 
   // TODO(5411455): For now just make sure there are no current isolates
   // as we are shutting down the isolate.
-  SetCurrent(NULL);
+  Thread::ExitIsolate();
   Profiler::ShutdownProfilingForIsolate(this);
 }
 
 
 Isolate* Isolate::ShallowCopy() {
   return new Isolate(this);
 }
 
 
 Dart_IsolateCreateCallback Isolate::create_callback_ = NULL;
@@ skipping 524 matching lines @@
                            serialized_message_, serialized_message_len_);
 }
 
 
 void IsolateSpawnState::Cleanup() {
   SwitchIsolateScope switch_scope(I);
   Dart::ShutdownIsolate();
 }
 
 }  // namespace dart