From 203fd861aa1ab3d29477fa9954717ad46890801f Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Tue, 7 Apr 2015 10:29:07 -0700 Subject: Allow spack install -j to throttle make jobs. --- bin/spack | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'bin') diff --git a/bin/spack b/bin/spack index c49caf37f9..013acf4db8 100755 --- a/bin/spack +++ b/bin/spack @@ -56,18 +56,18 @@ from external import argparse # Command parsing parser = argparse.ArgumentParser( description='Spack: the Supercomputing PACKage Manager.') -parser.add_argument('-V', '--version', action='version', - version="%s" % spack.spack_version) -parser.add_argument('-v', '--verbose', action='store_true', - help="Print additional output during builds") parser.add_argument('-d', '--debug', action='store_true', help="Write out debug logs during compile") parser.add_argument('-k', '--insecure', action='store_true', - help="Do not check ssl certificates when downloading archives.") + help="Do not check ssl certificates when downloading.") parser.add_argument('-m', '--mock', action='store_true', help="Use mock packages instead of real ones.") parser.add_argument('-p', '--profile', action='store_true', help="Profile execution using cProfile.") +parser.add_argument('-v', '--verbose', action='store_true', + help="Print additional output during builds") +parser.add_argument('-V', '--version', action='version', + version="%s" % spack.spack_version) # each command module implements a parser() function, to which we pass its # subparser for setup. -- cgit v1.2.3-70-g09d2 From 095ff1cb4ab3923ac31fb269df8e390438e492b4 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Tue, 12 May 2015 14:52:41 -0700 Subject: Add debug handler to print a stacktrace on Ctrl-C in debug mode. --- bin/spack | 4 ++++ lib/spack/spack/util/debug.py | 52 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 lib/spack/spack/util/debug.py (limited to 'bin') diff --git a/bin/spack b/bin/spack index 013acf4db8..7dd3dbabbb 100755 --- a/bin/spack +++ b/bin/spack @@ -93,6 +93,10 @@ def main(): tty.set_debug(args.debug) spack.debug = args.debug + if spack.debug: + import spack.util.debug as debug + debug.register_interrupt_handler() + spack.spack_working_dir = working_dir if args.mock: from spack.packages import PackageDB diff --git a/lib/spack/spack/util/debug.py b/lib/spack/spack/util/debug.py new file mode 100644 index 0000000000..37985eccdd --- /dev/null +++ b/lib/spack/spack/util/debug.py @@ -0,0 +1,52 @@ +############################################################################## +# Copyright (c) 2013-2015, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Written by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://scalability-llnl.github.io/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License (as published by +# the Free Software Foundation) version 2.1 dated February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +"""Debug signal handler: prints a stack trace and enters interpreter. + +``register_interrupt_handler()`` enables a ctrl-C handler that prints +a stack trace and drops the user into an interpreter. + +""" +import os +import code +import traceback +import signal + +def debug_handler(sig, frame): + """Interrupt running process, and provide a python prompt for + interactive debugging.""" + d = {'_frame':frame} # Allow access to frame object. + d.update(frame.f_globals) # Unless shadowed by global + d.update(frame.f_locals) + + i = code.InteractiveConsole(d) + message = "Signal received : entering python shell.\nTraceback:\n" + message += ''.join(traceback.format_stack(frame)) + i.interact(message) + os._exit(1) # Use os._exit to avoid test harness. + + +def register_interrupt_handler(): + """Register a handler to print a stack trace and enter an interpreter on Ctrl-C""" + signal.signal(signal.SIGINT, debug_handler) -- cgit v1.2.3-70-g09d2 From 76cb3eb7d2cea7343a51c578fdcec090890f5441 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Sun, 17 May 2015 22:29:08 -0700 Subject: Add help on specs to top of spack -h --- bin/spack | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/spack b/bin/spack index 013acf4db8..2e0ee0b3cf 100755 --- a/bin/spack +++ b/bin/spack @@ -49,13 +49,27 @@ except OSError: # clean up the scope and start using spack package instead. del SPACK_FILE, SPACK_PREFIX, SPACK_LIB_PATH import llnl.util.tty as tty +from llnl.util.tty.color import * import spack from spack.error import SpackError from external import argparse # Command parsing parser = argparse.ArgumentParser( - description='Spack: the Supercomputing PACKage Manager.') + formatter_class=argparse.RawTextHelpFormatter, + description="Spack: the Supercomputing PACKage Manager." + colorize(""" + +spec expressions: + PACKAGE [CONSTRAINTS] + + CONSTRAINTS: + @c{@version} + @g{%compiler @compiler_version} + @B{+variant} + @r{-variant} or @r{~variant} + @m{=architecture} + [^DEPENDENCY [CONSTRAINTS] ...]""")) + parser.add_argument('-d', '--debug', action='store_true', help="Write out debug logs during compile") parser.add_argument('-k', '--insecure', action='store_true', -- cgit v1.2.3-70-g09d2