Changeset 3337

Timestamp:

Apr 22, 2020, 7:56:36 PM (5 years ago)

Author:

bird

Message:

kWorker: Intercept GetFileAttributesExA/W for speeding up moc.exe (qt).

Location:

trunk/src

Files:

• kWorker/kWorker.c (modified) (4 diffs)
• lib/nt/nthlp.h (modified) (1 diff)

trunk/src/kWorker/kWorker.c

@@ -50 +50 @@
 
 #include "nt/ntstuff.h"
+#include "nt/nthlp.h"
 #include <psapi.h>
 
@@ -8047 +8048 @@
 
 
+/** Kernel32 - GetFileAttributesExA. */
+static BOOL WINAPI kwSandbox_Kernel32_GetFileAttributesExA(LPCSTR pszFilename, GET_FILEEX_INFO_LEVELS enmLevel,
+                                                           WIN32_FILE_ATTRIBUTE_DATA *pData)
+{
+    BOOL fRet;
+    const char *pszExt = kHlpGetExt(pszFilename);
+    if (kwFsIsCacheableExtensionA(pszExt, K_TRUE /*fAttrQuery*/))
+    {
+        KFSLOOKUPERROR enmError;
+        PKFSOBJ pFsObj;
+        kHlpAssert(GetCurrentThreadId() == g_Sandbox.idMainThread);
+
+        pFsObj = kFsCacheLookupNoMissingA(g_pFsCache, pszFilename, &enmError);
+        if (pFsObj)
+        {
+            kHlpAssert(pFsObj->fHaveStats);
+            if (enmLevel == GetFileExInfoStandard)
+            {
+                pData->dwFileAttributes              = pFsObj->Stats.st_attribs;
+                pData->nFileSizeHigh                 = (KU64)pFsObj->Stats.st_size >> 32;
+                pData->nFileSizeLow                  = (KU32)pFsObj->Stats.st_size;
+                *(KU64 *)&pData->ftCreationTime   = birdNtTimeFromTimeSpec(&pFsObj->Stats.st_birthtim);
+                *(KU64 *)&pData->ftLastAccessTime = birdNtTimeFromTimeSpec(&pFsObj->Stats.st_atim);
+                *(KU64 *)&pData->ftLastWriteTime  = birdNtTimeFromTimeSpec(&pFsObj->Stats.st_mtim);
+                kFsCacheObjRelease(g_pFsCache, pFsObj);
+            }
+            else
+            {
+                kFsCacheObjRelease(g_pFsCache, pFsObj);
+                fRet = GetFileAttributesExA(pszFilename, enmLevel, pData);
+            }
+        }
+        else
+        {
+            SetLastError(kwFsLookupErrorToWindowsError(enmError));
+            fRet = FALSE;
+        }
+
+        KWFS_LOG(("GetFileAttributesA(%s,%d,) -> %d [cached]\n", pszFilename, enmLevel, fRet));
+        return fRet;
+    }
+
+    fRet = GetFileAttributesExA(pszFilename, enmLevel, pData);
+    KWFS_LOG(("GetFileAttributesExA(%s,%d,) -> %d\n", pszFilename, enmLevel, fRet));
+    return fRet;
+}
+
+
+/** Kernel32 - GetFileAttributesExW. */
+static BOOL WINAPI kwSandbox_Kernel32_GetFileAttributesExW(LPCWSTR pwszFilename, GET_FILEEX_INFO_LEVELS enmLevel,
+                                                           WIN32_FILE_ATTRIBUTE_DATA *pData)
+{
+    BOOL fRet;
+    if (kwFsIsCacheablePathExtensionW(pwszFilename, K_TRUE /*fAttrQuery*/))
+    {
+        KFSLOOKUPERROR enmError;
+        PKFSOBJ pFsObj;
+        kHlpAssert(GetCurrentThreadId() == g_Sandbox.idMainThread);
+
+        pFsObj = kFsCacheLookupNoMissingW(g_pFsCache, pwszFilename, &enmError);
+        if (pFsObj)
+        {
+            kHlpAssert(pFsObj->fHaveStats);
+            if (enmLevel == GetFileExInfoStandard)
+            {
+                pData->dwFileAttributes              = pFsObj->Stats.st_attribs;
+                pData->nFileSizeHigh                 = (KU64)pFsObj->Stats.st_size >> 32;
+                pData->nFileSizeLow                  = (KU32)pFsObj->Stats.st_size;
+                *(KU64 *)&pData->ftCreationTime   = birdNtTimeFromTimeSpec(&pFsObj->Stats.st_birthtim);
+                *(KU64 *)&pData->ftLastAccessTime = birdNtTimeFromTimeSpec(&pFsObj->Stats.st_atim);
+                *(KU64 *)&pData->ftLastWriteTime  = birdNtTimeFromTimeSpec(&pFsObj->Stats.st_mtim);
+                kFsCacheObjRelease(g_pFsCache, pFsObj);
+            }
+            else
+            {
+                kFsCacheObjRelease(g_pFsCache, pFsObj);
+                fRet = GetFileAttributesExW(pwszFilename, enmLevel, pData);
+            }
+        }
+        else
+        {
+            SetLastError(kwFsLookupErrorToWindowsError(enmError));
+            fRet = FALSE;
+        }
+
+        KWFS_LOG(("GetFileAttributesW(%ls,%d,) -> %d [cached]\n", pwszFilename, enmLevel, fRet));
+        return fRet;
+    }
+
+    fRet = GetFileAttributesExW(pwszFilename, enmLevel, pData);
+    KWFS_LOG(("GetFileAttributesExW(%ls,%d,) -> %d\n", pwszFilename, enmLevel, fRet));
+    return fRet;
+}
+
+
 /** Kernel32 - GetShortPathNameW - c1[xx].dll of VS2010 does this to the
  * directory containing each include file.  We cache the result to speed
@@ -9890 +9986 @@
     { TUPLE("GetFileAttributesA"),          NULL,       (KUPTR)kwSandbox_Kernel32_GetFileAttributesA },
     { TUPLE("GetFileAttributesW"),          NULL,       (KUPTR)kwSandbox_Kernel32_GetFileAttributesW },
+    { TUPLE("GetFileAttributesExA"),        NULL,       (KUPTR)kwSandbox_Kernel32_GetFileAttributesExA },
+    { TUPLE("GetFileAttributesExW"),        NULL,       (KUPTR)kwSandbox_Kernel32_GetFileAttributesExW },
     { TUPLE("GetShortPathNameW"),           NULL,       (KUPTR)kwSandbox_Kernel32_GetShortPathNameW },
 #ifdef WITH_TEMP_MEMORY_FILES
@@ -10029 +10127 @@
     { TUPLE("GetFileAttributesA"),          NULL,       (KUPTR)kwSandbox_Kernel32_GetFileAttributesA },
     { TUPLE("GetFileAttributesW"),          NULL,       (KUPTR)kwSandbox_Kernel32_GetFileAttributesW },
+    { TUPLE("GetFileAttributesExA"),        NULL,       (KUPTR)kwSandbox_Kernel32_GetFileAttributesExA },
+    { TUPLE("GetFileAttributesExW"),        NULL,       (KUPTR)kwSandbox_Kernel32_GetFileAttributesExW },
     { TUPLE("GetShortPathNameW"),           NULL,       (KUPTR)kwSandbox_Kernel32_GetShortPathNameW },
 #ifdef WITH_TEMP_MEMORY_FILES

trunk/src/lib/nt/nthlp.h

@@ -90 +90 @@
 
 
+static __inline __int64 birdNtTimeFromTimeSpec(BirdTimeSpec_T const *pTimeSpec)
+{
+    __int64 iNtTime = pTimeSpec->tv_sec * 10000000;
+    iNtTime += pTimeSpec->tv_nsec / 100;
+    iNtTime += BIRD_NT_EPOCH_OFFSET_UNIX_100NS;
+    return iNtTime;
+}
+
+
 static __inline void birdNtTimeToTimeVal(__int64 iNtTime, BirdTimeVal_T *pTimeVal)
 {