diff options
author | Alex Trotsenko <alex1973tr@gmail.com> | 2020-08-06 18:57:43 +0300 |
---|---|---|
committer | Alex Trotsenko <alex1973tr@gmail.com> | 2020-08-11 17:21:45 +0300 |
commit | 8f53d66e3e412911f4648e88e3e753043fcbfad8 (patch) | |
tree | a14e015a4517f0d99a137cbf3e1ad0106ce665ed /src/network/socket | |
parent | a99cee1c7b095a552c04c2aa832574a6f0f44720 (diff) |
Introduce QIODevice::skipData()
QIODevice::skip() called a virtual QIODevicePrivate::skip() to
implement an efficient skipping on I/O devices for the internal
subclasses. The user subclasses cannot inherit QIODevicePrivate, so
this functionality was not externally accessible.
This patch replaces QIODevicePrivate::skip() with a virtual protected
QIODevice::skipData(). While the basic implementation simply discards
the data by reading into a dummy buffer, users can reimplement this
function to improve the performance in their subclasses.
[ChangeLog][QtCore][QIODevice] Added virtual protected skipData().
Now, subclasses can implement device-specific skipping of data.
Change-Id: I9522f7f7ab9d03ac06e972a525f8ec2fa909a617
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/network/socket')
-rw-r--r-- | src/network/socket/qabstractsocket.cpp | 13 | ||||
-rw-r--r-- | src/network/socket/qabstractsocket.h | 1 | ||||
-rw-r--r-- | src/network/socket/qabstractsocket_p.h | 3 | ||||
-rw-r--r-- | src/network/socket/qlocalsocket.cpp | 5 | ||||
-rw-r--r-- | src/network/socket/qlocalsocket.h | 1 | ||||
-rw-r--r-- | src/network/socket/qlocalsocket_p.h | 2 | ||||
-rw-r--r-- | src/network/socket/qlocalsocket_tcp.cpp | 10 | ||||
-rw-r--r-- | src/network/socket/qlocalsocket_unix.cpp | 10 | ||||
-rw-r--r-- | src/network/socket/qlocalsocket_win.cpp | 5 |
9 files changed, 30 insertions, 20 deletions
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp index 0f9e22d131..1850265141 100644 --- a/src/network/socket/qabstractsocket.cpp +++ b/src/network/socket/qabstractsocket.cpp @@ -1361,20 +1361,23 @@ void QAbstractSocketPrivate::fetchConnectionParameters() emit q->connected(); } -/*! \internal +/*! \reimp */ -qint64 QAbstractSocketPrivate::skip(qint64 maxSize) +qint64 QAbstractSocket::skipData(qint64 maxSize) { + Q_D(const QAbstractSocket); + // if we're not connected, return -1 indicating EOF - if (!socketEngine || !socketEngine->isValid() || state != QAbstractSocket::ConnectedState) + if (!d->socketEngine || !d->socketEngine->isValid() + || d->state != QAbstractSocket::ConnectedState) return -1; // Caller, QIODevice::skip(), has ensured buffer is empty. So, wait // for more data in buffered mode. - if (isBuffered) + if (d->isBuffered) return 0; - return QIODevicePrivate::skip(maxSize); + return QIODevice::skipData(maxSize); } void QAbstractSocketPrivate::pauseSocketNotifiers(QAbstractSocket *socket) diff --git a/src/network/socket/qabstractsocket.h b/src/network/socket/qabstractsocket.h index 8df804144c..865f667d46 100644 --- a/src/network/socket/qabstractsocket.h +++ b/src/network/socket/qabstractsocket.h @@ -216,6 +216,7 @@ Q_SIGNALS: protected: qint64 readData(char *data, qint64 maxlen) override; qint64 readLineData(char *data, qint64 maxlen) override; + qint64 skipData(qint64 maxSize) override; qint64 writeData(const char *data, qint64 len) override; void setSocketState(SocketState state); diff --git a/src/network/socket/qabstractsocket_p.h b/src/network/socket/qabstractsocket_p.h index 5aa69d747e..83a8afe36d 100644 --- a/src/network/socket/qabstractsocket_p.h +++ b/src/network/socket/qabstractsocket_p.h @@ -71,9 +71,6 @@ public: QAbstractSocketPrivate(); virtual ~QAbstractSocketPrivate(); - // from QIODevicePrivate - qint64 skip(qint64 maxSize) override; - // from QAbstractSocketEngineReceiver inline void readNotification() override { canReadNotification(); } inline void writeNotification() override { canWriteNotification(); } diff --git a/src/network/socket/qlocalsocket.cpp b/src/network/socket/qlocalsocket.cpp index ab3fcecf66..e225413c89 100644 --- a/src/network/socket/qlocalsocket.cpp +++ b/src/network/socket/qlocalsocket.cpp @@ -152,6 +152,11 @@ QT_BEGIN_NAMESPACE */ /*! + \fn qint64 QLocalSocket::skipData(qint64 maxSize) + \reimp +*/ + +/*! \fn qint64 QLocalSocket::writeData(const char *data, qint64 c) \reimp */ diff --git a/src/network/socket/qlocalsocket.h b/src/network/socket/qlocalsocket.h index d45f8f239d..22763cb339 100644 --- a/src/network/socket/qlocalsocket.h +++ b/src/network/socket/qlocalsocket.h @@ -122,6 +122,7 @@ Q_SIGNALS: protected: virtual qint64 readData(char*, qint64) override; + qint64 skipData(qint64 maxSize) override; virtual qint64 writeData(const char*, qint64) override; private: diff --git a/src/network/socket/qlocalsocket_p.h b/src/network/socket/qlocalsocket_p.h index 0e05e4c5d7..7eff502607 100644 --- a/src/network/socket/qlocalsocket_p.h +++ b/src/network/socket/qlocalsocket_p.h @@ -120,7 +120,6 @@ public: void init(); #if defined(QT_LOCALSOCKET_TCP) - qint64 skip(qint64 maxSize) override; QLocalUnixSocket* tcpSocket; bool ownsTcpSocket; void setSocket(QLocalUnixSocket*); @@ -139,7 +138,6 @@ public: QWindowsPipeReader *pipeReader; QLocalSocket::LocalSocketError error; #else - qint64 skip(qint64 maxSize) override; QLocalUnixSocket unixSocket; QString generateErrorString(QLocalSocket::LocalSocketError, const QString &function) const; void setErrorAndEmit(QLocalSocket::LocalSocketError, const QString &function); diff --git a/src/network/socket/qlocalsocket_tcp.cpp b/src/network/socket/qlocalsocket_tcp.cpp index 1c63d16187..2f0179f40a 100644 --- a/src/network/socket/qlocalsocket_tcp.cpp +++ b/src/network/socket/qlocalsocket_tcp.cpp @@ -83,11 +83,6 @@ void QLocalSocketPrivate::setSocket(QLocalUnixSocket* socket) tcpSocket->setParent(q); } -qint64 QLocalSocketPrivate::skip(qint64 maxSize) -{ - return tcpSocket->skip(maxSize); -} - void QLocalSocketPrivate::_q_errorOccurred(QAbstractSocket::SocketError socketError) { Q_Q(QLocalSocket); @@ -306,6 +301,11 @@ qint64 QLocalSocket::readData(char *data, qint64 c) return d->tcpSocket->read(data, c); } +qint64 QLocalSocket::skipData(qint64 maxSize) +{ + return d_func()->tcpSocket->skip(maxSize); +} + qint64 QLocalSocket::writeData(const char *data, qint64 c) { Q_D(QLocalSocket); diff --git a/src/network/socket/qlocalsocket_unix.cpp b/src/network/socket/qlocalsocket_unix.cpp index 52067a265c..6fd17a6213 100644 --- a/src/network/socket/qlocalsocket_unix.cpp +++ b/src/network/socket/qlocalsocket_unix.cpp @@ -87,11 +87,6 @@ void QLocalSocketPrivate::init() unixSocket.setParent(q); } -qint64 QLocalSocketPrivate::skip(qint64 maxSize) -{ - return unixSocket.skip(maxSize); -} - void QLocalSocketPrivate::_q_errorOccurred(QAbstractSocket::SocketError socketError) { Q_Q(QLocalSocket); @@ -398,6 +393,11 @@ qint64 QLocalSocket::readData(char *data, qint64 c) return d->unixSocket.read(data, c); } +qint64 QLocalSocket::skipData(qint64 maxSize) +{ + return d_func()->unixSocket.skip(maxSize); +} + qint64 QLocalSocket::writeData(const char *data, qint64 c) { Q_D(QLocalSocket); diff --git a/src/network/socket/qlocalsocket_win.cpp b/src/network/socket/qlocalsocket_win.cpp index 48ffd87beb..b585bea625 100644 --- a/src/network/socket/qlocalsocket_win.cpp +++ b/src/network/socket/qlocalsocket_win.cpp @@ -204,6 +204,11 @@ qint64 QLocalSocket::readData(char *data, qint64 maxSize) } } +qint64 QLocalSocket::skipData(qint64 maxSize) +{ + return QIODevice::skipData(maxSize); +} + qint64 QLocalSocket::writeData(const char *data, qint64 len) { Q_D(QLocalSocket); |