Changeset 31:bbd688924703 in xplcommon for src/xplcommon/BlockingStream.cc

Timestamp:

01/02/13 13:58:25 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Implemented the data stream

File:

• src/xplcommon/BlockingStream.cc (modified) (6 diffs)

src/xplcommon/BlockingStream.cc

@@ -46 +46 @@
 //------------------------------------------------------------------------------
 
-bool BlockingStream::isInterrupted()
+inline bool BlockingStream::checkInterrupted()
 {
-    if (failed()) return false;
-
     if (!interrupted) {
         interrupted = event.check();
@@ -83 +81 @@
 //------------------------------------------------------------------------------
 
+bool BlockingStream::skip(size_t length)
+{
+    ReadingBuffer& readingBuffer = stream.getReadingBuffer();
+    while (length>0) {
+        size_t toSkip = min(length, readingBuffer.getLength() - readingOffset);
+        readingOffset += toSkip;
+        length -= toSkip;
+
+        if (length!=0) {
+            if (!fill()) return false;
+        }
+    }
+
+    return true;
+}
+
+//------------------------------------------------------------------------------
+
 bool BlockingStream::write(const void* src, size_t length)
 {
@@ -105 +121 @@
 {
     WritingBuffer& writingBuffer = stream.getWritingBuffer();
-    while (!failed()) {
-        if (isInterrupted()) return false;
+    while (*this) {
+        if (checkInterrupted()) return false;
 
         if (writingBuffer.write()) {
@@ -112 +128 @@
         } else if (writingBuffer.failed()) {
             setErrorCode(writingBuffer.getErrorCode());
-            return false;
         } else {
             Waiter* waiter = stream.getWaiter();
@@ -132 +147 @@
     readingBuffer.reset();
     readingOffset = 0;
-    while (true) {
-        if (isInterrupted()) return false;
+    while (*this) {
+        if (checkInterrupted()) return false;
 
         if (readingBuffer.read()) {
-            return !readingBuffer.isEmpty();
+            eof = readingBuffer.isEmpty();
+            return !eof;
         } else if (readingBuffer.failed()) {
             setErrorCode(readingBuffer.getErrorCode());
-            return false;
         } else {
             Waiter* waiter = stream.getWaiter();
@@ -149 +164 @@
         }
     }
+    return false;
 }