Changeset 1165 for trunk/src/kmk/kmkbuiltin

Timestamp:

Sep 30, 2007, 9:36:23 AM (18 years ago)

Author:

bird

Message:

Optimized kDebIDB a bit for Windows; use nt_fullpath and map the IDB file into memory.

File:

• trunk/src/kmk/kmkbuiltin/kDepIDB.c (modified) (8 diffs)

trunk/src/kmk/kmkbuiltin/kDepIDB.c

@@ -38 +38 @@
 # include <stdint.h>
 #else
+# define USE_WIN_MMAP
+# include <io.h>
+# include <Windows.h>
  typedef unsigned char  uint8_t;
  typedef unsigned short uint16_t;
@@ -137 +140 @@
 
 
+#ifdef USE_WIN_MMAP
+/** Handle to the current file mapping object. */
+static HANDLE g_hMapObj = NULL;
+#endif
+
 
 /**
  * Reads the file specified by the pInput file stream into memory.
  * The size of the file is returned in *pcbFile if specified.
- * The returned pointer should be freed by free().
+ * The returned pointer should be freed by FreeFileMemory().
  */
 void *ReadFileIntoMemory(FILE *pInput, size_t *pcbFile)
@@ -152 +160 @@
      * Figure out file size.
      */
+#if defined(_MSC_VER)
+    cbFile = _filelength(fileno(pInput));
+    if (cbFile < 0)
+#else
     if (    fseek(pInput, 0, SEEK_END) < 0
         ||  (cbFile = ftell(pInput)) < 0
         ||  fseek(pInput, 0, SEEK_SET))
+#endif
     {
         fprintf(stderr, "%s: error: Failed to determin file size.\n", argv0);
@@ -163 +176 @@
 
     /*
+     * Try mmap first.
+     */
+#ifdef USE_WIN_MMAP
+    {
+        HANDLE hMapObj = CreateFileMapping((HANDLE)_get_osfhandle(fileno(pInput)),
+                                           NULL, PAGE_READONLY, 0, cbFile, NULL);
+        if (hMapObj != NULL)
+        {
+            pvFile = MapViewOfFile(hMapObj, FILE_MAP_READ, 0, 0, cbFile);
+            if (pvFile)
+            {
+                g_hMapObj = hMapObj;
+                return pvFile;
+            }
+            fprintf(stderr, "%s: warning: MapViewOfFile failed, %d.\n", argv0, GetLastError());
+            CloseHandle(hMapObj);
+        }
+        else
+            fprintf(stderr, "%s: warning: CreateFileMapping failed, %d.\n", argv0, GetLastError());
+    }
+
+#endif
+
+    /*
      * Allocate memory and read the file.
      */
@@ -168 +205 @@
     if (pvFile)
     {
+#if 1
+        long cbRead = (long)read(fileno(pInput), pvFile, cbFile);
+        if (cbRead == cbFile)
+#else
         if (fread(pvFile, cbFile, 1, pInput))
+#endif
         {
             ((uint8_t *)pvFile)[cbFile] = '\0';
@@ -181 +223 @@
 }
 
+
+static void FreeFileMemory(void *pvFile)
+{
+#if defined(USE_WIN_MMAP)
+    if (g_hMapObj)
+    {
+        UnmapViewOfFile(pvFile);
+        CloseHandle(g_hMapObj);
+        return;
+    }
+#endif
+    free(pvFile);
+}
 
 
@@ -726 +781 @@
     }
 
-    free(pbFile);
+    FreeFileMemory(pbFile);
     return rc;
 }
@@ -925 +980 @@
     }
 
+    depCleanup();
     return i;
 }