Changeset 3313 for trunk/kBuild

Timestamp:

Mar 16, 2020, 3:31:38 AM (5 years ago)

Author:

bird

Message:

kmk,kWorker: Assign processor groups to kWorker processes. Added --special-env hack for having a mspdbsrv.exe instance per processor group (using _MSPDBSRV_ENDPOINT_). This was complicated by PCH requiring to share .pdb file and therefore mspdbsrv.exe instance, requiring a mspdb100.dll re-init hack to disconnect kWorker from the previous mspdbsrv when switching. fun.

Location:

trunk/kBuild/tools

Files:

• VCC100AMD64.kmk (modified) (4 diffs)
• VCC100X86.kmk (modified) (5 diffs)

trunk/kBuild/tools/VCC100AMD64.kmk

@@ -80 +80 @@
   ifneq ($(substr $(PATH_TOOL_VCC100AMD64_BIN),-9),x86_amd64)
    TOOL_VCC100AMD64_KSUBMIT ?= kmk_builtin_kSubmit --64-bit
-   TOOL_VCC100AMD64_KSUBMIT_DD = $(TOOL_VCC100AMD64_KSUBMIT) --
+   if $(KBUILD_KMK_REVISION) > 3311
+    TOOL_VCC100AMD64_KSUBMIT_SPECIAL_ENV = -s "_MSPDBSRV_ENDPOINT_=kBuild_vcc10_amd64_@@AUTHENTICATION_ID@@_$(if-expr defined($(target)_1_VCC_COMMON_OBJ_PDB),common,@@PROCESS_GROUP@@)"
+   endif
+   TOOL_VCC100AMD64_KSUBMIT_DD = $(TOOL_VCC100AMD64_KSUBMIT) $(TOOL_VCC100AMD64_KSUBMIT_SPECIAL_ENV) --
   else
    # "fatal error C1902: Program database manager mismatch; please check your installation" when mixing with the 32-bit compiler.
@@ -162 +165 @@
  TOOL_VCC100AMD64_COMPILE_C_DONT_PURGE_OUTPUT := 1 # speed
  define TOOL_VCC100AMD64_COMPILE_C_CMDS
-        $(QUIET)$(TOOL_VCC100AMD64_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
+        $(QUIET)$(TOOL_VCC100AMD64_KSUBMIT) $(TOOL_VCC100AMD64_KSUBMIT_SPECIAL_ENV) \
+                -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
                 -- $(TOOL_VCC100AMD64_CC) -c\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
@@ -202 +206 @@
  TOOL_VCC100AMD64_COMPILE_CXX_DONT_PURGE_OUTPUT := 1 # speed
  define TOOL_VCC100AMD64_COMPILE_CXX_CMDS
-        $(QUIET)$(TOOL_VCC100AMD64_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
-                -- $(TOOL_VCC100AMD64_CXX) -c\
+        $(QUIET)$(TOOL_VCC100AMD64_KSUBMIT) $(TOOL_VCC100AMD64_KSUBMIT_SPECIAL_ENV) \
+                -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj) -- $(TOOL_VCC100AMD64_CXX) -c\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
                 $(if-expr defined($(target)_PCH_HDR)\
@@ -246 +250 @@
  define TOOL_VCC100AMD64-PCH_COMPILE_CXX_CMDS
         $(QUIET)$(RM) -f -- $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB)
-        $(QUIET)$(TOOL_VCC100AMD64_KSUBMIT) --no-pch-caching -P $(DEP_OBJ_INT) -f -s -q -e .pch -o $(dep) -t $(obj) $(obj)\
+        $(QUIET)$(TOOL_VCC100AMD64_KSUBMIT) --no-pch-caching $(TOOL_VCC100AMD64_KSUBMIT_SPECIAL_ENV) \
+                -P $(DEP_OBJ_INT) -f -s -q -e .pch -o $(dep) -t $(obj) $(obj)\
                 -- $(TOOL_VCC100AMD64_CXX) -c -Yc\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\

trunk/kBuild/tools/VCC100X86.kmk

@@ -78 +78 @@
  ifeq ($(KBUILD_HOST),win)
   TOOL_VCC100X86_KSUBMIT ?= kmk_builtin_kSubmit --32-bit
-  TOOL_VCC100X86_KSUBMIT_DD = $(TOOL_VCC100X86_KSUBMIT) --
+  if $(KBUILD_KMK_REVISION) > 3311
+   TOOL_VCC100X86_KSUBMIT_SPECIAL_ENV = -s "_MSPDBSRV_ENDPOINT_=kBuild_vcc10_x86_@@AUTHENTICATION_ID@@_$(if-expr defined($(target)_1_VCC_COMMON_OBJ_PDB),common,@@PROCESS_GROUP@@)"
+  endif
+  TOOL_VCC100X86_KSUBMIT_DD = $(TOOL_VCC100X86_KSUBMIT) $(TOOL_VCC100X86_KSUBMIT_SPECIAL_ENV) --
  endif
 endif
@@ -155 +158 @@
  TOOL_VCC100X86_COMPILE_C_DONT_PURGE_OUTPUT = 1 # speed
  define TOOL_VCC100X86_COMPILE_C_CMDS
-        $(QUIET)$(TOOL_VCC100X86_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
+        $(QUIET)$(TOOL_VCC100X86_KSUBMIT) $(TOOL_VCC100X86_KSUBMIT_SPECIAL_ENV) \
+                -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
                 -- $(TOOL_VCC100X86_CC) -c\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
@@ -195 +199 @@
  TOOL_VCC100X86_COMPILE_CXX_DONT_PURGE_OUTPUT = 1 # speed
  define TOOL_VCC100X86_COMPILE_CXX_CMDS
-        $(QUIET)$(TOOL_VCC100X86_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
+        $(QUIET)$(TOOL_VCC100X86_KSUBMIT) $(TOOL_VCC100X86_KSUBMIT_SPECIAL_ENV) \
+                -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
                 -- $(TOOL_VCC100X86_CXX) -c\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
@@ -238 +243 @@
 ifdef TOOL_VCC100X86_KSUBMIT
  define TOOL_VCC100X86-PCH_COMPILE_CXX_CMDS
-        $(QUIET)$(TOOL_VCC100X86_KSUBMIT) --no-pch-caching -P $(DEP_OBJ_INT) -f -s -q -e .pch -o $(dep) -t $(obj) $(obj)\
+        $(RM) -f -- "$($(target)_1_VCC_COMMON_OBJ_PDB)"
+        $(QUIET)$(TOOL_VCC100X86_KSUBMIT) --no-pch-caching $(TOOL_VCC100X86_KSUBMIT_SPECIAL_ENV) \
+                -P $(DEP_OBJ_INT) -f -s -q -e .pch -o $(dep) -t $(obj) $(obj)\
                 -- $(TOOL_VCC100X86_CXX) -c -Yc\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
@@ -257 +264 @@
                 $(subst /,\\,$(abspath $(source)))
         $(QUIET)$(DEP_OBJ) -f -s -q  -e .pch -o $(dep) -t $(obj) $(obj)
-
  endef
 endif # !TOOL_VCC100X86_KSUBMIT