OOB messages and general message refactor.

runtime/vm/isolate.h

 // 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.
 
 #ifndef VM_ISOLATE_H_
 #define VM_ISOLATE_H_
 
 #include "include/dart_api.h"
 #include "vm/assert.h"
 #include "vm/store_buffer.h"
 #include "vm/timer.h"
 
 namespace dart {
 
 // Forward declarations.
 class ApiState;
 class BigintStore;
 class CodeIndexTable;
 class Debugger;
 class HandleScope;
 class Heap;
 class LongJump;
+class Message;
 class MessageQueue;
 class Mutex;
 class ObjectPointerVisitor;
 class ObjectStore;
 class RawContext;
 class RawObject;
 class StackResource;
 class StubCode;
 class Zone;
 
@@ skipping 11 matching lines @@
   // Visit all object pointers.
   void VisitObjectPointers(ObjectPointerVisitor* visitor, bool validate_frames);
 
   void VisitStrongObjectPointers(ObjectPointerVisitor* visitor,
                                  bool validate_frames);
 
   void VisitWeakObjectPointers(ObjectPointerVisitor* visitor);
 
   StoreBufferBlock* store_buffer() { return &store_buffer_; }
 
-  Dart_PostMessageCallback post_message_callback() const {
-    return post_message_callback_;
+  Dart_MessageNotifyCallback message_notify_callback() const {
+    return message_notify_callback_;
   }
-  void set_post_message_callback(Dart_PostMessageCallback value) {
-    post_message_callback_ = value;
-  }
-
-  Dart_ClosePortCallback close_port_callback() const {
-    return close_port_callback_;
-  }
-  void set_close_port_callback(Dart_ClosePortCallback value) {
-    close_port_callback_ = value;
+  void set_message_notify_callback(Dart_MessageNotifyCallback value) {
+    message_notify_callback_ = value;
   }
 
   MessageQueue* message_queue() const { return message_queue_; }
   void set_message_queue(MessageQueue* value) { message_queue_ = value; }
 
   // The number of ports is only correct when read from the current
   // isolate. This value is not protected from being updated
   // concurrently.
   intptr_t num_ports() const { return num_ports_; }
   void increment_num_ports() {
@@ skipping 155 matching lines @@
 
   // The current stack limit.  This may be overwritten with a special
   // value to trigger interrupts.
   uword stack_limit() const { return stack_limit_; }
 
   // The true stack limit for this isolate.  This does not change
   // after isolate initialization.
   uword saved_stack_limit() const { return saved_stack_limit_; }
 
   enum {
-    kInterruptsMask = 0x1,
-    kApiInterrupt = 0x1,  // An interrupt from Dart_InterruptIsolate.
-    // More interrupt types will go here.
+    kInterruptsMask = 0x3,

[Anton Muhin, 2012/01/12 12:58:16]

maybe kInterruptsMask = kApiInterrupt | kMessageInterrupt ?

[turnidge, 2012/01/12 19:01:55]

Done.

+    kApiInterrupt = 0x1,      // An interrupt from Dart_InterruptIsolate.
+    kMessageInterrupt = 0x2,  // An interrupt to process an out of band message.
   };
 
   void ScheduleInterrupts(uword interrupt_bits);
   uword GetAndClearInterrupts();
 
+  void PostMessage(Message* message);
+  void ClosePort(Dart_Port port);
+  void CloseAllPorts();
+
   // Returns null on success, unhandled exception on failure.
   RawObject* StandardRunLoop();
 
   intptr_t ast_node_id() const { return ast_node_id_; }
   void set_ast_node_id(int value) { ast_node_id_ = value; }
 
   Debugger* debugger() const { return debugger_; }
 
   static void SetCreateCallback(Dart_IsolateCreateCallback cback);
   static Dart_IsolateCreateCallback CreateCallback();
 
   static void SetInterruptCallback(Dart_IsolateInterruptCallback cback);
   static Dart_IsolateInterruptCallback InterruptCallback();
 
  private:
   Isolate();
 
   void PrintInvokedFunctions();
 
   static uword GetSpecifiedStackSize();
 
   static const uword kStackSizeBuffer = (128 * KB);
   static const uword kDefaultStackSize = (1 * MB);
 
   StoreBufferBlock store_buffer_;
   MessageQueue* message_queue_;
-  Dart_PostMessageCallback post_message_callback_;
-  Dart_ClosePortCallback close_port_callback_;
+  Dart_MessageNotifyCallback message_notify_callback_;
   intptr_t num_ports_;
   intptr_t live_ports_;
   Dart_Port main_port_;
   Heap* heap_;
   ObjectStore* object_store_;
   StackResource* top_resource_;
   RawContext* top_context_;
   Zone* current_zone_;
 #if defined(DEBUG)
   int32_t no_gc_scope_depth_;
@@ skipping 28 matching lines @@
 #include "vm/isolate_linux.h"
 #elif defined(TARGET_OS_MACOS)
 #include "vm/isolate_macos.h"
 #elif defined(TARGET_OS_WINDOWS)
 #include "vm/isolate_win.h"
 #else
 #error Unknown target os.
 #endif
 
 #endif  // VM_ISOLATE_H_