Changeset 2959 for trunk/src/kmk/kmkbuiltin/kSubmit.c

Timestamp:

Sep 21, 2016, 10:53:32 PM (9 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.

File:

• trunk/src/kmk/kmkbuiltin/kSubmit.c (modified) (9 diffs)

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)