Changeset 2959 in kBuild

Timestamp:

Sep 21, 2016 8:53:32 PM (8 years ago)

Author:

bird

Message:

kSubmit/kWorker: Added --no-pch-caching parameter to work around trouble with precompiled header file creation. Enabled pch caching in the 64-bit version of kWorker, not virtual memory problems there.

Location:

trunk/src

Files:

• kWorker/kWorker.c (modified) (19 diffs)
• kmk/kmkbuiltin/kSubmit.c (modified) (9 diffs)

trunk/src/kWorker/kWorker.c

@@ -96 +96 @@
  * Keep history of the last jobs.  For debugging.  */
 #define WITH_HISTORY
+
+/** @def WITH_PCH_CACHING
+ * Enables read caching of precompiled header files. */
+#if K_ARCH_BITS >= 64
+# define WITH_PCH_CACHING
+#endif
 
 
@@ -684 +690 @@
     /** Set if we're running. */
     KBOOL       fRunning;
+    /** Whether to disable caching of ".pch" files. */
+    KBOOL       fNoPchCaching;
 
     /** The command line.   */
@@ -4965 +4973 @@
         }
     }
-#if 0 /* compiler does write+copy mapping, so forget it. */
+#ifdef WITH_PCH_CACHING
     /* Precompiled header: .pch */
     else if (wcFirst == 'p' || wcFirst == 'P')
@@ -4972 +4980 @@
         {
             if (wcThird == 'h' || wcThird == 'H')
-                return K_TRUE;
+                return !g_Sandbox.fNoPchCaching;
         }
     }
@@ -5107 +5115 @@
         {
             if (   cbFile.QuadPart >= 0
+#ifdef WITH_PCH_CACHING
                 && (   cbFile.QuadPart < 16*1024*1024
-                    || (   cbFile.QuadPart < 64*1024*1024
+                    || (   cbFile.QuadPart < 96*1024*1024
                         && pFsObj->cchName > 4
-                        && kHlpStrICompAscii(&pFsObj->pszName[pFsObj->cchName - 4], ".pch") == 0) ))
+                        && !g_Sandbox.fNoPchCaching
+                        && kHlpStrICompAscii(&pFsObj->pszName[pFsObj->cchName - 4], ".pch") == 0) )
+#endif
+               )
             {
                 KU32 cbCache = (KU32)cbFile.QuadPart;
@@ -5715 +5727 @@
     }
 
-    KWFS_LOG(("ReadFile(%p)\n", hFile));
+    KWFS_LOG(("ReadFile(%p,%p,%#x,,)\n", hFile, pvBuffer, cbToRead));
     return ReadFile(hFile, pvBuffer, cbToRead, pcbActuallyRead, pOverlapped);
 }
@@ -6300 +6312 @@
                         else
                             hMapping = NULL;
-                        KWFS_LOG(("CreateFileMappingW(%p, %u) -> %p [temp]\n", hFile, fProtect, hMapping));
+                        KWFS_LOG(("CreateFileMappingW(%p, %u) -> %p [cached]\n", hFile, fProtect, hMapping));
                         return hMapping;
                     }
-                    kHlpAssertMsgFailed(("fProtect=%#x cb=%#x'%08x name=%p\n",
-                                         fProtect, dwMaximumSizeHigh, dwMaximumSizeLow, pwszName));
-                    SetLastError(ERROR_ACCESS_DENIED);
-                    return INVALID_HANDLE_VALUE;
-
-
+
+                    /* Do fallback (for .pch). */
+                    kHlpAssertMsg(fProtect == PAGE_WRITECOPY,
+                                  ("fProtect=%#x cb=%#x'%08x name=%p\n",
+                                   fProtect, dwMaximumSizeHigh, dwMaximumSizeLow, pwszName));
+
+                    hMapping = CreateFileMappingW(hFile, pSecAttrs, fProtect, dwMaximumSizeHigh, dwMaximumSizeLow, pwszName);
+                    KWFS_LOG(("CreateFileMappingW(%p, %p, %#x, %#x, %#x, %p) -> %p [cached-fallback]\n",
+                              hFile, pSecAttrs, fProtect, dwMaximumSizeHigh, dwMaximumSizeLow, pwszName, hMapping));
+                    return hMapping;
                 }
 
@@ -8760 +8776 @@
 static int kwSandboxInit(PKWSANDBOX pSandbox, PKWTOOL pTool,
                          KU32 cArgs, const char **papszArgs, KBOOL fWatcomBrainDamange,
-                         KU32 cEnvVars, const char **papszEnvVars)
+                         KU32 cEnvVars, const char **papszEnvVars, KBOOL fNoPchCaching)
 {
     PPEB pPeb = kwSandboxGetProcessEnvironmentBlock();
@@ -8788 +8804 @@
     pSandbox->Combined.cFlushes = 0;
 #endif
+    pSandbox->fNoPchCaching = fNoPchCaching;
     pSandbox->cArgs         = cArgs;
     pSandbox->papszArgs     = (char **)papszArgs;
@@ -9200 +9217 @@
 
 static int kwSandboxExec(PKWSANDBOX pSandbox, PKWTOOL pTool, KU32 cArgs, const char **papszArgs, KBOOL fWatcomBrainDamange,
-                         KU32 cEnvVars, const char **papszEnvVars)
+                         KU32 cEnvVars, const char **papszEnvVars, KBOOL fNoPchCaching)
 {
     int rcExit = 42;
@@ -9208 +9225 @@
      * Initialize the sandbox environment.
      */
-    rc = kwSandboxInit(&g_Sandbox, pTool, cArgs, papszArgs, fWatcomBrainDamange, cEnvVars, papszEnvVars);
+    rc = kwSandboxInit(&g_Sandbox, pTool, cArgs, papszArgs, fWatcomBrainDamange, cEnvVars, papszEnvVars, fNoPchCaching);
     if (rc == 0)
     {
@@ -9342 +9359 @@
  * @param   cEnvVars            The number of environment variables.
  * @param   papszEnvVars        The environment vector.
+ * @param   fNoPchCaching       Whether to disable precompiled header file
+ *                              caching.  Avoid trouble when creating them.
  * @param   cPostCmdArgs        Number of post command arguments (includes cmd).
  * @param   papszPostCmdArgs    The post command and its argument.
@@ -9347 +9366 @@
 static int kSubmitHandleJobUnpacked(const char *pszExecutable, const char *pszCwd,
                                     KU32 cArgs, const char **papszArgs, KBOOL fWatcomBrainDamange,
-                                    KU32 cEnvVars, const char **papszEnvVars,
+                                    KU32 cEnvVars, const char **papszEnvVars, KBOOL fNoPchCaching,
                                     KU32 cPostCmdArgs, const char **papszPostCmdArgs)
 {
@@ -9403 +9422 @@
                 {
                     KW_LOG(("Sandboxing tool %s\n", pTool->pszPath));
-                    rcExit = kwSandboxExec(&g_Sandbox, pTool, cArgs, papszArgs, fWatcomBrainDamange, cEnvVars, papszEnvVars);
+                    rcExit = kwSandboxExec(&g_Sandbox, pTool, cArgs, papszArgs, fWatcomBrainDamange,
+                                           cEnvVars, papszEnvVars, fNoPchCaching);
                 }
                 else
@@ -9537 +9557 @@
                                 papszEnvVars[cEnvVars] = 0;
 
-                                /* Flags (currently just watcom argument brain damanage). */
-                                if (cbMsg >= sizeof(KU8))
+                                /* Flags (currently just watcom argument brain damage and no precompiled header caching). */
+                                if (cbMsg >= sizeof(KU8) * 2)
                                 {
                                     KBOOL fWatcomBrainDamange = *pszMsg++;
-                                    cbMsg--;
+                                    KBOOL fNoPchCaching = *pszMsg++;
+                                    cbMsg -= 2;
 
                                     /* Post command argument count (can be zero). */
@@ -9577 +9598 @@
                                                 rcExit = kSubmitHandleJobUnpacked(pszExecutable, pszCwd,
                                                                                   cArgs, papszArgs, fWatcomBrainDamange,
-                                                                                  cEnvVars, papszEnvVars,
+                                                                                  cEnvVars, papszEnvVars, fNoPchCaching,
                                                                                   cPostCmdArgs, apszPostCmdArgs);
                                             }
@@ -9718 +9739 @@
     KU32        cEnvVars;
     KBOOL       fWatcomBrainDamange = K_FALSE;
+    KBOOL       fNoPchCaching = K_FALSE;
 
     /*
@@ -9753 +9775 @@
         }
 
+        /* Optional watcom flag directory change. */
+        if (   i < argc
+            && strcmp(argv[i], "--no-pch-caching") == 0)
+        {
+            fNoPchCaching = K_TRUE;
+            i++;
+        }
+
         /* Trigger breakpoint */
         if (   i < argc
@@ -9787 +9817 @@
         rcExit = kSubmitHandleJobUnpacked(argv[i], pszCwd,
                                           argc - i, &argv[i], fWatcomBrainDamange,
-                                          cEnvVars, environ,
+                                          cEnvVars, environ, fNoPchCaching,
                                           0, NULL);
         KW_LOG(("rcExit=%d\n", rcExit));

trunk/src/kmk/kmkbuiltin/kSubmit.c

@@ -574 +574 @@
  * @param   pszCwd              The current directory.
  * @param   fWatcomBrainDamage  The wcc/wcc386 workaround.
+ * @param   fNoPchCaching       Whether to disable precompiled header caching.
  * @param   papszPostCmdArgs    The post command and it's arguments.
  * @param   cPostCmdArgs        Number of post command argument, including the
@@ -580 +581 @@
  */
 static void *kSubmitComposeJobMessage(const char *pszExecutable, char **papszArgs, char **papszEnvVars,
-                                      const char *pszCwd, int fWatcomBrainDamage,
+                                      const char *pszCwd, int fWatcomBrainDamage, int fNoPchCaching,
                                       char **papszPostCmdArgs, uint32_t cPostCmdArgs, uint32_t *pcbMsg)
 {
@@ -615 +616 @@
     cEnvVars = i;
 
-    cbMsg += 1;
+    cbMsg += 1; /* fWatcomBrainDamage */
+    cbMsg += 1; /* fNoPchCaching */
 
     cbMsg += sizeof(cPostCmdArgs);
@@ -667 +669 @@
     /* flags */
     *pbCursor++ = fWatcomBrainDamage != 0;
+    *pbCursor++ = fNoPchCaching != 0;
 
     /* post command */
@@ -1166 +1169 @@
     fprintf(pOut,
             "usage: %s [-Z|--zap-env] [-E|--set <var=val>] [-U|--unset <var=val>]\n"
-            "           [-C|--chdir <dir>] [--wcc-brain-damage]\n"
+            "           [-C|--chdir <dir>] [--wcc-brain-damage] [--no-pch-caching]\n"
             "           [-3|--32-bit] [-6|--64-bit] [-v]\n"
             "           [-P|--post-cmd <cmd> [args]] -- <program> [args]\n"
@@ -1189 +1192 @@
             "    Works around wcc and wcc386 (Open Watcom) not following normal\n"
             "    quoting conventions on Windows, OS/2, and DOS.\n"
+            "  --no-pch-caching\n"
+            "    Do not cache precompiled header files because they're being created.\n"
             "  -v,--verbose\n"
             "    More verbose execution.\n"
@@ -1219 +1224 @@
     unsigned        cBitsWorker         = g_cArchBits;
     int             fWatcomBrainDamage  = 0;
+    int             fNoPchCaching       = 0;
     int             cVerbosity          = 0;
     size_t const    cbCwdBuf            = GET_PATH_MAX;
@@ -1274 +1280 @@
                 {
                     fWatcomBrainDamage = 1;
+                    continue;
+                }
+
+                if (strcmp(pszArg, "no-pch-caching") == 0)
+                {
+                    fNoPchCaching = 1;
                     continue;
                 }
@@ -1413 +1425 @@
         uint32_t        cbMsg;
         void           *pvMsg   = kSubmitComposeJobMessage(pszExecutable, &argv[iArg], papszEnv, szCwd,
-                                                           fWatcomBrainDamage, &argv[iPostCmd], cPostCmdArgs, &cbMsg);
+                                                           fWatcomBrainDamage, fNoPchCaching,
+                                                           &argv[iPostCmd], cPostCmdArgs, &cbMsg);
         PWORKERINSTANCE pWorker = kSubmitSelectWorkSpawnNewIfNecessary(cBitsWorker, cVerbosity);
         if (pWorker)