Skip to content

fix: Optimize the performance of the inotify file system monitoring program。

David Faure requested to merge dfaure/qtbase:work/dfaure/bb8fc324d16278c27a211093fb47bafcc4fe7874 into kde/5.15

[David: when resolving the merge conflict, this also includes qtbase-dev commit cb4f853c which hadn't been backported]

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)

Pick-to: 5.15 6.0 6.1 Change-Id: I9f85491ec91e336b4a1bec5c99b911835c5c06a5 Reviewed-by: Mårten Nordheim marten.nordheim@qt.io (cherry picked from commit bb8fc324)

Merge request reports