FCL/sf/mw/qt: comparison src/network/access/qhttpnetworkconnection.cpp

equal deleted inserted replaced

-:fcece45ef507
+:79de32ba3296
 const int QHttpNetworkConnectionPrivate::defaultChannelCount = 3;
 #else
 const int QHttpNetworkConnectionPrivate::defaultChannelCount = 6;
 #endif
-// the maximum amount of requests that might be pipelined into a socket
+// The pipeline length. So there will be 4 requests in flight.
-// from what was suggested, 3 seems to be OK
 const int QHttpNetworkConnectionPrivate::defaultPipelineLength = 3;
+// Only re-fill the pipeline if there's defaultRePipelineLength slots free in the pipeline.
+// This means that there are 2 requests in flight and 2 slots free that will be re-filled.
+const int QHttpNetworkConnectionPrivate::defaultRePipelineLength = 2;
 QHttpNetworkConnectionPrivate::QHttpNetworkConnectionPrivate(const QString &hostName, quint16 port, bool encrypt)
 : hostName(hostName), port(port), encrypt(encrypt),
 channelCount(defaultChannelCount),
 if (highPriorityQueue.isEmpty() && lowPriorityQueue.isEmpty())
 return;
 int i = indexOf(socket);
-bool highPriorityQueueProcessingDone = false;
+if (! (defaultPipelineLength - channels[i].alreadyPipelinedRequests.length() >= 2)) {
-bool lowPriorityQueueProcessingDone = false;
+return;
+}
-while (!highPriorityQueueProcessingDone && !lowPriorityQueueProcessingDone) {
-// this loop runs once per request we intend to pipeline in.
+if (channels[i].pipeliningSupported != QHttpNetworkConnectionChannel::PipeliningProbablySupported)
+return;
-if (channels[i].pipeliningSupported != QHttpNetworkConnectionChannel::PipeliningProbablySupported)
-return;
+// the current request that is in must already support pipelining
+if (!channels[i].request.isPipeliningAllowed())
-// the current request that is in must already support pipelining
+return;
-if (!channels[i].request.isPipeliningAllowed())
-return;
+// the current request must be a idempotent (right now we only check GET)
+if (channels[i].request.operation() != QHttpNetworkRequest::Get)
-// the current request must be a idempotent (right now we only check GET)
+return;
-if (channels[i].request.operation() != QHttpNetworkRequest::Get)
-return;
+// check if socket is connected
+if (socket->state() != QAbstractSocket::ConnectedState)
-// check if socket is connected
+return;
-if (socket->state() != QAbstractSocket::ConnectedState)
-return;
+// check for resendCurrent
+if (channels[i].resendCurrent)
-// check for resendCurrent
+return;
-if (channels[i].resendCurrent)
-return;
+// we do not like authentication stuff
+// ### make sure to be OK with this in later releases
-// we do not like authentication stuff
+if (!channels[i].authenticator.isNull() || !channels[i].authenticator.user().isEmpty())
-// ### make sure to be OK with this in later releases
+return;
-if (!channels[i].authenticator.isNull() || !channels[i].authenticator.user().isEmpty())
+if (!channels[i].proxyAuthenticator.isNull() || !channels[i].proxyAuthenticator.user().isEmpty())
 return;
-if (!channels[i].proxyAuthenticator.isNull() || !channels[i].proxyAuthenticator.user().isEmpty())
-return;
+// must be in ReadingState or WaitingState
+if (! (channels[i].state == QHttpNetworkConnectionChannel::WaitingState
-// check for pipeline length
+|| channels[i].state == QHttpNetworkConnectionChannel::ReadingState))
+return;
+//qDebug() << "QHttpNetworkConnectionPrivate::fillPipeline processing highPriorityQueue, size=" << highPriorityQueue.size() << " alreadyPipelined=" << channels[i].alreadyPipelinedRequests.length();
+int lengthBefore;
+while (!highPriorityQueue.isEmpty()) {
+lengthBefore = channels[i].alreadyPipelinedRequests.length();
+fillPipeline(highPriorityQueue, channels[i]);
 if (channels[i].alreadyPipelinedRequests.length() >= defaultPipelineLength)
 return;
-// must be in ReadingState or WaitingState
+if (lengthBefore == channels[i].alreadyPipelinedRequests.length())
-if (! (channels[i].state == QHttpNetworkConnectionChannel::WaitingState
+break; // did not process anything, now do the low prio queue
-|| channels[i].state == QHttpNetworkConnectionChannel::ReadingState))
+}
+//qDebug() << "QHttpNetworkConnectionPrivate::fillPipeline processing lowPriorityQueue, size=" << lowPriorityQueue.size() << " alreadyPipelined=" << channels[i].alreadyPipelinedRequests.length();
+while (!lowPriorityQueue.isEmpty()) {
+lengthBefore = channels[i].alreadyPipelinedRequests.length();
+fillPipeline(lowPriorityQueue, channels[i]);
+if (channels[i].alreadyPipelinedRequests.length() >= defaultPipelineLength)
 return;
-highPriorityQueueProcessingDone = fillPipeline(highPriorityQueue, channels[i]);
+if (lengthBefore == channels[i].alreadyPipelinedRequests.length())
-// not finished with highPriorityQueue? then loop again
+break; // did not process anything
-if (!highPriorityQueueProcessingDone)
+}
-continue;
-// highPriorityQueue was processed, now deal with the lowPriorityQueue
-lowPriorityQueueProcessingDone = fillPipeline(lowPriorityQueue, channels[i]);
-}
 }
 // returns true when the processing of a queue has been done
 bool QHttpNetworkConnectionPrivate::fillPipeline(QList<HttpMessagePair> &queue, QHttpNetworkConnectionChannel &channel)
 {
 channels[i].state = QHttpNetworkConnectionChannel::IdleState;
 // if this is not possible, error will be emitted and connection terminated
 if (!channels[i].resetUploadData())
 continue;
 channels[i].sendRequest();
 }
 }
 // dequeue new ones
 // on the connected sockets
 //tryToFillPipeline(socket);
 // return fast if there is nothing to pipeline
 if (highPriorityQueue.isEmpty() && lowPriorityQueue.isEmpty())
 return;
-for (int j = 0; j < channelCount; j++)
+for (int i = 0; i < channelCount; i++)
-fillPipeline(channels[j].socket);
+if (channels[i].socket->state() == QAbstractSocket::ConnectedState)
+fillPipeline(channels[i].socket);
 }
 void QHttpNetworkConnectionPrivate::_q_restartAuthPendingRequests()
 {
 // send the request using the idle socket

changeset 22	79de32ba3296
parent 19	fcece45ef507
child 23	89e065397ea6