Rework service extensions to be safe

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 685 matching lines @@
     return deoptimized_code_array_;
   }
   void set_deoptimized_code_array(const GrowableObjectArray& value);
   void TrackDeoptimizedCode(const Code& code);
 
   bool compilation_allowed() const { return compilation_allowed_; }
   void set_compilation_allowed(bool allowed) {
     compilation_allowed_ = allowed;
   }
 
+  RawObject* InvokePendingExtensionCalls();
+  void AppendExtensionCall(const Instance& closure,
+                           const String& method_name,
+                           const Array& parameter_keys,
+                           const Array& parameter_values,
+                           const Instance& reply_port,
+                           const Instance& id);
+  void RegisterExtensionHandler(const String& name, const Instance& closure);
+  RawInstance* LookupExtensionHandler(const String& name);
+
 #if defined(DEBUG)
 #define REUSABLE_HANDLE_SCOPE_ACCESSORS(object)                                \
   void set_reusable_##object##_handle_scope_active(bool value) {               \
     reusable_##object##_handle_scope_active_ = value;                          \
   }                                                                            \
   bool reusable_##object##_handle_scope_active() const {                       \
     return reusable_##object##_handle_scope_active_;                           \
   }
   REUSABLE_HANDLE_LIST(REUSABLE_HANDLE_SCOPE_ACCESSORS)
 #undef REUSABLE_HANDLE_SCOPE_ACCESSORS
@@ skipping 43 matching lines @@
   // 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;
   }
 
+  RawGrowableObjectArray* GetAndClearPendingExtensionCalls();
+  RawGrowableObjectArray* pending_extension_calls() const {
+    return pending_extension_calls_;
+  }
+  void set_pending_extension_calls(const GrowableObjectArray& value);
+  RawGrowableObjectArray* registered_extension_handlers() const {
+    return registered_extension_handlers_;
+  }
+  void set_registered_extension_handlers(const GrowableObjectArray& value);
+
   void ClearMutatorThread() {
     mutator_thread_ = NULL;
   }
   void MakeCurrentThreadMutator(Thread* thread) {
     ASSERT(thread == Thread::Current());
     DEBUG_ASSERT(IsIsolateOf(thread));
     mutator_thread_ = thread;
   }
 #if defined(DEBUG)
   bool IsIsolateOf(Thread* thread);
@@ skipping 71 matching lines @@
 
   VMTagCounters vm_tag_counters_;
   uword user_tag_;
   RawGrowableObjectArray* tag_table_;
   RawUserTag* current_tag_;
   RawUserTag* default_tag_;
 
   RawGrowableObjectArray* collected_closures_;
   RawGrowableObjectArray* deoptimized_code_array_;
 
+  // We use 6 list entries for each pending service extension calls.
+  enum {
+    kPendingHandlerIndex = 0,
+    kPendingMethodNameIndex,
+    kPendingKeysIndex,
+    kPendingValuesIndex,
+    kPendingReplyPortIndex,
+    kPendingIdIndex,
+    kPendingEntrySize
+  };
+  RawGrowableObjectArray* pending_extension_calls_;
+
+  // We use 2 list entries for each register extension handler.

[Ivan Posva, 2015/08/26 04:47:00]

register -> registered

[Cutch, 2015/08/26 14:28:00]

Done.

+  enum {
+    kRegisteredNameIndex = 0,
+    kRegisteredHandlerIndex,
+    kRegisteredEntrySize
+  };
+  RawGrowableObjectArray* registered_extension_handlers_;
+
   Metric* metrics_list_head_;
 
   Counters counters_;
 
   bool compilation_allowed_;
 
   // TODO(23153): Move this out of Isolate/Thread.
   CHA* cha_;
 
   // Isolate list next pointer.
@@ skipping 200 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_