19049d52fc
Previously, if you passed a -j option to a redo process in a redo or make process hierarchy with MAKEFLAGS already set, it would ignore the -j option and continue using the jobserver provided by the parent. With this change, we instead initialize a new jobserver with the desired number of tokens, which is what GNU make does in the same situation. A typical use case for this is to force serialization of build steps in a subtree (by using -j1). In make, this is often useful for "fixing" makefiles that haven't been written correctly for parallel builds. In redo, that happens much less often, but it's useful at least in unit tests. Passing -j1 is relatively harmless (the redo you are starting inherits a token anyway, so it doesn't create any new tokens). Passing -j > 1 is more risky, because it creates new tokens, thus increasing the level of parallelism in the system. Because this may not be what you wanted, we print a warning when you pass -j > 1 to a sub-redo. GNU make gives a similar warning in this situation.
128 lines
4.5 KiB
Python
128 lines
4.5 KiB
Python
"""redo: build the listed targets whether they need it or not."""
|
|
#
|
|
# Copyright 2010-2018 Avery Pennarun and contributors
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
#
|
|
import sys, os, traceback
|
|
from . import builder, env, jobserver, logs, options, state
|
|
from .atoi import atoi
|
|
from .logs import warn, err
|
|
|
|
optspec = """
|
|
redo [targets...]
|
|
--
|
|
j,jobs= maximum number of jobs to build at once
|
|
d,debug print dependency checks as they happen
|
|
v,verbose print commands as they are read from .do files (variables intact)
|
|
x,xtrace print commands as they are executed (variables expanded)
|
|
k,keep-going keep going as long as possible even if some targets fail
|
|
shuffle randomize the build order to find dependency bugs
|
|
version print the current version and exit
|
|
|
|
redo-log options:
|
|
no-log don't capture error output, just let it flow straight to stderr
|
|
no-details only show 'redo' recursion trace (to see more later, use redo-log)
|
|
no-status don't display build summary line at the bottom of the screen
|
|
no-pretty don't pretty-print logs, show raw @@REDO output instead
|
|
no-color disable ANSI color; --color to force enable (default: auto)
|
|
debug-locks print messages about file locking (useful for debugging)
|
|
debug-pids print process ids as part of log messages (useful for debugging)
|
|
"""
|
|
|
|
def main():
|
|
o = options.Options(optspec)
|
|
(opt, flags, extra) = o.parse(sys.argv[1:])
|
|
|
|
targets = extra
|
|
|
|
if opt.version:
|
|
from . import version
|
|
print version.TAG
|
|
sys.exit(0)
|
|
if opt.debug:
|
|
os.environ['REDO_DEBUG'] = str(opt.debug or 0)
|
|
if opt.verbose:
|
|
os.environ['REDO_VERBOSE'] = '1'
|
|
if opt.xtrace:
|
|
os.environ['REDO_XTRACE'] = '1'
|
|
if opt.keep_going:
|
|
os.environ['REDO_KEEP_GOING'] = '1'
|
|
if opt.shuffle:
|
|
os.environ['REDO_SHUFFLE'] = '1'
|
|
if opt.debug_locks:
|
|
os.environ['REDO_DEBUG_LOCKS'] = '1'
|
|
if opt.debug_pids:
|
|
os.environ['REDO_DEBUG_PIDS'] = '1'
|
|
|
|
# This is slightly tricky: the log and pretty options default to true. We
|
|
# want to inherit that 'true' value from parent processes *unless* someone
|
|
# explicitly specifies the reverse.
|
|
if opt.no_log:
|
|
os.environ['REDO_LOG'] = '0'
|
|
if opt.no_pretty:
|
|
os.environ['REDO_PRETTY'] = '0'
|
|
if opt.no_color:
|
|
os.environ['REDO_COLOR'] = '0'
|
|
|
|
try:
|
|
state.init(targets)
|
|
if env.is_toplevel and not targets:
|
|
targets = ['all']
|
|
j = atoi(opt.jobs)
|
|
if env.is_toplevel and (env.v.LOG or j > 1):
|
|
builder.close_stdin()
|
|
if env.is_toplevel and env.v.LOG:
|
|
builder.start_stdin_log_reader(
|
|
status=opt.status, details=opt.details,
|
|
pretty=opt.pretty, color=opt.color,
|
|
debug_locks=opt.debug_locks, debug_pids=opt.debug_pids)
|
|
else:
|
|
logs.setup(tty=sys.stderr, pretty=env.v.PRETTY, color=env.v.COLOR)
|
|
|
|
for t in targets:
|
|
if os.path.exists(t):
|
|
f = state.File(name=t)
|
|
if not f.is_generated:
|
|
warn(('%s: exists and not marked as generated; ' +
|
|
'not redoing.\n') % f.nicename())
|
|
state.rollback()
|
|
|
|
if j < 0 or j > 1000:
|
|
err('invalid --jobs value: %r\n' % opt.jobs)
|
|
jobserver.setup(j)
|
|
try:
|
|
assert state.is_flushed()
|
|
retcode = builder.run(targets, lambda t: (True, True))
|
|
assert state.is_flushed()
|
|
finally:
|
|
try:
|
|
state.rollback()
|
|
finally:
|
|
try:
|
|
jobserver.force_return_tokens()
|
|
except Exception, e: # pylint: disable=broad-except
|
|
traceback.print_exc(100, sys.stderr)
|
|
err('unexpected error: %r\n' % e)
|
|
retcode = 1
|
|
if env.is_toplevel:
|
|
builder.await_log_reader()
|
|
sys.exit(retcode)
|
|
except KeyboardInterrupt:
|
|
if env.is_toplevel:
|
|
builder.await_log_reader()
|
|
sys.exit(200)
|
|
|
|
|
|
if __name__ == '__main__':
|
|
main()
|