whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Micro-optimize QAbstractSocketPrivate::canReadNotification() 

Remove unnecessary checks in release build. Refactor the code.

Change-Id: Ibee96790cbc8beb000757fc8e152fb4dcae9d506
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
Alex Trotsenko 2016-08-18 20:25:12 +03:00
parent a23b71d2d0
commit 6f0814ab83
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/network/socket/qabstractsocket.cpp
View File

@ -693,14 +693,6 @@ bool QAbstractSocketPrivate::canReadNotification()
qDebug("QAbstractSocketPrivate::canReadNotification()");
#endif
if (!isBuffered) {
if (hasPendingData) {
socketEngine->setReadNotificationEnabled(false);
return true;
}
hasPendingData = true;
}
// If buffered, read data from the socket into the read buffer
if (isBuffered) {
const qint64 oldBufferSize = buffer.size();
@ -730,18 +722,21 @@ bool QAbstractSocketPrivate::canReadNotification()
// to indicate that the data was discarded.
return !q->isReadable();
}
} else {
if (hasPendingData) {
socketEngine->setReadNotificationEnabled(false);
return true;
}
hasPendingData = true;
}
emitReadyRead();
// If we were closed as a result of the readyRead() signal,
// return.
if (state == QAbstractSocket::UnconnectedState || state == QAbstractSocket::ClosingState) {
#if defined (QABSTRACTSOCKET_DEBUG)
// If we were closed as a result of the readyRead() signal.
if (state == QAbstractSocket::UnconnectedState || state == QAbstractSocket::ClosingState)
qDebug("QAbstractSocketPrivate::canReadNotification() socket is closing - returning");
#endif
return true;
}
return true;
}