1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QNAM HTTP: More comments

Browse Source
This commit is contained in:
Markus Goetz 2011-04-13 15:11:09 +02:00
parent 9aa2feec0e
commit 100b7565aa
1 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/network/access/qnetworkreplyhttpimpl.cpp
View File

@ -320,9 +320,8 @@ qint64 QNetworkReplyHttpImpl::size() const
qint64 QNetworkReplyHttpImpl::readData(char* data, qint64 maxlen) qint64 QNetworkReplyHttpImpl::readData(char* data, qint64 maxlen)
{ {
Q_D(QNetworkReplyHttpImpl); Q_D(QNetworkReplyHttpImpl);
qDebug() << "QNetworkReplyHttpImpl::readData()" << maxlen;
// FIXME cacheload device // cacheload device
if (d->cacheLoadDevice) { if (d->cacheLoadDevice) {
// FIXME bytesdownloaded, position etc? // FIXME bytesdownloaded, position etc?
@ -336,9 +335,10 @@ qint64 QNetworkReplyHttpImpl::readData(char* data, qint64 maxlen)
return ret; return ret;
} }
// FIXME 0-copy buffer // zerocopy buffer
if (d->downloadZerocopyBuffer) { if (d->downloadZerocopyBuffer) {
// bla // FIXME bytesdownloaded, position etc?
qint64 howMuch = qMin(maxlen, (d->downloadBufferCurrentSize - d->downloadBufferReadPosition)); qint64 howMuch = qMin(maxlen, (d->downloadBufferCurrentSize - d->downloadBufferReadPosition));
memcpy(data, d->downloadZerocopyBuffer + d->downloadBufferReadPosition, howMuch); memcpy(data, d->downloadZerocopyBuffer + d->downloadBufferReadPosition, howMuch);
d->downloadBufferReadPosition += howMuch; d->downloadBufferReadPosition += howMuch;
@ -346,12 +346,13 @@ qint64 QNetworkReplyHttpImpl::readData(char* data, qint64 maxlen)
} }
// FIXME normal buffer // normal buffer
if (d->downloadMultiBuffer.isEmpty()) if (d->downloadMultiBuffer.isEmpty()) {
return d->state == d->Finished ? -1 : 0; if (d->state == d->Finished || d->state == d->Aborted)
// FIXME what about "Aborted" state? return -1;
return 0;
}
//d->backendNotify(QNetworkReplyImplPrivate::NotifyDownstreamReadyWrite);
if (maxlen == 1) { if (maxlen == 1) {
// optimization for getChar() // optimization for getChar()
*data = d->downloadMultiBuffer.getChar(); *data = d->downloadMultiBuffer.getChar();
@ -364,7 +365,8 @@ qint64 QNetworkReplyHttpImpl::readData(char* data, qint64 maxlen)
void QNetworkReplyHttpImpl::setReadBufferSize(qint64 size) void QNetworkReplyHttpImpl::setReadBufferSize(qint64 size)
{ {
return; // FIXME, unsupported right now // FIXME, unsupported right now
return;
} }
bool QNetworkReplyHttpImpl::canReadLine () const bool QNetworkReplyHttpImpl::canReadLine () const
@ -377,6 +379,8 @@ bool QNetworkReplyHttpImpl::canReadLine () const
if (d->cacheLoadDevice) if (d->cacheLoadDevice)
return d->cacheLoadDevice->canReadLine() || d->downloadMultiBuffer.canReadLine(); return d->cacheLoadDevice->canReadLine() || d->downloadMultiBuffer.canReadLine();
// FIXME zerocopy buffer?
return d->downloadMultiBuffer.canReadLine(); return d->downloadMultiBuffer.canReadLine();
} }
@ -407,38 +411,25 @@ void QNetworkReplyHttpImpl::setSslConfigurationImplementation(const QSslConfigur
QSslConfiguration QNetworkReplyHttpImpl::sslConfigurationImplementation() const QSslConfiguration QNetworkReplyHttpImpl::sslConfigurationImplementation() const
{ {
Q_D(const QNetworkReplyHttpImpl); Q_D(const QNetworkReplyHttpImpl);
qDebug() << "sslConfigurationImplementation";
return d->sslConfiguration; return d->sslConfiguration;
} }
#endif #endif
QNetworkReplyHttpImplPrivate::QNetworkReplyHttpImplPrivate() QNetworkReplyHttpImplPrivate::QNetworkReplyHttpImplPrivate()
// FIXME order etc
: QNetworkReplyPrivate() : QNetworkReplyPrivate()
, manager(0) , manager(0)
, managerPrivate(0) , managerPrivate(0)
, synchronous(false) , synchronous(false)
, state(Idle) , state(Idle)
, statusCode(0) , statusCode(0)
, outgoingData(0) , outgoingData(0)
, bytesUploaded(-1) , bytesUploaded(-1)
, cacheLoadDevice(0) , cacheLoadDevice(0)
, loadingFromCache(false) , loadingFromCache(false)
, cacheSaveDevice(0) , cacheSaveDevice(0)
, cacheEnabled(false) , cacheEnabled(false)
, resumeOffset(0) , resumeOffset(0)
, preMigrationDownloaded(-1) , preMigrationDownloaded(-1)
, bytesDownloaded(0) , bytesDownloaded(0)
, lastBytesDownloaded(-1) , lastBytesDownloaded(-1)
, downloadBufferReadPosition(0) , downloadBufferReadPosition(0)