Changeset 2702 for trunk/src/kmk/dir.c

Timestamp:

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

Author:

bird

Message:

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

File:

• trunk/src/kmk/dir.c (modified) (12 diffs)

trunk/src/kmk/dir.c

@@ -121 +121 @@
 
 #ifdef WINDOWS32
+#include <Windows.h>
 #include "pathstuff.h"
 #endif
@@ -244 +245 @@
 # define FS_NTFS     0x2
 # define FS_UNKNOWN  0x4
+# ifdef KMK
+    time_t last_updated; /**< The last time the directory was re-read. */
+# endif
 #else
 # ifdef VMS
@@ -611 +615 @@
               dc->ctime = st.st_ctime;
               dc->mtime = st.st_mtime;
+# ifdef KMK
+              dc->last_updated = time(NULL);
+# endif
 
               /*
@@ -691 +698 @@
   struct dirent *d;
 #ifdef WINDOWS32
+# ifndef KMK
   struct stat st;
+# endif
   int rehash = 0;
 #endif
@@ -745 +754 @@
   if (dir->dirstream == 0)
     {
-#ifdef WINDOWS32
+#if defined(WINDOWS32) && !defined(KMK)
       /*
        * Check to see if directory has changed since last read. FAT
@@ -751 +760 @@
        * on directories (ugh!).
        */
+# ifdef KMK
+      if (dir->path_key && time(NULL) > dc->last_updated + 2) /* KMK: Only recheck every 2 seconds. */
+# else
       if (dir->path_key)
+# endif
         {
           if ((dir->fs_flags & FS_FAT) != 0)
@@ -758 +771 @@
               rehash = 1;
             }
+# ifdef KMK
+          else if (   birdStatModTimeOnly (dir->path_key, &st.st_mtim, 1) == 0
+                   && st.st_mtime > dir->mtime)
+# else
           else if (stat (dir->path_key, &st) == 0 && st.st_mtime > dir->mtime)
+# endif
             {
               /* reset date stamp to show most recent re-process.  */
@@ -765 +783 @@
             }
 
+
           /* If it has been already read in, all done.  */
           if (!rehash)
@@ -773 +792 @@
           if (!dir->dirstream)
             return 0;
+# ifdef KMK
+          dc->last_updated = time(NULL);
+# endif
         }
       else
@@ -1400 +1422 @@
 #endif
 
+#ifdef KMK
+static int dir_exists_p (const char *dirname)
+{
+  if (file_exists_p (dirname))
+    {
+      struct directory *dir = find_directory (dirname);
+      if (dir != NULL && dir->contents && dir->contents->dirfiles.ht_vec != NULL)
+        return 1;
+    }
+  return 0;
+}
+#endif
+
 void
 dir_setup_glob (glob_t *gl)
@@ -1409 +1444 @@
 #ifdef __EMX__ /* The FreeBSD implementation actually uses gl_lstat!! */
   gl->gl_lstat = local_stat;
+#endif
+#ifdef KMK
+  gl->gl_exists = file_exists_p;
+  gl->gl_isdir = dir_exists_p;
 #endif
   /* We don't bother setting gl_lstat, since glob never calls it.
@@ -1436 +1475 @@
 #endif /* CONFIG_WITH_ALLOC_CACHES */
 }
+