- Refactor the isolate callback mechanism to also include creation of the

vm/isolate.cc

 // Copyright (c) 2011, 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 "vm/assert.h"
 #include "vm/bigint_store.h"
@@ skipping 32 matching lines @@
       top_context_(Context::null()),
       current_zone_(NULL),
 #if defined(DEBUG)
       no_gc_scope_depth_(0),
       no_handle_scope_depth_(0),
       top_handle_scope_(NULL),
 #endif
       random_seed_(Random::kDefaultRandomSeed),
       bigint_store_(NULL),
       top_exit_frame_info_(0),
-      init_callback_data_(NULL),
       library_tag_handler_(NULL),
       api_state_(NULL),
       stub_code_(NULL),
       code_index_table_(NULL),
       long_jump_base_(NULL),
       timer_list_(),
       stack_limit_(0),
       stack_limit_on_overflow_exception_(0),
       ast_node_id_(AstNode::kNoId) {
 }
@@ skipping 152 matching lines @@
   if (FLAG_generate_gdb_symbols) {
     DebugInfo::UnregisterAllSections();
   }
 
   // TODO(5411455): For now just make sure there are no current isolates
   // as we are shutting down the isolate.
   SetCurrent(NULL);
 }
 
 
-Dart_IsolateInitCallback Isolate::init_callback_ = NULL;
+Dart_IsolateCreateAndInitCallback Isolate::create_init_callback_ = NULL;
 
 
-void Isolate::SetInitCallback(Dart_IsolateInitCallback callback) {
-  init_callback_ = callback;
+void Isolate::SetCreateAndInitCallback(Dart_IsolateCreateAndInitCallback cb) {
+  create_init_callback_ = cb;
 }
 
 
-Dart_IsolateInitCallback Isolate::InitCallback() {
-  return init_callback_;
+Dart_IsolateCreateAndInitCallback Isolate::CreateAndInitCallback() {
+  return create_init_callback_;
 }
 
 
 void Isolate::StandardRunLoop() {
   ASSERT(long_jump_base() != NULL);
   ASSERT(post_message_callback() == &StandardPostMessageCallback);
   ASSERT(close_port_callback() == &StandardClosePortCallback);
 
   while (active_ports() > 0) {
     ASSERT(this == Isolate::Current());
@@ skipping 43 matching lines @@
   // Visit all objects in the code index table.
   if (code_index_table() != NULL) {
     code_index_table()->VisitObjectPointers(visitor);
   }
 
   // Visit the top context which is stored in the isolate.
   visitor->VisitPointer(reinterpret_cast<RawObject**>(&top_context_));
 }
 
 }  // namespace dart