Join embeder threads on Windows.

runtime/bin/eventhandler_win.h

 // Copyright (c) 2012, 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 BIN_EVENTHANDLER_WIN_H_
 #define BIN_EVENTHANDLER_WIN_H_
 
 #if !defined(BIN_EVENTHANDLER_H_)
 #error Do not include eventhandler_win.h directly; use eventhandler.h instead.
 #endif
@@ skipping 147 matching lines @@
  public:
   enum Type {
     kFile,
     kStd,
     kDirectoryWatch,
     kClientSocket,
     kListenSocket,
     kDatagramSocket
   };
 
-  class ScopedLock {
-   public:
-    explicit ScopedLock(Handle* handle)
-        : handle_(handle) {
-      handle_->Lock();
-    }
-    ~ScopedLock() {
-      handle_->Unlock();
-    }
-
-   private:
-    Handle* handle_;
-  };
-
   virtual ~Handle();
 
   // Socket interface exposing normal socket operations.
   intptr_t Available();
   intptr_t Read(void* buffer, intptr_t num_bytes);
   intptr_t RecvFrom(void* buffer,
                     intptr_t num_bytes,
                     struct sockaddr* sa,
                     socklen_t addr_len);
   virtual intptr_t Write(const void* buffer, intptr_t num_bytes);
@@ skipping 20 matching lines @@
   void MarkClosing() { flags_ |= (1 << kClosing); }
   void MarkClosedRead() { flags_ |= (1 << kCloseRead); }
   void MarkClosedWrite() { flags_ |= (1 << kCloseWrite); }
   void MarkError() { flags_ |= (1 << kError); }
 
   virtual void EnsureInitialized(
     EventHandlerImplementation* event_handler) = 0;
 
   HANDLE handle() { return handle_; }
 
-  void Lock();
-  void Unlock();
-
   bool CreateCompletionPort(HANDLE completion_port);
 
   void Close();
   virtual void DoClose();
   virtual bool IsClosed() = 0;
 
   bool IsHandleClosed() const { return handle_ == INVALID_HANDLE_VALUE; }
 
   Type type() { return type_; }
   bool is_file() { return type_ == kFile; }
@@ skipping 10 matching lines @@
   bool SupportsOverlappedIO() {
     return (flags_ & (1 << kDoesNotSupportOverlappedIO)) == 0;
   }
 
   void ReadSyncCompleteAsync();
 
   DWORD last_error() { return last_error_; }
   void set_last_error(DWORD last_error) { last_error_ = last_error; }
 
  protected:
+  // For access to monitor_;
+  friend class EventHandlerImplementation;
+
   enum Flags {
     kClosing = 0,
     kCloseRead = 1,
     kCloseWrite = 2,
     kDoesNotSupportOverlappedIO = 3,
     kError = 4
   };
 
   explicit Handle(intptr_t handle);
 
   virtual void HandleIssueError();
 
   Type type_;
   HANDLE handle_;
   HANDLE completion_port_;
   EventHandlerImplementation* event_handler_;
 
   OverlappedBuffer* data_ready_;  // Buffer for data ready to be read.
   OverlappedBuffer* pending_read_;  // Buffer for pending read.
   OverlappedBuffer* pending_write_;  // Buffer for pending write
 
   DWORD last_error_;
 
+  ThreadId read_thread_id_;
+  bool read_thread_starting_;
+  bool read_thread_finished_;
+  Monitor* monitor_;

[Ivan Posva, 2015/09/01 21:15:03]

Usually we try to have the monitor/lock before the fields that are protected by
it.

[zra, 2015/09/02 00:13:16]

Done.

+
  private:
+  void WaitForReadThreadStarted();
+  void NotifyReadThreadStarted();
+  void WaitForReadThreadFinished();
+  void NotifyReadThreadFinished();
+
   int flags_;
-  CRITICAL_SECTION cs_;  // Critical section protecting this object.
 };
 
 
 class FileHandle : public DescriptorInfoSingleMixin<Handle> {
  public:
   explicit FileHandle(HANDLE handle)
       : DescriptorInfoSingleMixin(reinterpret_cast<intptr_t>(handle), true) {
     type_ = kFile;
   }
 
   virtual void EnsureInitialized(EventHandlerImplementation* event_handler);
   virtual bool IsClosed();
 };
 
 
 class StdHandle : public FileHandle {
  public:
   explicit StdHandle(HANDLE handle)
       : FileHandle(handle),
+        thread_id_(Thread::kInvalidThreadId),
         thread_wrote_(0),
         write_thread_exists_(false),
-        write_thread_running_(false),
-        write_monitor_(new Monitor()) {
+        write_thread_running_(false) {
     type_ = kStd;
   }
 
-  ~StdHandle() {
-    delete write_monitor_;
-  }
-
   virtual void DoClose();
   virtual intptr_t Write(const void* buffer, intptr_t num_bytes);
 
   void WriteSyncCompleteAsync();
   void RunWriteLoop();
 
  private:
+  ThreadId thread_id_;
   intptr_t thread_wrote_;
   bool write_thread_exists_;
   bool write_thread_running_;
-  Monitor* write_monitor_;
 };
 
 
 class DirectoryWatchHandle : public DescriptorInfoSingleMixin<Handle> {
  public:
   DirectoryWatchHandle(HANDLE handle, int events, bool recursive)
       : DescriptorInfoSingleMixin(reinterpret_cast<intptr_t>(handle), true),
         events_(events),
         recursive_(recursive) {
     type_ = kDirectoryWatch;
@@ skipping 187 matching lines @@
   void HandleConnect(ClientSocket* client_socket,
                      int bytes,
                      OverlappedBuffer* buffer);
   void HandleIOCompletion(DWORD bytes, ULONG_PTR key, OVERLAPPED* overlapped);
 
   HANDLE completion_port() { return completion_port_; }
 
  private:
   ClientSocket* client_sockets_head_;
 
+  Monitor* startup_monitor_;
+  ThreadId handler_thread_id_;
+
   TimeoutQueue timeout_queue_;  // Time for next timeout.
   bool shutdown_;
   HANDLE completion_port_;
 };
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // BIN_EVENTHANDLER_WIN_H_