Changeset 13600

Timestamp:

01/26/08 11:23:05 (4 months ago)

Author:

rouault

Message:

Fix #2158 (gdal becomes painfully slow when used in directories with large number of files)

Files:

• trunk/gdal/port/cpl_string.cpp (modified) (1 diff)
• trunk/gdal/port/cpl_vsil_unix_stdio_64.cpp (modified) (1 diff)

trunk/gdal/port/cpl_string.cpp

@@ -67 +67 @@
- * StringList.
- * If the input StringList is NULL, then a new StringList is created.
+ * Note that CSLAddString performance when building a list is in O(n^2)
+ * which can cause noticable slow down when n > 10000.
- **********************************************************************/
-char **CSLAddString(char **papszStrList, const char *pszNewString)

trunk/gdal/port/cpl_vsil_unix_stdio_64.cpp

@@ -356 +356 @@
-    if ( (hDir = opendir(pszPath)) != NULL )
-    {
+        /* In case of really big number of files in the directory, CSLAddString */
+        /* can be slow (see #2158). We then directly build the list. */
+        int nItems=0;
+        int nAllocatedItems=0;
-        while( (psDirEntry = readdir(hDir)) != NULL )
-        {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-