Changeset 23:e6c4c31ce833 in xplcommon

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

Location:

src/xplcommon/win32

Files:

• LocalAcceptor.cc (modified) (2 diffs)
• LocalAcceptor.h (modified) (7 diffs)
• ReadingBuffer.cc (modified) (1 diff)
• StreamBuffer.h (modified) (4 diffs)
• WritingBuffer.cc (modified) (1 diff)

src/xplcommon/win32/LocalAcceptor.cc

@@ -40 +40 @@
 LocalAcceptor::LocalAcceptor(LocalServerSocketBase* socket, const char* name) :
     Completer(socket),
-    socket(*socket),
     accepted(false)
 {
@@ -58 +57 @@
     }
 
+    LocalServerSocketBase& socket = getServerSocket();
     if (!socket.createNamedPipe(path)) {
         return false;

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;
 }
 

src/xplcommon/win32/ReadingBuffer.cc

@@ -53 +53 @@
     }
 
+    BufferedStream& stream = getStream();
     ssize_t numRead = stream.read(getData(), getCapacity(), overlapped);
     if (numRead<0) {

src/xplcommon/win32/StreamBuffer.h

@@ -52 +52 @@
 protected:
     /**
-     * The buffered stream this stream buffer belongs to.
-     */
-    BufferedStream& stream;
-
-protected:
-    /**
      * Construct the stream buffer with the given capacity and for the
      * given stream.
      */
     StreamBuffer(size_t capacity, BufferedStream* stream);
+
+    /**
+     * Get the stream.
+     *
+     * This just casts the overlappable of the Completer part knowing
+     * that it must be a BufferedStream
+     */
+    BufferedStream& getStream() const;
 
 private:
@@ -83 +85 @@
 inline StreamBuffer::StreamBuffer(size_t capacity, BufferedStream* stream) :
     Buffer(capacity),
-    Completer(stream),
-    stream(*stream)
+    Completer(stream)
 {
+}
+
+//------------------------------------------------------------------------------
+
+inline BufferedStream& StreamBuffer::getStream() const
+{
+    return static_cast<BufferedStream&>(overlappable);
 }
 
@@ -92 +100 @@
 inline const ::xplcommon::Failable& StreamBuffer::getFailable() const
 {
-    return stream;
+    return overlappable;
 }
 
@@ -99 +107 @@
 inline ::xplcommon::Failable& StreamBuffer::getFailable()
 {
-    return stream;
+    return overlappable;
 }
 

src/xplcommon/win32/WritingBuffer.cc

@@ -51 +51 @@
     }
 
+    BufferedStream& stream = getStream();
     result = stream.write(getData(), getLength(), overlapped);
     if (result) {