Changeset 2850 in kBuild

Timestamp:

Aug 30, 2016 4:06:31 PM (9 years ago)

Author:

bird

Message:

kmk: optimizations.

Location:

trunk/src

Files:

• kmk/dir.c (modified) (3 diffs)
• kmk/incdep.c (modified) (1 diff)
• lib/nt/ntstat.c (modified) (1 diff)
• lib/nt/ntstat.h (modified) (1 diff)

trunk/src/kmk/dir.c

@@ -594 +594 @@
           if (HASH_VACANT (dc))
             {
+#if defined(WINDOWS32) && defined(KMK)
+              static char s_last_volume[4];
+              static int  s_last_flags;
+#endif
               /* Nope; this really is a directory we haven't seen before.  */
 
@@ -625 +629 @@
                */
               w32_path[3] = '\0';
+# ifdef KMK /* Need for speed: Cache the GetVolumeInformation result. */
+              if (   s_last_volume[0] == w32_path[0]
+                  && s_last_volume[1] == w32_path[1]
+                  && s_last_volume[2] == w32_path[2]
+                  && s_last_volume[3] == w32_path[3])
+                dc->fs_flags = s_last_flags;
+              else
+                {
+# endif
               if (GetVolumeInformation(w32_path,
                      fs_label, sizeof (fs_label),
@@ -636 +649 @@
               else
                 dc->fs_flags = FS_UNKNOWN;
+# ifdef KMK
+                  s_last_volume[0] = w32_path[0];
+                  s_last_volume[1] = w32_path[1];
+                  s_last_volume[2] = w32_path[2];
+                  s_last_volume[3] = w32_path[3];
+                  s_last_flags     = dc->fs_flags;
+                }
+# endif
 #else
 # ifdef VMS

trunk/src/kmk/incdep.c

@@ -502 +502 @@
       return -1;
     }
+#ifdef KBUILD_OS_WINDOWS /* fewer kernel calls */
+  if (!birdStatOnFdJustSize (fd, &st.st_size))
+#else
   if (!fstat (fd, &st))
+#endif
     {
       cur->file_base = incdep_xmalloc (cur, st.st_size + 1);

trunk/src/lib/nt/ntstat.c

@@ -534 +534 @@
 
 /**
+ * Special case that only gets the file size and nothing else.
+ */
+int birdStatOnFdJustSize(int fd, __int64 *pcbFile)
+{
+    int     rc;
+    HANDLE  hFile = (HANDLE)_get_osfhandle(fd);
+    if (hFile != INVALID_HANDLE_VALUE)
+    {
+        LARGE_INTEGER cbLocal;
+        if (GetFileSizeEx(hFile, &cbLocal))
+        {
+            *pcbFile = cbLocal.QuadPart;
+            rc = 0;
+        }
+        else
+        {
+            BirdStat_T Stat;
+            rc = birdStatOnFd(fd, &Stat);
+            if (rc == 0)
+                *pcbFile = Stat.st_size;
+        }
+    }
+    else
+        rc = -1;
+    return rc;
+}
+
+
+/**
  * Implements UNIX stat().
  */

trunk/src/lib/nt/ntstat.h

@@ -78 +78 @@
 int birdStatOnLink(const char *pszPath, BirdStat_T *pStat);
 int birdStatOnFd(int fd, BirdStat_T *pStat);
+int birdStatOnFdJustSize(int fd, __int64 *pcbFile);
 int birdStatModTimeOnly(const char *pszPath, BirdTimeSpec_T *pTimeSpec, int fFollowLink);
 #ifdef ___nt_ntstuff_h