[net/udp] Create UDPSocketWin::Core which persists until all network operations complete.

net/udp/udp_socket_win.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_UDP_UDP_SOCKET_WIN_H_
 #define NET_UDP_UDP_SOCKET_WIN_H_
 
 #include <winsock2.h>
 
 #include "base/memory/ref_counted.h"
@@ skipping 103 matching lines @@
   // and receiving packets to and from broadcast addresses. Should be
   // called before Bind().
   void AllowBroadcast();
 
  private:
   enum SocketOptions {
     SOCKET_OPTION_REUSE_ADDRESS = 1 << 0,
     SOCKET_OPTION_BROADCAST     = 1 << 1
   };
 
-  class ReadDelegate : public base::win::ObjectWatcher::Delegate {
-   public:
-    explicit ReadDelegate(UDPSocketWin* socket) : socket_(socket) {}
-    virtual ~ReadDelegate() {}
-
-    // base::ObjectWatcher::Delegate methods:
-    virtual void OnObjectSignaled(HANDLE object);
-
-   private:
-    UDPSocketWin* const socket_;
-  };
-
-  class WriteDelegate : public base::win::ObjectWatcher::Delegate {
-   public:
-    explicit WriteDelegate(UDPSocketWin* socket) : socket_(socket) {}
-    virtual ~WriteDelegate() {}
-
-    // base::ObjectWatcher::Delegate methods:
-    virtual void OnObjectSignaled(HANDLE object);
-
-   private:
-    UDPSocketWin* const socket_;
-  };
+  class Core;
 
   void DoReadCallback(int rv);
   void DoWriteCallback(int rv);
   void DidCompleteRead();
   void DidCompleteWrite();
 
   // Handles stats and logging. |result| is the number of bytes transferred, on
   // success, or the net error code on failure. LogRead retrieves the address
   // from |recv_addr_storage_|, while LogWrite takes it as an optional argument.
   void LogRead(int result, const char* bytes) const;
@@ skipping 35 matching lines @@
   DatagramSocket::BindType bind_type_;
 
   // PRNG function for generating port numbers.
   RandIntCallback rand_int_cb_;
 
   // These are mutable since they're just cached copies to make
   // GetPeerAddress/GetLocalAddress smarter.
   mutable scoped_ptr<IPEndPoint> local_address_;
   mutable scoped_ptr<IPEndPoint> remote_address_;
 
-  // The socket's win wrappers
-  ReadDelegate read_delegate_;
-  WriteDelegate write_delegate_;
+  // The core of the socket that can live longer than the socket itself. We pass
+  // resources to the Windows async IO functions and we have to make sure that
+  // they are not destroyed while the OS still references them.
+  scoped_refptr<Core> core_;
 
-  // Watchers to watch for events from Read() and Write().
-  base::win::ObjectWatcher read_watcher_;
-  base::win::ObjectWatcher write_watcher_;
-
-  // OVERLAPPED for pending read and write operations.
-  OVERLAPPED read_overlapped_;
-  OVERLAPPED write_overlapped_;
-
-  // The buffer used by InternalRead() to retry Read requests
-  scoped_refptr<IOBuffer> read_iobuffer_;
   struct sockaddr_storage recv_addr_storage_;
   socklen_t recv_addr_len_;

[wtc, 2012/09/12 01:40:29]

BUG: recv_addr_storage_ and recv_addr_len_ need to be moved
to the Core class because they are passed to WSARecvFrom().

   IPEndPoint* recv_from_address_;
 
   // Cached copy of the current address we're sending to, if any.  Used for
   // logging.
   scoped_ptr<IPEndPoint> send_to_address_;
 
-  // The buffer used by InternalWrite() to retry Write requests
-  scoped_refptr<IOBuffer> write_iobuffer_;
-
   // External callback; called when read is complete.
   CompletionCallback read_callback_;
 
   // External callback; called when write is complete.
   CompletionCallback write_callback_;
 
   BoundNetLog net_log_;
 
   DISALLOW_COPY_AND_ASSIGN(UDPSocketWin);
 };
 
 }  // namespace net
 
 #endif  // NET_UDP_UDP_SOCKET_WIN_H_