x/anvil
Code Issues Proposed changes

Use the passed in opts job count (if provided).

Browse Source 
Change-Id: Ie2730e595fcc19d45451bf5b932392ba48765b78
This commit is contained in:
Joshua Harlow 2013-08-04 19:46:49 -07:00
parent b6a57fbeeb
commit 481770e4d1
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
anvil/actions/build.py
View File

@ -28,6 +28,7 @@ class BuildAction(action.Action):
def __init__(self, name, distro, root_dir, cli_opts): def __init__(self, name, distro, root_dir, cli_opts):
action.Action.__init__(self, name, distro, root_dir, cli_opts) action.Action.__init__(self, name, distro, root_dir, cli_opts)
self.usr_only = cli_opts.get('usr_only') self.usr_only = cli_opts.get('usr_only')
self.jobs = cli_opts.get('jobs')
@property @property
def lookup_name(self): def lookup_name(self):
@ -38,5 +39,6 @@ class BuildAction(action.Action):
dependency_handler = dependency_handler_class(self.distro, dependency_handler = dependency_handler_class(self.distro,
self.root_dir, self.root_dir,
instances.values(), instances.values(),
opts={"usr_only": self.usr_only}) opts={"usr_only": self.usr_only,
"jobs": self.jobs})
dependency_handler.build_binary() dependency_handler.build_binary()

4
anvil/actions/prepare.py
View File

@ -28,6 +28,7 @@ class PrepareAction(action.Action):
def __init__(self, name, distro, root_dir, cli_opts): def __init__(self, name, distro, root_dir, cli_opts):
action.Action.__init__(self, name, distro, root_dir, cli_opts) action.Action.__init__(self, name, distro, root_dir, cli_opts)
self.jobs = cli_opts.get('jobs')
@property @property
def lookup_name(self): def lookup_name(self):
@ -61,7 +62,8 @@ class PrepareAction(action.Action):
dependency_handler_class = self.distro.dependency_handler_class dependency_handler_class = self.distro.dependency_handler_class
dependency_handler = dependency_handler_class(self.distro, dependency_handler = dependency_handler_class(self.distro,
self.root_dir, self.root_dir,
instances.values()) instances.values(),
opts={"jobs": self.jobs})
dependency_handler.package_start() dependency_handler.package_start()
self._run_phase( self._run_phase(
action.PhaseFunctors( action.PhaseFunctors(

15
anvil/packaging/yum.py
View File

@ -106,6 +106,15 @@ class YumDependencyHandler(base.DependencyHandler):
self.yumfind_executable = sh.which("yumfind", ["tools/"]) self.yumfind_executable = sh.which("yumfind", ["tools/"])
# We inspect yum for packages, this helper allows us to do this. # We inspect yum for packages, this helper allows us to do this.
self.helper = yum_helper.Helper(self.log_dir) self.helper = yum_helper.Helper(self.log_dir)
# See if we are requested to run at a higher make parallelism level
self._jobs = self.JOBS
if 'jobs' in self.opts:
try:
self._jobs = int(self.opts.get('jobs', self.JOBS))
if self._jobs <= 0:
self._jobs = self.JOBS
except (TypeError, ValueError):
pass
def py2rpm_start_cmdline(self): def py2rpm_start_cmdline(self):
cmdline = [ cmdline = [
@ -206,7 +215,7 @@ class YumDependencyHandler(base.DependencyHandler):
utils.log_iterable(src_repo_files, utils.log_iterable(src_repo_files,
header=('Building %s RPM packages from their' header=('Building %s RPM packages from their'
' SRPMs for repo %s using %s jobs') % ' SRPMs for repo %s using %s jobs') %
(len(src_repo_files), self.SRC_REPOS[repo_name], self.JOBS), (len(src_repo_files), self.SRC_REPOS[repo_name], self._jobs),
logger=LOG) logger=LOG)
makefile_path = sh.joinpths(self.deps_dir, "binary-%s.mk" % repo_name) makefile_path = sh.joinpths(self.deps_dir, "binary-%s.mk" % repo_name)
marks_dir = sh.joinpths(self.deps_dir, "marks-binary") marks_dir = sh.joinpths(self.deps_dir, "marks-binary")
@ -233,7 +242,7 @@ class YumDependencyHandler(base.DependencyHandler):
self._create_repo(repo_name) self._create_repo(repo_name)
def _execute_make(self, filename, marks_dir): def _execute_make(self, filename, marks_dir):
cmdline = ["make", "-f", filename, "-j", str(self.JOBS)] cmdline = ["make", "-f", filename, "-j", str(self._jobs)]
out_filename = sh.joinpths(self.log_dir, "%s.log" % sh.basename(filename)) out_filename = sh.joinpths(self.log_dir, "%s.log" % sh.basename(filename))
sh.execute_save_output(cmdline, cwd=marks_dir, out_filename=out_filename) sh.execute_save_output(cmdline, cwd=marks_dir, out_filename=out_filename)
@ -393,7 +402,7 @@ class YumDependencyHandler(base.DependencyHandler):
sh.write_file(makefile_path, utils.expand_template(content, params), sh.write_file(makefile_path, utils.expand_template(content, params),
tracewriter=self.tracewriter) tracewriter=self.tracewriter)
utils.log_iterable(package_files, utils.log_iterable(package_files,
header="Building %s SRPM packages using %s jobs" % (len(package_files), self.JOBS), header="Building %s SRPM packages using %s jobs" % (len(package_files), self._jobs),
logger=LOG) logger=LOG)
self._execute_make(makefile_path, marks_dir) self._execute_make(makefile_path, marks_dir)