From 97bdb1f4e23bac6d3b3d02f855c5a25882212afb Mon Sep 17 00:00:00 2001 From: Steven Knight Date: Thu, 2 Jun 2005 21:54:58 +0000 Subject: Don't print duplicate stats when --profile is used. --- src/engine/SCons/Script/Main.py | 21 ++++----- test/option--profile.py | 84 --------------------------------- test/option/profile.py | 101 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 111 insertions(+), 95 deletions(-) delete mode 100644 test/option--profile.py create mode 100644 test/option/profile.py diff --git a/src/engine/SCons/Script/Main.py b/src/engine/SCons/Script/Main.py index cdf0139..d5be3eb 100644 --- a/src/engine/SCons/Script/Main.py +++ b/src/engine/SCons/Script/Main.py @@ -255,7 +255,6 @@ ignore_errors = 0 sconscript_time = 0 command_time = 0 exit_status = 0 # exit status, assume success by default -profiling = 0 repositories = [] num_jobs = 1 # this is modifed by SConscript.SetJobs() @@ -676,16 +675,8 @@ class OptParser(OptionParser): '--recon', action="store_true", dest='noexec', default=0, help="Don't build; just print commands.") - def opt_profile(option, opt, value, parser): - global profiling - if not profiling: - profiling = 1 - import profile - profile.run('SCons.Script.Main.main()', value) - sys.exit(exit_status) - self.add_option('--profile', nargs=1, action="callback", - callback=opt_profile, type="string", dest="profile", - metavar="FILE", + self.add_option('--profile', action="store", + dest="profile_file", metavar="FILE", help="Profile SCons and put results in FILE.") self.add_option('-q', '--question', action="store_true", default=0, @@ -1190,6 +1181,14 @@ def _exec_main(): if type(options.debug) == type([]) and "pdb" in options.debug: import pdb pdb.Pdb().runcall(_main, args, parser) + elif options.profile_file: + import profile + prof = profile.Profile() + try: + prof.runcall(_main, args, parser) + except SystemExit: + pass + prof.dump_stats(options.profile_file) else: _main(args, parser) diff --git a/test/option--profile.py b/test/option--profile.py deleted file mode 100644 index 412b8ce..0000000 --- a/test/option--profile.py +++ /dev/null @@ -1,84 +0,0 @@ -#!/usr/bin/env python -# -# __COPYRIGHT__ -# -# Permission is hereby granted, free of charge, to any person obtaining -# a copy of this software and associated documentation files (the -# "Software"), to deal in the Software without restriction, including -# without limitation the rights to use, copy, modify, merge, publish, -# distribute, sublicense, and/or sell copies of the Software, and to -# permit persons to whom the Software is furnished to do so, subject to -# the following conditions: -# -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY -# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE -# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# - -__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" - -import pstats -import string -import StringIO -import sys - -import TestSCons - -test = TestSCons.TestSCons() - -scons_prof = test.workpath('scons.prof') - -test.run(arguments = "--profile=%s -v " % scons_prof) -test.fail_test(string.find(test.stdout(), 'SCons by ') == -1) -test.fail_test(string.find(test.stdout(), 'Copyright') == -1 and - string.find(test.stdout(), '__COPYRIGHT__') == -1) - -stats = pstats.Stats(scons_prof) -stats.sort_stats('time') - -try: - save_stdout = sys.stdout - sys.stdout = StringIO.StringIO() - - stats.strip_dirs().print_stats() - - s = sys.stdout.getvalue() -finally: - sys.stdout = save_stdout - -test.fail_test(string.find(s, 'Main.py') == -1) -test.fail_test(string.find(s, 'print_version') == -1) -test.fail_test(string.find(s, 'SCons.Script.Main.main()') == -1) -test.fail_test(string.find(s, 'option_parser.py') == -1) - - -scons_prof = test.workpath('scons2.prof') - -test.run(arguments = "--profile %s -v " % scons_prof) -test.fail_test(string.find(test.stdout(), 'SCons by ') == -1) -test.fail_test(string.find(test.stdout(), 'Copyright') == -1 and - string.find(test.stdout(), '__COPYRIGHT__') == -1) - -stats = pstats.Stats(scons_prof) -stats.sort_stats('time') - -sys.stdout = StringIO.StringIO() - -stats.strip_dirs().print_stats() - -s = sys.stdout.getvalue() - -test.fail_test(string.find(s, 'Main.py') == -1) -test.fail_test(string.find(s, 'print_version') == -1) -test.fail_test(string.find(s, 'SCons.Script.Main.main()') == -1) -test.fail_test(string.find(s, 'option_parser.py') == -1) - - -test.pass_test() diff --git a/test/option/profile.py b/test/option/profile.py new file mode 100644 index 0000000..b6a0027 --- /dev/null +++ b/test/option/profile.py @@ -0,0 +1,101 @@ +#!/usr/bin/env python +# +# __COPYRIGHT__ +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# + +__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" + +import pstats +import string +import StringIO +import sys + +import TestSCons + +test = TestSCons.TestSCons() + +test.write('SConstruct', "\n") + +scons_prof = test.workpath('scons.prof') + +test.run(arguments = "--profile=%s -h" % scons_prof) +test.fail_test(string.find(test.stdout(), 'usage: scons [OPTION]') == -1) +test.fail_test(string.find(test.stdout(), 'usage: scons [OPTION]') == -1) + +stats = pstats.Stats(scons_prof) +stats.sort_stats('time') + +try: + save_stdout = sys.stdout + sys.stdout = StringIO.StringIO() + + stats.strip_dirs().print_stats() + + s = sys.stdout.getvalue() +finally: + sys.stdout = save_stdout + +test.fail_test(string.find(s, 'Main.py') == -1) +test.fail_test(string.find(s, 'print_help') == -1) +test.fail_test(string.find(s, '_main') == -1) +test.fail_test(string.find(s, 'option_parser.py') == -1) + + + +scons_prof = test.workpath('scons2.prof') + +test.run(arguments = "--profile %s -h" % scons_prof) +test.fail_test(string.find(test.stdout(), 'usage: scons [OPTION]') == -1) +test.fail_test(string.find(test.stdout(), 'Options:') == -1) + +stats = pstats.Stats(scons_prof) +stats.sort_stats('time') + +sys.stdout = StringIO.StringIO() + +stats.strip_dirs().print_stats() + +s = sys.stdout.getvalue() + +test.fail_test(string.find(s, 'Main.py') == -1) +test.fail_test(string.find(s, 'print_help') == -1) +test.fail_test(string.find(s, '_main') == -1) +test.fail_test(string.find(s, 'option_parser.py') == -1) + + + +scons_prof = test.workpath('scons3.prof') + +test.run(arguments = "--profile %s --debug=memory -h" % scons_prof) +print test.stdout() +test.fail_test(string.find(test.stdout(), 'usage: scons [OPTION]') == -1) +test.fail_test(string.find(test.stdout(), 'Options:') == -1) + +expect = 'Memory before reading SConscript files' +lines = string.split(test.stdout(), '\n') +memory_lines = filter(lambda l, e=expect: string.find(l, e) != -1, lines) + +test.fail_test(len(memory_lines) != 1) + + + +test.pass_test() -- cgit v0.12