Changeset 794

Timestamp:

Oct 14, 2010, 6:12:21 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

Significantly improve the performance of directory iterators walking through directories with thousands of files on slow file systems with inefficient cache policies (closes #176) [based on patch by rudi].

Location:

trunk/src/corelib/io

Files:

• qfsfileengine_iterator.cpp (modified) (1 diff)
• qfsfileengine_iterator_os2.cpp (modified) (9 diffs)
• qfsfileengine_os2.cpp (modified) (2 diffs)

trunk/src/corelib/io/qfsfileengine_iterator.cpp

@@ -72 +72 @@
 }
 
+
 QFileInfo QFSFileEngineIterator::currentFileInfo() const
 {
     return QAbstractFileEngineIterator::currentFileInfo();
 }
+
 
 QT_END_NAMESPACE

trunk/src/corelib/io/qfsfileengine_iterator_os2.cpp

@@ -42 +42 @@
 ****************************************************************************/
 
+
+
+
 #include "qplatformdefs.h"
 #include "qfsfileengine_iterator_p.h"
@@ -49 +52 @@
 #include <QtCore/qvariant.h>
 
+
 #include <dirent.h>
 #include <unistd.h>
+
+
+
+
+
 
 #ifndef QT_NO_FSFILEENGINE
 
 QT_BEGIN_NAMESPACE
+
+
 
 class QFSFileEngineIteratorPlatformSpecificData
@@ -76 +87 @@
 };
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 void QFSFileEngineIterator::advance()
 {
+
+
     currentEntry = platform->dirEntry ? QFile::decodeName(QByteArray(platform->dirEntry->d_name)) : QString();
 
@@ -99 +134 @@
 #endif
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 
@@ -108 +165 @@
 void QFSFileEngineIterator::deletePlatformSpecifics()
 {
+
+
     if (platform->dir) {
         ::closedir(platform->dir);
@@ -115 +174 @@
 #endif
     }
+
+
+
+
+
+
+
+
     delete platform;
     platform = 0;
@@ -121 +188 @@
 bool QFSFileEngineIterator::hasNext() const
 {
+
     if (!platform->done && !platform->dir) {
+
+
+
         QFSFileEngineIterator *that = const_cast<QFSFileEngineIterator *>(this);
         QString path = that->path();
@@ -149 +220 @@
             }
         }
+
         if (arc == ERROR_NOT_READY || arc == ERROR_DISK_CHANGE ||
             arc == ERROR_SECTOR_NOT_FOUND || arc == ERROR_INVALID_DRIVE) {
-            that->platform->dir = 0;
             that->platform->done = true;
+
         } else if ((that->platform->dir = ::opendir(QFile::encodeName(path).data())) == 0) {
             that->platform->done = true;
@@ -163 +235 @@
             that->platform->mt_file = (dirent *)new char[maxPathName];
 #endif
-
             that->advance();
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         }
     }
+
     return !platform->done;
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 QT_END_NAMESPACE
 

trunk/src/corelib/io/qfsfileengine_os2.cpp

@@ -42 +42 @@
 ****************************************************************************/
 
+
+
+
 #include "qplatformdefs.h"
 #include "qabstractfileengine.h"
@@ -661 +664 @@
             is_link = false;        // drive/share names are never symlinks
         } else {
+
+
+
             QT_STATBUF st;          // don't clobber our main one
             that->is_link = (QT_LSTAT(nativeFilePath.constData(), &st) == 0) ?
                             S_ISLNK(st.st_mode) : false;
+
         }
     }