VM restart + shutdown fixes

runtime/vm/isolate.h

 // 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.
 
 #ifndef VM_ISOLATE_H_
 #define VM_ISOLATE_H_
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/atomic.h"
@@ skipping 111 matching lines @@
     kKillMsg = 4,
     kAddExitMsg = 5,
     kDelExitMsg = 6,
     kAddErrorMsg = 7,
     kDelErrorMsg = 8,
     kErrorFatalMsg = 9,
 
     // Internal message ids.
     kInterruptMsg = 10,     // Break in the debugger.
     kInternalKillMsg = 11,  // Like kill, but does not run exit listeners, etc.
+    kVMRestartMsg = 12,     // Sent to isolates when vm is restarting.
   };
   // The different Isolate API message priorities for ping and kill messages.
   enum LibMsgPriority {
     kImmediateAction = 0,
     kBeforeNextEventAction = 1,
     kAsEventAction = 2
   };
 
   ~Isolate();
 
@@ skipping 617 matching lines @@
     ASSERT(Thread::Current() == mutator_thread_);
     return mutator_thread_->zone();
   }
   void set_current_zone(Zone* zone) {
     ASSERT(Thread::Current() == mutator_thread_);
     mutator_thread_->set_zone(zone);
   }
 
   bool is_service_isolate() const { return is_service_isolate_; }
 
+  // The isolates_list_monitor_ should be held when calling Kill().
+  void KillLocked(LibMsgId msg_id = kInternalKillMsg);

[zra, 2015/10/05 16:56:47]

Maybe instead of making this public, make RestartVMIsolateVisitor a friend?
Otherwise if this should stay public, then IsolateKillerVisitor no longer needs
to be a friend. Also, I'd prefer just explicitly passing the LibMsgId
everywhere. There shouldn't be many call sites to fix.

[Cutch, 2015/10/05 18:10:46]

+1 to suggestion of dropping default msg_id value.

[turnidge, 2015/10/05 22:18:24]

I have made this private again.  I have added a msg_id parameter to
KillAllIsolates/KillIfExists and gotten rid of RestartVMIsolateVisitor.

+
   static void KillAllIsolates();
   static void KillIfExists(Isolate* isolate);
 
   static void DisableIsolateCreation();
   static void EnableIsolateCreation();
 
  private:
   friend class Dart;  // Init, InitOnce, Shutdown.
   friend class IsolateKillerVisitor;  // Kill().
 
   explicit Isolate(const Dart_IsolateFlags& api_flags);
 
   static void InitOnce();
   static Isolate* Init(const char* name_prefix,
                        const Dart_IsolateFlags& api_flags,
                        bool is_vm_isolate = false);
 
-  // The isolates_list_monitor_ should be held when calling Kill().
-  void KillLocked();
-
   void LowLevelShutdown();
   void Shutdown();
   void ReclaimTimelineBlocks();
 
   void BuildName(const char* name_prefix);
   void PrintInvokedFunctions();
 
   void ProfileIdle();
 
   // Visit all object pointers. Caller must ensure concurrent sweeper is not
@@ skipping 338 matching lines @@
   uint8_t* serialized_message_;
   intptr_t serialized_message_len_;
   Isolate::Flags isolate_flags_;
   bool paused_;
   bool errors_are_fatal_;
 };
 
 }  // namespace dart
 
 #endif  // VM_ISOLATE_H_