Introduce optional 'bool shared' parameter to ServerSocket.bind() ...

dart/runtime/bin/eventhandler_macos.h

Index: dart/runtime/bin/eventhandler_macos.h
diff --git a/dart/runtime/bin/eventhandler_macos.h b/dart/runtime/bin/eventhandler_macos.h
index 4e32dc0656f159b44e50d34b16240d075a38b116..5630e9273ee2796a2e17e1b1d31fdb1819296f88 100644
--- a/dart/runtime/bin/eventhandler_macos.h
+++ b/dart/runtime/bin/eventhandler_macos.h
@@ -21,62 +21,50 @@
 namespace dart {
 namespace bin {
 
-class InterruptMessage {
+class DescriptorInfo : public DescriptorInfoBase {
  public:
-  intptr_t id;
-  Dart_Port dart_port;
-  int64_t data;
-};
-
-
-class SocketData {
- public:
-  explicit SocketData(intptr_t fd)
-      : fd_(fd),
-        port_(0),
-        mask_(0),
-        tracked_by_kqueue_(false),
-        tokens_(16) {
-    ASSERT(fd_ != -1);
-  }
+  explicit DescriptorInfo(intptr_t fd)
+      : DescriptorInfoBase(fd), tracked_by_kqueue_(false) { }
 
-  bool HasReadEvent();
-  bool HasWriteEvent();
+  virtual ~DescriptorInfo() { }
 
-  bool IsListeningSocket() { return (mask_ & (1 << kListeningSocket)) != 0; }
+  intptr_t GetPollEvents();
 
-  void SetPortAndMask(Dart_Port port, intptr_t mask) {
-    ASSERT(fd_ != -1);
-    port_ = port;
-    mask_ = mask;
+  virtual void Close() {
+    VOID_TEMP_FAILURE_RETRY(close(fd_));
+    fd_ = -1;
   }
 
-  intptr_t fd() { return fd_; }
-  Dart_Port port() { return port_; }
-  intptr_t mask() { return mask_; }
-  bool tracked_by_kqueue() { return tracked_by_kqueue_; }
   void set_tracked_by_kqueue(bool value) {
     tracked_by_kqueue_ = value;
   }
 
-  // Returns true if the last token was taken.
-  bool TakeToken() {
-    tokens_--;
-    return tokens_ == 0;
-  }
+  bool tracked_by_kqueue() { return tracked_by_kqueue_; }
 
-  // Returns true if the tokens was 0 before adding.
-  bool ReturnToken() {
-    tokens_++;
-    return tokens_ == 1;
-  }
+  bool HasReadEvent();
 
- private:
-  intptr_t fd_;
-  Dart_Port port_;
-  intptr_t mask_;
+  bool HasWriteEvent();
+
+ protected:
   bool tracked_by_kqueue_;
-  int tokens_;
+};
+
+
+class DescriptorInfoSingle
+    : public DescriptorInfoSingleMixin<DescriptorInfo> {
+ public:
+  explicit DescriptorInfoSingle(intptr_t fd)
+      : DescriptorInfoSingleMixin(fd) {}
+  virtual ~DescriptorInfoSingle() {}
+};
+
+
+class DescriptorInfoMultiple
+    : public DescriptorInfoMultipleMixin<DescriptorInfo> {
+ public:
+  explicit DescriptorInfoMultiple(intptr_t fd)
+      : DescriptorInfoMultipleMixin(fd) {}
+  virtual ~DescriptorInfoMultiple() {}
 };
 
 
@@ -87,7 +75,7 @@ class EventHandlerImplementation {
 
   // Gets the socket data structure for a given file
   // descriptor. Creates a new one if one is not found.
-  SocketData* GetSocketData(intptr_t fd);
+  DescriptorInfo* GetDescriptorInfo(intptr_t fd, bool is_listening);
   void SendData(intptr_t id, Dart_Port dart_port, int64_t data);
   void Start(EventHandler* handler);
   void Shutdown();
@@ -100,7 +88,7 @@ class EventHandlerImplementation {
   void WakeupHandler(intptr_t id, Dart_Port dart_port, int64_t data);
   void HandleInterruptFd();
   void SetPort(intptr_t fd, Dart_Port dart_port, intptr_t mask);
-  intptr_t GetEvents(struct kevent* event, SocketData* sd);
+  intptr_t GetEvents(struct kevent* event, DescriptorInfo* di);
   static void* GetHashmapKeyFromFd(intptr_t fd);
   static uint32_t GetHashmapHashFromFd(intptr_t fd);