Changeset 30:1dde7e03353f in xplcommon

Timestamp:

01/02/13 11:54:56 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

A little cleanup

Files:

• src/xplcommon/BlockingStream.cc (modified) (3 diffs)
• src/xplcommon/BlockingStream.h (modified) (1 diff)
• src/xplcommon/Buffer.cc (deleted)
• src/xplcommon/Buffer.h (modified) (3 diffs)
• src/xplcommon/Makefile.am (modified) (1 diff)
• test/testblkstream.cc (modified) (1 diff)

src/xplcommon/BlockingStream.cc

@@ -68 +68 @@
     ReadingBuffer& readingBuffer = stream.getReadingBuffer();
     while (length>0) {
-        size_t toCopy = min(readingBuffer.getLength() - readingOffset, length);
-        if (toCopy>0) {
-            memcpy(d, readingBuffer.getData() + readingOffset, toCopy);
-            readingOffset += toCopy;
-            length -= toCopy;
-            d += toCopy;
+        size_t copied = readingBuffer.extract(d, length, readingOffset);
+        readingOffset += copied;
+        length -= copied;
+        d += copied;
+
+        if (length!=0) {
+            if (!fill()) return false;
         }
-
-        if (length==0) break;
-
-        readingBuffer.reset();
-        readingOffset = 0;
-        while (!failed()) {
-            if (isInterrupted()) return false;
-
-            if (readingBuffer.read()) {
-                if (readingBuffer.isEmpty()) return false;
-                break;
-            } else if (readingBuffer.failed()) {
-                setErrorCode(readingBuffer.getErrorCode());
-            } else {
-                Waiter* waiter = stream.getWaiter();
-                waiter->wait();
-                if (waiter->failed()) {
-                    setErrorCode(waiter->getErrorCode());
-                }
-            }
-        }
-        if (failed()) return false;
     }
 
@@ -110 +89 @@
     WritingBuffer& writingBuffer = stream.getWritingBuffer();
     while(length>0) {
-        size_t toCopy = min(length, writingBuffer.getAvailable());
-        if (toCopy>0) {
-            memcpy(writingBuffer.getData() + writingBuffer.getLength(),
-                   s, toCopy);
-            writingBuffer.addLength(toCopy);
-            length -= toCopy;
-            s += toCopy;
-        }
+        size_t copied = writingBuffer.append(s, length);
+        length -= copied;
+        s += copied;
 
         if (length==0) break;
@@ -152 +126 @@
 //------------------------------------------------------------------------------
 
+bool BlockingStream::fill()
+{
+    ReadingBuffer& readingBuffer = stream.getReadingBuffer();
+
+    readingBuffer.reset();
+    readingOffset = 0;
+    while (true) {
+        if (isInterrupted()) return false;
+
+        if (readingBuffer.read()) {
+            return !readingBuffer.isEmpty();
+        } else if (readingBuffer.failed()) {
+            setErrorCode(readingBuffer.getErrorCode());
+            return false;
+        } else {
+            Waiter* waiter = stream.getWaiter();
+            waiter->wait();
+            if (waiter->failed()) {
+                setErrorCode(waiter->getErrorCode());
+                return false;
+            }
+        }
+    }
+}
+
+//------------------------------------------------------------------------------
+
 // Local Variables:
 // mode: C++

src/xplcommon/BlockingStream.h

@@ -119 +119 @@
      */
     bool flush();
+
+private:
+    /**
+     * Fill the buffer with data from the stream.
+     */
+    bool fill();
 };
 

src/xplcommon/Buffer.h

@@ -35 +35 @@
 
 #include <cstdlib>
+#include <cstring>
 
 //------------------------------------------------------------------------------
@@ -130 +131 @@
      * @return the number of bytes actually extracted.
      */
-    size_t extract(void* dest, size_t size, size_t offset = 0);
+    size_t extract(void* dest, size_t size, size_t offset = 0) const;
 };
 
@@ -207 +208 @@
     length += toAdd;
     return toAdd;
+}
+
+//------------------------------------------------------------------------------
+
+inline size_t Buffer::append(const void* src, size_t size)
+{
+    size_t toCopy = std::min(size, getAvailable());
+    memcpy(data + length, src, toCopy);
+    length += toCopy;
+    return toCopy;
+}
+
+//------------------------------------------------------------------------------
+
+inline size_t Buffer::extract(void* dest, size_t size, size_t offset) const
+{
+    size_t toCopy = (offset>=length) ? 0 : std::min(size, length - offset);
+    memcpy(dest, data + offset, toCopy);
+    return toCopy;
 }
 

src/xplcommon/Makefile.am

@@ -11 +11 @@
 libxplcommon_la_SOURCES= \
         PseudoRandom.cc         \
-        Buffer.cc               \
         BlockingStream.cc
 

test/testblkstream.cc

@@ -274 +274 @@
     clientThread.start();
 
-    //Thread::sleep(60000);
-    Thread::sleep(5000);
+    Thread::sleep(60000);
+    //Thread::sleep(5000);
     printf("Signalling the server thread\n");
     serverThread.interrupt();