Snapshot linux state

Author: ccp-redbeard

Lib/multiprocessing/spawn.py

@@ -92,7 +92,20 @@ def get_command_line(**kwds):
         prog %= ', '.join('%s=%r' % item for item in kwds.items())
         opts = util._args_from_interpreter_flags()
         exe = get_executable()
-        return [exe] + opts + ['-c', prog, '--multiprocessing-fork']
+        # CCP addition, to get multiprocessing to work for exefile interpreter.
+        # We determine this by checking if `blue` can be imported (it is not built for a non-CCP python interpreter)
+        # Exefile interpreter needs the /py argument in order to run regular python scripts
+        # Additionally we need our environment setup correctly with the @args which we inherit from the parent proc
+        try:
+            import blue
+        except ImportError:
+            return [exe] + opts + ['-c', prog, '--multiprocessing-fork']
+        else:
+            blueargs = blue.os.GetStartupArgs()
+            if not blue.os.HasStartupArg('py'):
+                raise ImportError('Can only import multiprocessing when running in python interpreter mode')
+            blueargs = blueargs[:blueargs.index('/py') + 1]
+            return blueargs + opts + ['-c', prog, '--multiprocessing-fork']
 
 
 def spawn_main(pipe_handle, parent_pid=None, tracker_fd=None):

Lib/sysconfig.py

@@ -533,7 +533,20 @@ def _init_posix(vars):
     """Initialize the module as appropriate for POSIX systems."""
     # _sysconfigdata is generated at build time, see _generate_posix_vars()
     name = _get_sysconfigdata_name()
-    _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0)
+    try:
+        _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0)
+    except ImportError:
+        # CCP Python Customization
+        #
+        # The sysconfig module provides information about the Python build configuration.
+        # This gets done by importing a Python file that gets generated at buildtime.
+        # This generated Python file contains one variable called build_time_vars, which is a dict,
+        # and provides a bunch of build specific information which we don't really need,
+        # and might change frequently between builds, so we don't want to publish it to Perforce.
+        # However, we have some nonessential code that calls `sysconfig.get_config_vars()` and expects a result.
+        # Since without the generated Python file this call results in an `ImportError`,
+        # we make the function that loads these variables into a no-op.
+        return
     build_time_vars = _temp.build_time_vars
     vars.update(build_time_vars)
 

Lib/test/test_asyncio/test_sock_lowlevel.py

@@ -2,6 +2,7 @@
 import asyncio
 import sys
 import unittest
+import os
 
 from asyncio import proactor_events
 from itertools import cycle, islice
@@ -556,6 +557,12 @@ def create_event_loop(self):
             return asyncio.SelectorEventLoop()
 
 
+    @unittest.skipIf(
+        os.getenv("TEAMCITY_VERSION"),
+        "Tests assume WSARecvFrom will always report ERROR_PORT_UNREACHABLE when the socket "
+        "used for the receive was previously used to send to an address that is not listening. "
+        "This is not the case on our build agents, so the first receive after sending to an address "
+        "that wasn't listening would hang forever.")
     class ProactorEventLoopTests(BaseSockTestsMixin,
                                  test_utils.TestCase):
 

Makefile.pre.in

@@ -826,7 +826,7 @@ libpython3.so:	libpython$(LDVERSION).so
 	$(BLDSHARED) $(NO_AS_NEEDED) -o $@ -Wl,-h$@ $^
 
 libpython$(LDVERSION).dylib: $(LIBRARY_OBJS)
-	 $(CC) -dynamiclib -Wl,-single_module $(PY_CORE_LDFLAGS) -undefined dynamic_lookup -Wl,-install_name,$(prefix)/lib/libpython$(LDVERSION).dylib -Wl,-compatibility_version,$(VERSION) -Wl,-current_version,$(VERSION) -o $@ $(LIBRARY_OBJS) $(DTRACE_OBJS) $(SHLIBS) $(LIBC) $(LIBM); \
+	 $(CC) -dynamiclib -Wl,-single_module $(PY_CORE_LDFLAGS) -undefined dynamic_lookup -Wl,-install_name,@executable_path/libpython$(LDVERSION).dylib -Wl,-compatibility_version,$(VERSION) -Wl,-current_version,$(VERSION) -o $@ $(LIBRARY_OBJS) $(DTRACE_OBJS) $(SHLIBS) $(LIBC) $(LIBM); \
 
 
 libpython$(VERSION).sl: $(LIBRARY_OBJS)

PCbuild/build.bat

@@ -173,6 +173,7 @@ echo on
  /p:IncludeCTypes=%IncludeCTypes%^
  /p:IncludeSSL=%IncludeSSL% /p:IncludeTkinter=%IncludeTkinter%^
  /p:UseTestMarker=%UseTestMarker% %GITProperty%^
+ /p:PlatformToolset=v141 /p:WindowsTargetPlatformVersion=10.0.17763.0^
  %1 %2 %3 %4 %5 %6 %7 %8 %9
 
 @echo off