From 5b1f4197d380718a15b3aa176f148bd6324bb1cb Mon Sep 17 00:00:00 2001
From: Markus Goetz <Markus.Goetz@nokia.com>
Date: Wed, 1 Jul 2009 12:19:19 +0200
Subject: QNAM: Direct transfer of HTTP buffer to the QNetworkReply buffer

Directly put a QRingBuffer from one QRingBuffer to
another QRingBuffer.

Reviewed-by: Thiago Macieira
---
 src/corelib/tools/qringbuffer_p.h | 47 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)

(limited to 'src/corelib/tools/qringbuffer_p.h')

diff --git a/src/corelib/tools/qringbuffer_p.h b/src/corelib/tools/qringbuffer_p.h
index b8e08acd07..f3daca714f 100644
--- a/src/corelib/tools/qringbuffer_p.h
+++ b/src/corelib/tools/qringbuffer_p.h
@@ -301,6 +301,51 @@ public:
         return read(size());
     }
 
+    // read an unspecified amount (will read the first buffer)
+    inline QByteArray read() {
+        // multiple buffers, just take the first one
+        if (head == 0 && tailBuffer != 0) {
+            QByteArray qba = buffers.takeFirst();
+            --tailBuffer;
+            bufferSize -= qba.length();
+            return qba;
+        }
+
+        // one buffer with good value for head. Just take it.
+        if (head == 0 && tailBuffer == 0) {
+            QByteArray qba = buffers.takeFirst();
+            qba.resize(tail);
+            buffers << QByteArray();
+            bufferSize = 0;
+            tail = 0;
+            return qba;
+        }
+
+        // Bad case: We have to memcpy.
+        // We can avoid by initializing the QRingBuffer with basicBlockSize of 0
+        // and only using this read() function.
+        QByteArray qba(readPointer(), nextDataBlockSize());
+        buffers.takeFirst();
+        head = 0;
+        if (tailBuffer == 0) {
+            buffers << QByteArray();
+            tail = 0;
+        } else {
+            --tailBuffer;
+        }
+        bufferSize -= qba.length();
+        return qba;        
+    }
+
+    // append a new buffer to the end
+    inline void append(const QByteArray &qba) {
+        buffers[tailBuffer].resize(tail);
+        buffers << qba;
+        ++tailBuffer;
+        tail = qba.length();
+        bufferSize += qba.length();
+    }
+
     inline QByteArray peek(int maxLength) const {
         int bytesToRead = qMin(size(), maxLength);
         if(maxLength <= 0)
@@ -355,7 +400,7 @@ public:
 private:
     QList<QByteArray> buffers;
     int head, tail;
-    int tailBuffer;
+    int tailBuffer; // always buffers.size() - 1
     int basicBlockSize;
     int bufferSize;
 };
-- 
cgit v1.2.1


From ce770ef755e2dae405ea3c91bd0dedda2f267716 Mon Sep 17 00:00:00 2001
From: Markus Goetz <Markus.Goetz@nokia.com>
Date: Thu, 9 Jul 2009 10:52:50 +0200
Subject: QRingBuffer micro optimization

---
 src/corelib/tools/qringbuffer_p.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/corelib/tools/qringbuffer_p.h')

diff --git a/src/corelib/tools/qringbuffer_p.h b/src/corelib/tools/qringbuffer_p.h
index f3daca714f..008c068acd 100644
--- a/src/corelib/tools/qringbuffer_p.h
+++ b/src/corelib/tools/qringbuffer_p.h
@@ -303,6 +303,9 @@ public:
 
     // read an unspecified amount (will read the first buffer)
     inline QByteArray read() {
+        if (bufferSize == 0)
+            return QByteArray();
+
         // multiple buffers, just take the first one
         if (head == 0 && tailBuffer != 0) {
             QByteArray qba = buffers.takeFirst();
@@ -325,7 +328,7 @@ public:
         // We can avoid by initializing the QRingBuffer with basicBlockSize of 0
         // and only using this read() function.
         QByteArray qba(readPointer(), nextDataBlockSize());
-        buffers.takeFirst();
+        buffers.removeFirst();
         head = 0;
         if (tailBuffer == 0) {
             buffers << QByteArray();
-- 
cgit v1.2.1