mirror of
https://github.com/python/cpython.git
synced 2025-10-24 15:36:26 +00:00
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
r55413 | fred.drake | 2007-05-17 12:30:10 -0700 (Thu, 17 May 2007) | 1 line
fix argument name in documentation; match the implementation
................
r55430 | jack.diederich | 2007-05-18 06:39:59 -0700 (Fri, 18 May 2007) | 1 line
Implements class decorators, PEP 3129.
................
r55432 | guido.van.rossum | 2007-05-18 08:09:41 -0700 (Fri, 18 May 2007) | 2 lines
obsubmit.
................
r55434 | guido.van.rossum | 2007-05-18 09:39:10 -0700 (Fri, 18 May 2007) | 3 lines
Fix bug in test_inspect. (I presume this is how it should be fixed;
Jack Diedrich, please verify.)
................
r55460 | brett.cannon | 2007-05-20 00:31:57 -0700 (Sun, 20 May 2007) | 4 lines
Remove the imageop module. With imgfile already removed in Python 3.0 and
rgbimg gone in Python 2.6 the unit tests themselves were made worthless. Plus
third-party libraries perform the same function much better.
................
r55469 | neal.norwitz | 2007-05-20 11:28:20 -0700 (Sun, 20 May 2007) | 118 lines
Merged revisions 55324-55467 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55348 | georg.brandl | 2007-05-15 13:19:34 -0700 (Tue, 15 May 2007) | 4 lines
HTML-escape the plain traceback in cgitb's HTML output, to prevent
the traceback inadvertently or maliciously closing the comment and
injecting HTML into the error page.
........
r55372 | neal.norwitz | 2007-05-15 21:33:50 -0700 (Tue, 15 May 2007) | 6 lines
Port rev 55353 from Guido:
Add what looks like a necessary call to PyErr_NoMemory() when PyMem_MALLOC()
fails.
Will backport.
........
r55377 | neal.norwitz | 2007-05-15 22:06:33 -0700 (Tue, 15 May 2007) | 1 line
Mention removal of some directories for obsolete platforms
........
r55380 | brett.cannon | 2007-05-15 22:50:03 -0700 (Tue, 15 May 2007) | 2 lines
Change the maintainer of the BeOS port.
........
r55383 | georg.brandl | 2007-05-16 06:44:18 -0700 (Wed, 16 May 2007) | 2 lines
Bug #1719995: don't use deprecated method in sets example.
........
r55386 | neal.norwitz | 2007-05-16 13:05:11 -0700 (Wed, 16 May 2007) | 5 lines
Fix bug in marshal where bad data would cause a segfault due to
lack of an infinite recursion check.
Contributed by Damien Miller at Google.
........
r55389 | brett.cannon | 2007-05-16 15:42:29 -0700 (Wed, 16 May 2007) | 6 lines
Remove the gopherlib module. It has been raising a DeprecationWarning since
Python 2.5.
Also remove gopher support from urllib/urllib2. As both imported gopherlib the
usage of the support would have raised a DeprecationWarning.
........
r55394 | raymond.hettinger | 2007-05-16 18:08:04 -0700 (Wed, 16 May 2007) | 1 line
calendar.py gets no benefit from xrange() instead of range()
........
r55395 | brett.cannon | 2007-05-16 19:02:56 -0700 (Wed, 16 May 2007) | 3 lines
Complete deprecation of BaseException.message. Some subclasses were directly
accessing the message attribute instead of using the descriptor.
........
r55396 | neal.norwitz | 2007-05-16 23:11:36 -0700 (Wed, 16 May 2007) | 4 lines
Reduce the max stack depth to see if this fixes the segfaults on
Windows and some other boxes. If this is successful, this rev should
be backported. I'm not sure how close to the limit we should push this.
........
r55397 | neal.norwitz | 2007-05-16 23:23:50 -0700 (Wed, 16 May 2007) | 4 lines
Set the depth to something very small to try to determine if the
crashes on Windows are really due to the stack size or possibly
some other problem.
........
r55398 | neal.norwitz | 2007-05-17 00:04:46 -0700 (Thu, 17 May 2007) | 4 lines
Last try for tweaking the max stack depth. 5000 was the original value,
4000 didn't work either. 1000 does work on Windows. If 2000 works,
that will hopefully be a reasonable balance.
........
r55412 | fred.drake | 2007-05-17 12:29:58 -0700 (Thu, 17 May 2007) | 1 line
fix argument name in documentation; match the implementation
........
r55427 | neal.norwitz | 2007-05-17 22:47:16 -0700 (Thu, 17 May 2007) | 1 line
Verify neither dumps or loads overflow the stack and segfault.
........
r55446 | collin.winter | 2007-05-18 16:11:24 -0700 (Fri, 18 May 2007) | 1 line
Backport PEP 3110's new 'except' syntax to 2.6.
........
r55448 | raymond.hettinger | 2007-05-18 18:11:16 -0700 (Fri, 18 May 2007) | 1 line
Improvements to NamedTuple's implementation, tests, and documentation
........
r55449 | raymond.hettinger | 2007-05-18 18:50:11 -0700 (Fri, 18 May 2007) | 1 line
Fix beginner mistake -- don't mix spaces and tabs.
........
r55450 | neal.norwitz | 2007-05-18 20:48:47 -0700 (Fri, 18 May 2007) | 1 line
Clear data so random memory does not get freed. Will backport.
........
r55452 | neal.norwitz | 2007-05-18 21:34:55 -0700 (Fri, 18 May 2007) | 3 lines
Whoops, need to pay attention to those test failures.
Move the clear to *before* the first use, not after.
........
r55453 | neal.norwitz | 2007-05-18 21:35:52 -0700 (Fri, 18 May 2007) | 1 line
Give some clue as to what happened if the test fails.
........
r55455 | georg.brandl | 2007-05-19 11:09:26 -0700 (Sat, 19 May 2007) | 2 lines
Fix docstring for add_package in site.py.
........
r55458 | brett.cannon | 2007-05-20 00:09:50 -0700 (Sun, 20 May 2007) | 2 lines
Remove the rgbimg module. It has been deprecated since Python 2.5.
........
r55465 | nick.coghlan | 2007-05-20 04:12:49 -0700 (Sun, 20 May 2007) | 1 line
Fix typo in example (should be backported, but my maintenance branch is woefully out of date)
........
................
r55472 | brett.cannon | 2007-05-20 12:06:18 -0700 (Sun, 20 May 2007) | 2 lines
Remove imageop from the Windows build process.
................
r55486 | neal.norwitz | 2007-05-20 23:59:52 -0700 (Sun, 20 May 2007) | 1 line
Remove callable() builtin
................
r55506 | neal.norwitz | 2007-05-22 00:43:29 -0700 (Tue, 22 May 2007) | 78 lines
Merged revisions 55468-55505 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55468 | neal.norwitz | 2007-05-20 11:06:27 -0700 (Sun, 20 May 2007) | 1 line
rotor is long gone.
........
r55470 | neal.norwitz | 2007-05-20 11:43:00 -0700 (Sun, 20 May 2007) | 1 line
Update directories/files at the top-level.
........
r55471 | brett.cannon | 2007-05-20 12:05:06 -0700 (Sun, 20 May 2007) | 2 lines
Try to remove rgbimg from Windows builds.
........
r55474 | brett.cannon | 2007-05-20 16:17:38 -0700 (Sun, 20 May 2007) | 4 lines
Remove the macfs module. This led to the deprecation of macostools.touched();
it completely relied on macfs and is a no-op on OS X according to code
comments.
........
r55476 | brett.cannon | 2007-05-20 16:56:18 -0700 (Sun, 20 May 2007) | 3 lines
Move imgfile import to the global namespace to trigger an import error ASAP to
prevent creation of a test file.
........
r55477 | brett.cannon | 2007-05-20 16:57:38 -0700 (Sun, 20 May 2007) | 3 lines
Cause posixfile to raise a DeprecationWarning. Documented as deprecated since
Ptyhon 1.5.
........
r55479 | andrew.kuchling | 2007-05-20 17:03:15 -0700 (Sun, 20 May 2007) | 1 line
Note removed modules
........
r55481 | martin.v.loewis | 2007-05-20 21:35:47 -0700 (Sun, 20 May 2007) | 2 lines
Add Alexandre Vassalotti.
........
r55482 | george.yoshida | 2007-05-20 21:41:21 -0700 (Sun, 20 May 2007) | 4 lines
fix against r55474 [Remove the macfs module]
Remove "libmacfs.tex" from Makefile.deps and mac/mac.tex.
........
r55487 | raymond.hettinger | 2007-05-21 01:13:35 -0700 (Mon, 21 May 2007) | 1 line
Replace assertion with straight error-checking.
........
r55489 | raymond.hettinger | 2007-05-21 09:40:10 -0700 (Mon, 21 May 2007) | 1 line
Allow all alphanumeric and underscores in type and field names.
........
r55490 | facundo.batista | 2007-05-21 10:32:32 -0700 (Mon, 21 May 2007) | 5 lines
Added timeout support to HTTPSConnection, through the
socket.create_connection function. Also added a small
test for this, and updated NEWS file.
........
r55495 | georg.brandl | 2007-05-21 13:34:16 -0700 (Mon, 21 May 2007) | 2 lines
Patch #1686487: you can now pass any mapping after '**' in function calls.
........
r55502 | neal.norwitz | 2007-05-21 23:03:36 -0700 (Mon, 21 May 2007) | 1 line
Document new params to HTTPSConnection
........
r55504 | neal.norwitz | 2007-05-22 00:16:10 -0700 (Tue, 22 May 2007) | 1 line
Stop using METH_OLDARGS
........
r55505 | neal.norwitz | 2007-05-22 00:16:44 -0700 (Tue, 22 May 2007) | 1 line
Stop using METH_OLDARGS implicitly
........
................
327 lines
12 KiB
Python
327 lines
12 KiB
Python
#! /usr/bin/env python
|
|
|
|
"""Tool for measuring execution time of small code snippets.
|
|
|
|
This module avoids a number of common traps for measuring execution
|
|
times. See also Tim Peters' introduction to the Algorithms chapter in
|
|
the Python Cookbook, published by O'Reilly.
|
|
|
|
Library usage: see the Timer class.
|
|
|
|
Command line usage:
|
|
python timeit.py [-n N] [-r N] [-s S] [-t] [-c] [-h] [statement]
|
|
|
|
Options:
|
|
-n/--number N: how many times to execute 'statement' (default: see below)
|
|
-r/--repeat N: how many times to repeat the timer (default 3)
|
|
-s/--setup S: statement to be executed once initially (default 'pass')
|
|
-t/--time: use time.time() (default on Unix)
|
|
-c/--clock: use time.clock() (default on Windows)
|
|
-v/--verbose: print raw timing results; repeat for more digits precision
|
|
-h/--help: print this usage message and exit
|
|
statement: statement to be timed (default 'pass')
|
|
|
|
A multi-line statement may be given by specifying each line as a
|
|
separate argument; indented lines are possible by enclosing an
|
|
argument in quotes and using leading spaces. Multiple -s options are
|
|
treated similarly.
|
|
|
|
If -n is not given, a suitable number of loops is calculated by trying
|
|
successive powers of 10 until the total time is at least 0.2 seconds.
|
|
|
|
The difference in default timer function is because on Windows,
|
|
clock() has microsecond granularity but time()'s granularity is 1/60th
|
|
of a second; on Unix, clock() has 1/100th of a second granularity and
|
|
time() is much more precise. On either platform, the default timer
|
|
functions measure wall clock time, not the CPU time. This means that
|
|
other processes running on the same computer may interfere with the
|
|
timing. The best thing to do when accurate timing is necessary is to
|
|
repeat the timing a few times and use the best time. The -r option is
|
|
good for this; the default of 3 repetitions is probably enough in most
|
|
cases. On Unix, you can use clock() to measure CPU time.
|
|
|
|
Note: there is a certain baseline overhead associated with executing a
|
|
pass statement. The code here doesn't try to hide it, but you should
|
|
be aware of it. The baseline overhead can be measured by invoking the
|
|
program without arguments.
|
|
|
|
The baseline overhead differs between Python versions! Also, to
|
|
fairly compare older Python versions to Python 2.3, you may want to
|
|
use python -O for the older versions to avoid timing SET_LINENO
|
|
instructions.
|
|
"""
|
|
|
|
import gc
|
|
import sys
|
|
import time
|
|
try:
|
|
import itertools
|
|
except ImportError:
|
|
# Must be an older Python version (see timeit() below)
|
|
itertools = None
|
|
|
|
__all__ = ["Timer"]
|
|
|
|
dummy_src_name = "<timeit-src>"
|
|
default_number = 1000000
|
|
default_repeat = 3
|
|
|
|
if sys.platform == "win32":
|
|
# On Windows, the best timer is time.clock()
|
|
default_timer = time.clock
|
|
else:
|
|
# On most other platforms the best timer is time.time()
|
|
default_timer = time.time
|
|
|
|
# Don't change the indentation of the template; the reindent() calls
|
|
# in Timer.__init__() depend on setup being indented 4 spaces and stmt
|
|
# being indented 8 spaces.
|
|
template = """
|
|
def inner(_it, _timer):
|
|
%(setup)s
|
|
_t0 = _timer()
|
|
for _i in _it:
|
|
%(stmt)s
|
|
_t1 = _timer()
|
|
return _t1 - _t0
|
|
"""
|
|
|
|
def reindent(src, indent):
|
|
"""Helper to reindent a multi-line statement."""
|
|
return src.replace("\n", "\n" + " "*indent)
|
|
|
|
def _template_func(setup, func):
|
|
"""Create a timer function. Used if the "statement" is a callable."""
|
|
def inner(_it, _timer):
|
|
setup()
|
|
_t0 = _timer()
|
|
for _i in _it:
|
|
func()
|
|
_t1 = _timer()
|
|
return _t1 - _t0
|
|
return inner
|
|
|
|
class Timer:
|
|
"""Class for timing execution speed of small code snippets.
|
|
|
|
The constructor takes a statement to be timed, an additional
|
|
statement used for setup, and a timer function. Both statements
|
|
default to 'pass'; the timer function is platform-dependent (see
|
|
module doc string).
|
|
|
|
To measure the execution time of the first statement, use the
|
|
timeit() method. The repeat() method is a convenience to call
|
|
timeit() multiple times and return a list of results.
|
|
|
|
The statements may contain newlines, as long as they don't contain
|
|
multi-line string literals.
|
|
"""
|
|
|
|
def __init__(self, stmt="pass", setup="pass", timer=default_timer):
|
|
"""Constructor. See class doc string."""
|
|
self.timer = timer
|
|
ns = {}
|
|
if isinstance(stmt, basestring):
|
|
stmt = reindent(stmt, 8)
|
|
if isinstance(setup, basestring):
|
|
setup = reindent(setup, 4)
|
|
src = template % {'stmt': stmt, 'setup': setup}
|
|
elif hasattr(setup, '__call__'):
|
|
src = template % {'stmt': stmt, 'setup': '_setup()'}
|
|
ns['_setup'] = setup
|
|
else:
|
|
raise ValueError("setup is neither a string nor callable")
|
|
self.src = src # Save for traceback display
|
|
code = compile(src, dummy_src_name, "exec")
|
|
exec(code, globals(), ns)
|
|
self.inner = ns["inner"]
|
|
elif hasattr(stmt, '__call__'):
|
|
self.src = None
|
|
if isinstance(setup, basestring):
|
|
_setup = setup
|
|
def setup():
|
|
exec(_setup, globals(), ns)
|
|
elif not hasattr(setup, '__call__'):
|
|
raise ValueError("setup is neither a string nor callable")
|
|
self.inner = _template_func(setup, stmt)
|
|
else:
|
|
raise ValueError("stmt is neither a string nor callable")
|
|
|
|
def print_exc(self, file=None):
|
|
"""Helper to print a traceback from the timed code.
|
|
|
|
Typical use:
|
|
|
|
t = Timer(...) # outside the try/except
|
|
try:
|
|
t.timeit(...) # or t.repeat(...)
|
|
except:
|
|
t.print_exc()
|
|
|
|
The advantage over the standard traceback is that source lines
|
|
in the compiled template will be displayed.
|
|
|
|
The optional file argument directs where the traceback is
|
|
sent; it defaults to sys.stderr.
|
|
"""
|
|
import linecache, traceback
|
|
if self.src is not None:
|
|
linecache.cache[dummy_src_name] = (len(self.src),
|
|
None,
|
|
self.src.split("\n"),
|
|
dummy_src_name)
|
|
# else the source is already stored somewhere else
|
|
|
|
traceback.print_exc(file=file)
|
|
|
|
def timeit(self, number=default_number):
|
|
"""Time 'number' executions of the main statement.
|
|
|
|
To be precise, this executes the setup statement once, and
|
|
then returns the time it takes to execute the main statement
|
|
a number of times, as a float measured in seconds. The
|
|
argument is the number of times through the loop, defaulting
|
|
to one million. The main statement, the setup statement and
|
|
the timer function to be used are passed to the constructor.
|
|
"""
|
|
if itertools:
|
|
it = itertools.repeat(None, number)
|
|
else:
|
|
it = [None] * number
|
|
gcold = gc.isenabled()
|
|
gc.disable()
|
|
timing = self.inner(it, self.timer)
|
|
if gcold:
|
|
gc.enable()
|
|
return timing
|
|
|
|
def repeat(self, repeat=default_repeat, number=default_number):
|
|
"""Call timeit() a few times.
|
|
|
|
This is a convenience function that calls the timeit()
|
|
repeatedly, returning a list of results. The first argument
|
|
specifies how many times to call timeit(), defaulting to 3;
|
|
the second argument specifies the timer argument, defaulting
|
|
to one million.
|
|
|
|
Note: it's tempting to calculate mean and standard deviation
|
|
from the result vector and report these. However, this is not
|
|
very useful. In a typical case, the lowest value gives a
|
|
lower bound for how fast your machine can run the given code
|
|
snippet; higher values in the result vector are typically not
|
|
caused by variability in Python's speed, but by other
|
|
processes interfering with your timing accuracy. So the min()
|
|
of the result is probably the only number you should be
|
|
interested in. After that, you should look at the entire
|
|
vector and apply common sense rather than statistics.
|
|
"""
|
|
r = []
|
|
for i in range(repeat):
|
|
t = self.timeit(number)
|
|
r.append(t)
|
|
return r
|
|
|
|
def timeit(stmt="pass", setup="pass", timer=default_timer,
|
|
number=default_number):
|
|
"""Convenience function to create Timer object and call timeit method."""
|
|
return Timer(stmt, setup, timer).timeit(number)
|
|
|
|
def repeat(stmt="pass", setup="pass", timer=default_timer,
|
|
repeat=default_repeat, number=default_number):
|
|
"""Convenience function to create Timer object and call repeat method."""
|
|
return Timer(stmt, setup, timer).repeat(repeat, number)
|
|
|
|
def main(args=None):
|
|
"""Main program, used when run as a script.
|
|
|
|
The optional argument specifies the command line to be parsed,
|
|
defaulting to sys.argv[1:].
|
|
|
|
The return value is an exit code to be passed to sys.exit(); it
|
|
may be None to indicate success.
|
|
|
|
When an exception happens during timing, a traceback is printed to
|
|
stderr and the return value is 1. Exceptions at other times
|
|
(including the template compilation) are not caught.
|
|
"""
|
|
if args is None:
|
|
args = sys.argv[1:]
|
|
import getopt
|
|
try:
|
|
opts, args = getopt.getopt(args, "n:s:r:tcvh",
|
|
["number=", "setup=", "repeat=",
|
|
"time", "clock", "verbose", "help"])
|
|
except getopt.error as err:
|
|
print(err)
|
|
print("use -h/--help for command line help")
|
|
return 2
|
|
timer = default_timer
|
|
stmt = "\n".join(args) or "pass"
|
|
number = 0 # auto-determine
|
|
setup = []
|
|
repeat = default_repeat
|
|
verbose = 0
|
|
precision = 3
|
|
for o, a in opts:
|
|
if o in ("-n", "--number"):
|
|
number = int(a)
|
|
if o in ("-s", "--setup"):
|
|
setup.append(a)
|
|
if o in ("-r", "--repeat"):
|
|
repeat = int(a)
|
|
if repeat <= 0:
|
|
repeat = 1
|
|
if o in ("-t", "--time"):
|
|
timer = time.time
|
|
if o in ("-c", "--clock"):
|
|
timer = time.clock
|
|
if o in ("-v", "--verbose"):
|
|
if verbose:
|
|
precision += 1
|
|
verbose += 1
|
|
if o in ("-h", "--help"):
|
|
print(__doc__, end=' ')
|
|
return 0
|
|
setup = "\n".join(setup) or "pass"
|
|
# Include the current directory, so that local imports work (sys.path
|
|
# contains the directory of this script, rather than the current
|
|
# directory)
|
|
import os
|
|
sys.path.insert(0, os.curdir)
|
|
t = Timer(stmt, setup, timer)
|
|
if number == 0:
|
|
# determine number so that 0.2 <= total time < 2.0
|
|
for i in range(1, 10):
|
|
number = 10**i
|
|
try:
|
|
x = t.timeit(number)
|
|
except:
|
|
t.print_exc()
|
|
return 1
|
|
if verbose:
|
|
print("%d loops -> %.*g secs" % (number, precision, x))
|
|
if x >= 0.2:
|
|
break
|
|
try:
|
|
r = t.repeat(repeat, number)
|
|
except:
|
|
t.print_exc()
|
|
return 1
|
|
best = min(r)
|
|
if verbose:
|
|
print("raw times:", " ".join(["%.*g" % (precision, x) for x in r]))
|
|
print("%d loops," % number, end=' ')
|
|
usec = best * 1e6 / number
|
|
if usec < 1000:
|
|
print("best of %d: %.*g usec per loop" % (repeat, precision, usec))
|
|
else:
|
|
msec = usec / 1000
|
|
if msec < 1000:
|
|
print("best of %d: %.*g msec per loop" % (repeat, precision, msec))
|
|
else:
|
|
sec = msec / 1000
|
|
print("best of %d: %.*g sec per loop" % (repeat, precision, sec))
|
|
return None
|
|
|
|
if __name__ == "__main__":
|
|
sys.exit(main())
|