p36850791
/
kinetic-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

#3883: testing solution for Python subprocess bug. Wrap Popen() calls with lock

This commit is contained in:
Ken Conley 2012-03-09 17:20:57 +00:00
parent 3eee7bfbd0
commit 0054e00cec
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/rosmake/src/rosmake/engine.py
View File

@ -54,6 +54,9 @@ from . import package_stats
from optparse import OptionParser from optparse import OptionParser
# #3883
_popen_lock = threading.Lock()
def make_command(): def make_command():
""" """
@return: name of 'make' command @return: name of 'make' command
@ -371,12 +374,18 @@ class RosMakeAll:
if self.ros_parallel_jobs > 0: if self.ros_parallel_jobs > 0:
local_env['ROS_PARALLEL_JOBS'] = "-l%d" % self.ros_parallel_jobs local_env['ROS_PARALLEL_JOBS'] = "-l%d" % self.ros_parallel_jobs
elif "ROS_PARALLEL_JOBS" not in os.environ: #if no environment setup and no args fall back to # cpus elif "ROS_PARALLEL_JOBS" not in os.environ: #if no environment setup and no args fall back to # cpus
# num_cpus check can (on OS X) trigger a Popen(), which has
#the multithreading bug we wish to avoid on Py2.7.
with _popen_lock:
local_env['ROS_PARALLEL_JOBS'] = "-l%d" % parallel_build.num_cpus() local_env['ROS_PARALLEL_JOBS'] = "-l%d" % parallel_build.num_cpus()
local_env['SVN_CMDLINE'] = "svn --non-interactive" local_env['SVN_CMDLINE'] = "svn --non-interactive"
cmd = ["bash", "-c", "cd %s && %s "%(self.rospack.get_path(package), make_command()) ] #UNIXONLY cmd = ["bash", "-c", "cd %s && %s "%(self.rospack.get_path(package), make_command()) ] #UNIXONLY
if argument: if argument:
cmd[-1] += argument cmd[-1] += argument
self.printer.print_full_verbose (cmd) self.printer.print_full_verbose (cmd)
# #3883: make sure only one Popen command occurs at a time due to
# http://bugs.python.org/issue13817
with _popen_lock:
command_line = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=local_env, preexec_fn=self._subprocess_setup) command_line = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=local_env, preexec_fn=self._subprocess_setup)
(pstd_out, pstd_err) = command_line.communicate() # pstd_err should be None due to pipe above (pstd_out, pstd_err) = command_line.communicate() # pstd_err should be None due to pipe above
return (command_line.returncode, pstd_out) return (command_line.returncode, pstd_out)