Changeset 2702 in kBuild for trunk/src/kmk/glob

Timestamp:

Nov 21, 2013 12:11:08 AM (11 years ago)

Author:

bird

Message:

kmk/WindowsNT: Avoiding unnecessary stat() calls. Reimplemented stat(), lstat(), fstat(), opendir(), readdir(), and closedir() using native NT APIs.

Location:

trunk/src/kmk/glob

Files:

• glob.c (modified) (4 diffs)
• glob.h (modified) (1 diff)

trunk/src/kmk/glob/glob.c

@@ -807 +807 @@
       /* Return the directory if we don't check for error or if it exists.  */
       if ((flags & GLOB_NOCHECK)
+#ifdef KMK
+          || (flags & GLOB_ALTDIRFUNC
+              ? (*pglob->gl_isdir) (dirname)
+              : __stat (dirname, &st) == 0 && S_ISDIR (st.st_mode))
+#else
           || (((flags & GLOB_ALTDIRFUNC)
                ? (*pglob->gl_stat) (dirname, &st)
                : __stat (dirname, &st)) == 0
-              && S_ISDIR (st.st_mode)))
+              && S_ISDIR (st.st_mode))
+#endif
+          )
         {
           pglob->gl_pathv
@@ -954 +961 @@
 
                   /* First check whether this really is a directory.  */
+#ifdef KMK
+                  if (flags & GLOB_ALTDIRFUNC
+                      ? !pglob->gl_isdir (dir)
+                      : __stat (dir, &st) != 0 || !S_ISDIR (st.st_mode))
+#else
                   if (((flags & GLOB_ALTDIRFUNC)
                        ? (*pglob->gl_stat) (dir, &st) : __stat (dir, &st)) != 0
                       || !S_ISDIR (st.st_mode))
+#endif
                     /* No directory, ignore this entry.  */
                     continue;
@@ -1029 +1042 @@
       struct stat st;
       for (i = oldcount; i < pglob->gl_pathc; ++i)
+#ifdef KMK
+        if (flags & GLOB_ALTDIRFUNC
+            ? pglob->gl_isdir (pglob->gl_pathv[i])
+            : __stat (pglob->gl_pathv[i], &st) == 0 && S_ISDIR (st.st_mode) )
+#else
         if (((flags & GLOB_ALTDIRFUNC)
              ? (*pglob->gl_stat) (pglob->gl_pathv[i], &st)
              : __stat (pglob->gl_pathv[i], &st)) == 0
             && S_ISDIR (st.st_mode))
+#endif
           {
             size_t len = strlen (pglob->gl_pathv[i]) + 2;
@@ -1262 +1281 @@
           memcpy (&fullname[dirlen + 1], pattern, patlen + 1);
 # endif
+# ifdef KMK
+          if (flags & GLOB_ALTDIRFUNC ? pglob->gl_exists (fullname) : __stat (fullname, &st) == 0)
+# else
           if (((flags & GLOB_ALTDIRFUNC)
                ? (*pglob->gl_stat) (fullname, &st)
                : __stat (fullname, &st)) == 0)
+# endif
             /* We found this file to be existing.  Now tell the rest
                of the function to copy this name into the result.  */

trunk/src/kmk/glob/glob.h

@@ -137 +137 @@
     int (*gl_stat) __PMT ((__const char *, struct stat *));
 #endif
+#ifdef KMK
+    int (*gl_exists) __PMT ((__const char *));
+    int (*gl_isdir) __PMT ((__const char *));
+#endif
   } glob_t;