diff options
author | evgeny <devnull@localhost> | 2012-08-26 14:01:43 (GMT) |
---|---|---|
committer | evgeny <devnull@localhost> | 2012-08-26 14:01:43 (GMT) |
commit | 76845767d1945dbccc77ceb5fd4337147a7feb4c (patch) | |
tree | 7faa9370aa143d2d546e2f2172bdd0bc62316e36 /src | |
parent | e3e353343c926d288214057d29c2461fbcf4d4f8 (diff) | |
download | SCons-76845767d1945dbccc77ceb5fd4337147a7feb4c.zip SCons-76845767d1945dbccc77ceb5fd4337147a7feb4c.tar.gz SCons-76845767d1945dbccc77ceb5fd4337147a7feb4c.tar.bz2 |
Slightly modified patch from http://scons.tigris.org/issues/show_bug.cgi?id=2449, implementing thread safe os.spawnve on windows.
Diffstat (limited to 'src')
-rw-r--r-- | src/engine/SCons/Platform/win32.py | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/src/engine/SCons/Platform/win32.py b/src/engine/SCons/Platform/win32.py index 664969a..ff91bf9 100644 --- a/src/engine/SCons/Platform/win32.py +++ b/src/engine/SCons/Platform/win32.py @@ -36,6 +36,7 @@ import os import os.path import sys import tempfile +import threading from SCons.Platform.posix import exitvalmap from SCons.Platform import TempFileMunge @@ -81,7 +82,21 @@ else: builtins.file = _scons_file builtins.open = _scons_open +spawn_lock = threading.Lock() +def spawnve(mode, file, args, env): + spawn_lock.acquire() + try: + if mode == os.P_WAIT: + ret = os.spawnve(os.P_NOWAIT, file, args, env) + else: + ret = os.spawnve(mode, file, args, env) + finally: + spawn_lock.release() + if mode == os.P_WAIT: + pid, status = os.waitpid(ret, 0) + ret = status >> 8 + return ret # The upshot of all this is that, if you are using Python 1.5.2, # you had better have cmd or command.com in your PATH when you run @@ -123,7 +138,7 @@ def piped_spawn(sh, escape, cmd, args, env, stdout, stderr): # actually do the spawn try: args = [sh, '/C', escape(' '.join(args)) ] - ret = os.spawnve(os.P_WAIT, sh, args, env) + ret = spawnve(os.P_WAIT, sh, args, env) except OSError, e: # catch any error try: @@ -151,7 +166,7 @@ def piped_spawn(sh, escape, cmd, args, env, stdout, stderr): def exec_spawn(l, env): try: - result = os.spawnve(os.P_WAIT, l[0], l, env) + result = spawnve(os.P_WAIT, l[0], l, env) except OSError, e: try: result = exitvalmap[e[0]] |