diff options
| author | Alex Trotsenko <alex1973tr@gmail.com> | 2020-08-11 19:30:15 +0300 |
|---|---|---|
| committer | Alex Trotsenko <alex1973tr@gmail.com> | 2020-08-20 18:24:15 +0300 |
| commit | a41c61fb2d2f973fd1cd5e95ee5be1ac1a4f8433 (patch) | |
| tree | 857130e663aa61ebbf09d7da9a1670aa81a9e69b /src/network | |
| parent | 729d102b1c5273087c54d1584c80f1a1e6eef86c (diff) | |
QIODevice: implement a "zero-copy" strategy for buffered writes
It works as follows:
- user calls write(const QByteArray &);
- this function keeps a pointer to the chunk and calls a regular
write(data, len);
- write(data, len) calls a virtual writeData();
- subclass calls a new QIODevicePrivate::write();
- QIODevicePrivate::write() makes a shallow copy of
the byte array.
Proposed solution is fully compatible with existing subclasses.
By replacing a call to d->writeBuffer.append() with d->write(),
subclasses can improve their performance.
Bump the TypeInformationVersion field in qtHookData, to notify the
Qt Creator developers that the offset of QFilePrivate::fileName was
changed and dumpers should be adapted.
Change-Id: I24713386cc74a9f37e5223c617e4b1ba97f968dc
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/socket/qabstractsocket.cpp | 2 | ||||
| -rw-r--r-- | src/network/socket/qlocalsocket_win.cpp | 2 | ||||
| -rw-r--r-- | src/network/ssl/qsslsocket.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp index cf6a7672fb..3bde2215ad 100644 --- a/src/network/socket/qabstractsocket.cpp +++ b/src/network/socket/qabstractsocket.cpp @@ -2542,7 +2542,7 @@ qint64 QAbstractSocket::writeData(const char *data, qint64 size) // We just write to our write buffer and enable the write notifier // The write notifier then flush()es the buffer. - d->writeBuffer.append(data, size); + d->write(data, size); qint64 written = size; if (d->socketEngine && !d->writeBuffer.isEmpty()) diff --git a/src/network/socket/qlocalsocket_win.cpp b/src/network/socket/qlocalsocket_win.cpp index b585bea625..e174952b96 100644 --- a/src/network/socket/qlocalsocket_win.cpp +++ b/src/network/socket/qlocalsocket_win.cpp @@ -214,7 +214,7 @@ qint64 QLocalSocket::writeData(const char *data, qint64 len) Q_D(QLocalSocket); if (len == 0) return 0; - d->writeBuffer.append(data, len); + d->write(data, len); if (!d->pipeWriter) { d->pipeWriter = new QWindowsPipeWriter(d->handle, this); connect(d->pipeWriter, &QWindowsPipeWriter::bytesWritten, diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp index ab4ce1527e..c5444b139e 100644 --- a/src/network/ssl/qsslsocket.cpp +++ b/src/network/ssl/qsslsocket.cpp @@ -1819,7 +1819,7 @@ qint64 QSslSocket::writeData(const char *data, qint64 len) if (d->mode == UnencryptedMode && !d->autoStartHandshake) return d->plainSocket->write(data, len); - d->writeBuffer.append(data, len); + d->write(data, len); // make sure we flush to the plain socket's buffer if (!d->flushTriggered) { |