Changeset 545 in kBuild for trunk/src/gmake/w32/pathstuff.c

Timestamp:

Sep 20, 2006 5:56:19 AM (18 years ago)

Author:

bird

Message:

Another 30 chopped of on the libc+nt testcase. (down to 2.74 seconds now)

File:

• trunk/src/gmake/w32/pathstuff.c (modified) (5 diffs)

trunk/src/gmake/w32/pathstuff.c

@@ -90 +90 @@
 w32_fixcase(char *pszPath)
 {
+    static char     s_szLast[260];
+    unsigned        cchLast;
+
 #ifndef NDEBUG
 # define my_assert(expr) \
@@ -151 +154 @@
 
     /*
-     * Pointing to the first char after the unc or drive specifier.
+     * Try make use of the result from the previous call.
+     * This is ignorant to slashes and similar, but may help even so.
+     */
+    if (    s_szLast[0] == pszPath[0]
+        &&  (psz - pszPath == 1 || s_szLast[1] == pszPath[1])
+        &&  (psz - pszPath <= 2 || s_szLast[2] == pszPath[2])
+       )
+    {
+        char *pszLast = &s_szLast[psz - pszPath];
+        char *pszCur = psz;
+        for (;;)
+        {
+            const char ch1 = *pszCur;
+            const char ch2 = *pszLast;
+            if (    ch1 != ch2
+                &&  (ch1 != '\\' || ch2 != '/')
+                &&  (ch1 != '/'  || ch2 != '\\'))
+            {
+                if (    tolower(ch1) != tolower(ch2)
+                    &&  toupper(ch1) != toupper(ch2))
+                    break;
+                /* optimistic, component mismatch will be corrected in the next loop. */
+                *pszCur = ch2;
+            }
+            if (ch1 == '/' || ch1 == '\\')
+                psz = pszCur + 1;
+            else if (ch1 == '\0')
+            {
+                psz = pszCur;
+                break;
+            }
+            pszCur++;
+            pszLast++;
+        }
+    }
+
+    /*
+     * Pointing to the first char after the unc or drive specifier, 
+     * or in case of a cache hit, the first non-matching char (following a slash of course).
      */
     while (*psz)
@@ -178 +219 @@
         if (!hDir)
         {
+            cchLast = psz - pszPath;
+            memcpy(s_szLast, pszPath, cchLast + 1);
             pszEnd[0] = chSaved0;
             return;
@@ -186 +229 @@
             if (!FindNextFile(hDir, &FindFileData))
             {
+                cchLast = psz - pszPath;
+                memcpy(s_szLast, pszPath, cchLast + 1);
                 pszEnd[0] = chSaved0;
                 return;
@@ -195 +240 @@
         /* advance to the next component */
         if (!chSaved0)
-            return;
+        {
+            psz = pszEnd;
+            break;
+        }
         psz = pszEnd + 1;
         my_assert(*psz != '/' && *psz != '\\');
     }
+
+    /* *psz == '\0', the end. */
+    cchLast = psz - pszPath;
+    memcpy(s_szLast, pszPath, cchLast + 1);
 #undef my_assert
 }