From 41ffe37a5fb0120c90737aaecba315cdbc03fc39 Mon Sep 17 00:00:00 2001 From: Alex Trotsenko Date: Tue, 12 Sep 2017 19:51:45 +0300 Subject: [PATCH] QAbstractSocket: optimize skipping MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Avoid an unnecessary call to the slow base implementation on buffered TCP socket. Change-Id: Icc823b416b267aa8e0c1106b20872df9ef0e22d7 Reviewed-by: Mårten Nordheim Reviewed-by: Edward Welbourne --- src/network/socket/qabstractsocket.cpp | 15 +++++++++++++++ src/network/socket/qabstractsocket_p.h | 3 +++ 2 files changed, 18 insertions(+) diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp index 9cb6c4be57..34c750eb23 100644 --- a/src/network/socket/qabstractsocket.cpp +++ b/src/network/socket/qabstractsocket.cpp @@ -1371,6 +1371,21 @@ void QAbstractSocketPrivate::fetchConnectionParameters() #endif } +/*! \internal +*/ +qint64 QAbstractSocketPrivate::skip(qint64 maxSize) +{ + // if we're not connected, return -1 indicating EOF + if (!socketEngine || !socketEngine->isValid() || state != QAbstractSocket::ConnectedState) + return -1; + + // Caller, QIODevice::skip(), has ensured buffer is empty. So, wait + // for more data in buffered mode. + if (isBuffered) + return 0; + + return QIODevicePrivate::skip(maxSize); +} void QAbstractSocketPrivate::pauseSocketNotifiers(QAbstractSocket *socket) { diff --git a/src/network/socket/qabstractsocket_p.h b/src/network/socket/qabstractsocket_p.h index 8a96cb9d48..62b7aceae8 100644 --- a/src/network/socket/qabstractsocket_p.h +++ b/src/network/socket/qabstractsocket_p.h @@ -71,6 +71,9 @@ public: QAbstractSocketPrivate(); virtual ~QAbstractSocketPrivate(); + // from QIODevicePrivate + qint64 skip(qint64 maxSize) override; + // from QAbstractSocketEngineReceiver inline void readNotification() override { canReadNotification(); } inline void writeNotification() override { canWriteNotification(); }