Support per-thread zones and stack resources.

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/base_isolate.h"
@@ skipping 60 matching lines @@
 class RawInt32x4;
 class RawUserTag;
 class SampleBuffer;
 class SendPort;
 class ServiceIdZone;
 class Simulator;
 class StackResource;
 class StackZone;
 class StoreBuffer;
 class StubCode;
+class ThreadRegistry;
 class TypeArguments;
 class TypeParameter;
 class UserTag;
 
 
 class IsolateVisitor {
  public:
   IsolateVisitor() {}
   virtual ~IsolateVisitor() {}
 
@@ skipping 46 matching lines @@
                              bool visit_prologue_weak_persistent_handles,
                              bool validate_frames);
 
   // Visits weak object pointers.
   void VisitWeakPersistentHandles(HandleVisitor* visitor,
                                   bool visit_prologue_weak_persistent_handles);
   void VisitPrologueWeakPersistentHandles(HandleVisitor* visitor);
 
   StoreBuffer* store_buffer() { return store_buffer_; }
 
+  ThreadRegistry* thread_registry() { return thread_registry_; }
+
   ClassTable* class_table() { return &class_table_; }
   static intptr_t class_table_offset() {
     return OFFSET_OF(Isolate, class_table_);
   }
 
   MegamorphicCacheTable* megamorphic_cache_table() {
     return &megamorphic_cache_table_;
   }
 
   Dart_MessageNotifyCallback message_notify_callback() const {
@@ skipping 44 matching lines @@
   Heap* heap() const { return heap_; }
   void set_heap(Heap* value) { heap_ = value; }
   static intptr_t heap_offset() { return OFFSET_OF(Isolate, heap_); }
 
   ObjectStore* object_store() const { return object_store_; }
   void set_object_store(ObjectStore* value) { object_store_ = value; }
   static intptr_t object_store_offset() {
     return OFFSET_OF(Isolate, object_store_);
   }
 
-  uword top_exit_frame_info() const { return top_exit_frame_info_; }
-  void set_top_exit_frame_info(uword value) { top_exit_frame_info_ = value; }
-  static intptr_t top_exit_frame_info_offset() {
-    return OFFSET_OF(Isolate, top_exit_frame_info_);
+  // DEPRECATED: Use Thread's methods instead. During migration, these default
+  // to using the mutator thread (which must also be the current thread).
+  StackResource* top_resource() const {
+    ASSERT(Thread::Current() == mutator_thread_);
+    return mutator_thread_->top_resource();
+  }
+  void set_top_resource(StackResource* value) {
+    ASSERT(Thread::Current() == mutator_thread_);
+    mutator_thread_->set_top_resource(value);
+  }
+  uword top_exit_frame_info() const {
+    ASSERT(Thread::Current() == mutator_thread_);
+    return mutator_thread_->top_exit_frame_info();
+  }
+  void set_top_exit_frame_info(uword value) {
+    ASSERT(Thread::Current() == mutator_thread_);
+    mutator_thread_->set_top_exit_frame_info(value);
   }
 
   uword vm_tag() const {
     return vm_tag_;
   }
   void set_vm_tag(uword tag) {
     vm_tag_ = tag;
   }
   static intptr_t vm_tag_offset() {
     return OFFSET_OF(Isolate, vm_tag_);
@@ skipping 487 matching lines @@
   REUSABLE_HANDLE_LIST(REUSABLE_HANDLE)
 #undef REUSABLE_HANDLE
 
   static void VisitIsolates(IsolateVisitor* visitor);
 
   Counters* counters() { return &counters_; }
 
   // Handle service messages until we are told to resume execution.
   void PauseEventHandler();
 
+  // DEPRECATED: Use Thread's methods instead. During migration, these default
+  // to using the mutator thread (which must also be the current thread).
+  Zone* current_zone() const {
+    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);
+  }
+
  private:
   explicit Isolate(const Dart_IsolateFlags& api_flags);
 
   void BuildName(const char* name_prefix);
   void PrintInvokedFunctions();
 
   void ProfileIdle();
 
   // Visit all object pointers. Caller must ensure concurrent sweeper is not
   // running, and the visitor must not allocate.
   void VisitObjectPointers(ObjectPointerVisitor* visitor,
                            bool visit_prologue_weak_persistent_handles,
                            bool validate_frames);
 
   void set_user_tag(uword tag) {
     user_tag_ = tag;
   }
 
   void set_mutator_thread(Thread* thread) {
     mutator_thread_ = thread;
   }
 
   template<class T> T* AllocateReusableHandle();
 
-  Thread* mutator_thread_;
   uword vm_tag_;
   StoreBuffer* store_buffer_;
+  ThreadRegistry* thread_registry_;
   ClassTable class_table_;
   MegamorphicCacheTable megamorphic_cache_table_;
   Dart_MessageNotifyCallback message_notify_callback_;
   char* name_;
   char* debugger_name_;
   int64_t start_time_;
   Dart_Port main_port_;
   Dart_Port origin_id_;  // Isolates created by spawnFunc have some origin id.
   uint64_t pause_capability_;
   uint64_t terminate_capability_;
@@ skipping 265 matching lines @@
   intptr_t serialized_args_len_;
   uint8_t* serialized_message_;
   intptr_t serialized_message_len_;
   Isolate::Flags isolate_flags_;
   bool paused_;
 };
 
 }  // namespace dart
 
 #endif  // VM_ISOLATE_H_