Changeset 23:e6c4c31ce833 in xplcommon for src/xplcommon/win32/LocalAcceptor.h

Timestamp:

01/02/13 06:50:19 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Eliminated the double storage of the Overlappable instances in the children of Completer

File:

• src/xplcommon/win32/LocalAcceptor.h (modified) (7 diffs)

src/xplcommon/win32/LocalAcceptor.h

@@ -52 +52 @@
 private:
     /**
-     * The local server socket for which we are accepting connections.
-     */
-    LocalServerSocketBase& socket;
-
-    /**
      * The path of the pipe to accept.
      */
@@ -71 +66 @@
      */
     LocalAcceptor(LocalServerSocketBase* socket, const char* name);
+
+    /**
+     * Get the socket.
+     *
+     * It returns the overlappable from the Completer part, knowing
+     * that it must be a LocalServerSocketBase.
+     */
+    LocalServerSocketBase& getServerSocket() const;
 
 public:
@@ -130 +133 @@
 //------------------------------------------------------------------------------
 
+inline LocalServerSocketBase& LocalAcceptor::getServerSocket() const
+{
+    return static_cast<LocalServerSocketBase&>(overlappable);
+}
+
+//------------------------------------------------------------------------------
+
 inline LocalSocket* LocalAcceptor::getSocket(Waiter* waiter,
                                              size_t readingCapacity,
@@ -136 +146 @@
     if (!accepted) return 0;
 
-    LocalSocket* s = new LocalSocket(waiter, socket.releaseHandle(),
+    LocalSocket* s = new LocalSocket(waiter, getServerSocket().releaseHandle(),
                                      readingCapacity, writingCapacity);
     accepted = false;
     return s;
 }
+
 //------------------------------------------------------------------------------
 
@@ -146 +157 @@
                                              size_t writingCapacity)
 {
-    return getSocket(socket.waiter, readingCapacity, writingCapacity);
+    return getSocket(getServerSocket().waiter,
+                     readingCapacity, writingCapacity);
 }
 
@@ -153 +165 @@
 inline const ::xplcommon::Failable& LocalAcceptor::getFailable() const
 {
-    return socket;
+    return overlappable;
 }
 
@@ -160 +172 @@
 inline ::xplcommon::Failable& LocalAcceptor::getFailable()
 {
-    return socket;
+    return overlappable;
 }