From 2a8901bac75577ed7fca66120c26af06bd5733b7 Mon Sep 17 00:00:00 2001 From: Gong Heng Date: Thu, 18 Mar 2021 16:53:11 +0800 Subject: =?UTF-8?q?fix:=20Optimize=20the=20performance=20of=20the=20inotif?= =?UTF-8?q?y=20file=20system=20monitoring=20program=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When the ioctl() functions is executed correctly, the value of buffSize may be 0. In this situation, there is no need to execute the following code. This modification can solve two benefits: 1. The readFromInotify function runs frequently, and this modification can improve the efficiency of the program. 2. When the buffSize is equal to 0, "read(inotifyFd, buffer.data(), buffSize)" function will be stuck.(I have encountered this kind of problem) Change-Id: I9f85491ec91e336b4a1bec5c99b911835c5c06a5 Reviewed-by: Mårten Nordheim (cherry picked from commit bb8fc324d16278c27a211093fb47bafcc4fe7874) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/io/qfilesystemwatcher_inotify.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/corelib') diff --git a/src/corelib/io/qfilesystemwatcher_inotify.cpp b/src/corelib/io/qfilesystemwatcher_inotify.cpp index 68e5ab7fa4..27e0b13b0b 100644 --- a/src/corelib/io/qfilesystemwatcher_inotify.cpp +++ b/src/corelib/io/qfilesystemwatcher_inotify.cpp @@ -366,7 +366,7 @@ void QInotifyFileSystemWatcherEngine::readFromInotify() // qDebug("QInotifyFileSystemWatcherEngine::readFromInotify"); int buffSize = 0; - if (ioctl(inotifyFd, FIONREAD, (char *) &buffSize) == -1) + if (ioctl(inotifyFd, FIONREAD, (char *) &buffSize) == -1 || buffSize == 0) return; QVarLengthArray buffer(buffSize); -- cgit v1.2.3