[Python-checkins] [3.7] bpo-36560: regrtest: don't collect the GC twice (GH-12747) (GH-12749)
Victor Stinner
webhook-mailer at python.org
Tue Apr 9 12:56:08 EDT 2019
https://github.com/python/cpython/commit/86f0354fcb815312295b923c55e39364d85d0388
commit: 86f0354fcb815312295b923c55e39364d85d0388
branch: 3.7
author: Victor Stinner <vstinner at redhat.com>
committer: GitHub <noreply at github.com>
date: 2019-04-09T18:55:50+02:00
summary:
[3.7] bpo-36560: regrtest: don't collect the GC twice (GH-12747) (GH-12749)
* bpo-36560: Fix reference leak hunting in regrtest (GH-12744)
Fix reference leak hunting in regrtest: compute also deltas (of
reference count, allocated memory blocks, file descriptor count)
during warmup, to ensure that everything is initialized before
starting to hunt reference leaks.
Other changes:
* Replace gc.collect() with support.gc_collect()
* Move calls to read memory statistics from dash_R_cleanup() to
dash_R()
* Pass regrtest 'ns' to dash_R()
* dash_R() is now more quiet with --quiet option (don't display
progress).
* Precompute the full range for "for it in range(repcount):" to
ensure that the iteration doesn't allocate anything new.
* dash_R() now is responsible to call warm_caches().
(cherry picked from commit 5aaac94eeb44697e92b0951385cd557bc27e0f6a)
* bpo-36560: regrtest: don't collect the GC twice (GH-12747)
dash_R() function of libregrtest doesn't call support.gc_collect()
directly anymore: it's already called by dash_R_cleanup().
Call dash_R_cleanup() before starting the loop.
(cherry picked from commit bb4447897a5f141eecf42987a1191a3330c5d7ed)
files:
A Misc/NEWS.d/next/Tests/2019-04-09-14-08-02.bpo-36560._ejeOr.rst
M Lib/test/libregrtest/refleak.py
M Lib/test/libregrtest/runtest.py
M Lib/test/libregrtest/setup.py
diff --git a/Lib/test/libregrtest/refleak.py b/Lib/test/libregrtest/refleak.py
index d68ea63b5b3c..235d6bfd3af6 100644
--- a/Lib/test/libregrtest/refleak.py
+++ b/Lib/test/libregrtest/refleak.py
@@ -18,7 +18,7 @@ def _get_dump(cls):
cls._abc_negative_cache, cls._abc_negative_cache_version)
-def dash_R(the_module, test, indirect_test, huntrleaks):
+def dash_R(ns, the_module, test_name, test_func):
"""Run a test multiple times, looking for reference leaks.
Returns:
@@ -32,6 +32,10 @@ def dash_R(the_module, test, indirect_test, huntrleaks):
raise Exception("Tracking reference leaks requires a debug build "
"of Python")
+ # Avoid false positives due to various caches
+ # filling slowly with random data:
+ warm_caches()
+
# Save current values for dash_R_cleanup() to restore.
fs = warnings.filters[:]
ps = copyreg.dispatch_table.copy()
@@ -57,31 +61,52 @@ def dash_R(the_module, test, indirect_test, huntrleaks):
def get_pooled_int(value):
return int_pool.setdefault(value, value)
- nwarmup, ntracked, fname = huntrleaks
+ nwarmup, ntracked, fname = ns.huntrleaks
fname = os.path.join(support.SAVEDCWD, fname)
repcount = nwarmup + ntracked
+
+ # Pre-allocate to ensure that the loop doesn't allocate anything new
+ rep_range = list(range(repcount))
rc_deltas = [0] * repcount
alloc_deltas = [0] * repcount
fd_deltas = [0] * repcount
+ getallocatedblocks = sys.getallocatedblocks
+ gettotalrefcount = sys.gettotalrefcount
+ fd_count = support.fd_count
- print("beginning", repcount, "repetitions", file=sys.stderr)
- print(("1234567890"*(repcount//10 + 1))[:repcount], file=sys.stderr,
- flush=True)
# initialize variables to make pyflakes quiet
rc_before = alloc_before = fd_before = 0
- for i in range(repcount):
- indirect_test()
- alloc_after, rc_after, fd_after = dash_R_cleanup(fs, ps, pic, zdc,
- abcs)
- print('.', end='', file=sys.stderr, flush=True)
- if i >= nwarmup:
- rc_deltas[i] = get_pooled_int(rc_after - rc_before)
- alloc_deltas[i] = get_pooled_int(alloc_after - alloc_before)
- fd_deltas[i] = get_pooled_int(fd_after - fd_before)
+
+ if not ns.quiet:
+ print("beginning", repcount, "repetitions", file=sys.stderr)
+ print(("1234567890"*(repcount//10 + 1))[:repcount], file=sys.stderr,
+ flush=True)
+
+ dash_R_cleanup(fs, ps, pic, zdc, abcs)
+
+ for i in rep_range:
+ test_func()
+ dash_R_cleanup(fs, ps, pic, zdc, abcs)
+
+ # dash_R_cleanup() ends with collecting cyclic trash:
+ # read memory statistics immediately after.
+ alloc_after = getallocatedblocks()
+ rc_after = gettotalrefcount()
+ fd_after = fd_count()
+
+ if not ns.quiet:
+ print('.', end='', file=sys.stderr, flush=True)
+
+ rc_deltas[i] = get_pooled_int(rc_after - rc_before)
+ alloc_deltas[i] = get_pooled_int(alloc_after - alloc_before)
+ fd_deltas[i] = get_pooled_int(fd_after - fd_before)
+
alloc_before = alloc_after
rc_before = rc_after
fd_before = fd_after
- print(file=sys.stderr)
+
+ if not ns.quiet:
+ print(file=sys.stderr)
# These checkers return False on success, True on failure
def check_rc_deltas(deltas):
@@ -112,7 +137,7 @@ def check_fd_deltas(deltas):
deltas = deltas[nwarmup:]
if checker(deltas):
msg = '%s leaked %s %s, sum=%s' % (
- test, deltas, item_name, sum(deltas))
+ test_name, deltas, item_name, sum(deltas))
print(msg, file=sys.stderr, flush=True)
with open(fname, "a") as refrep:
print(msg, file=refrep)
@@ -122,7 +147,7 @@ def check_fd_deltas(deltas):
def dash_R_cleanup(fs, ps, pic, zdc, abcs):
- import gc, copyreg
+ import copyreg
import collections.abc
# Restore some original values.
@@ -154,16 +179,8 @@ def dash_R_cleanup(fs, ps, pic, zdc, abcs):
clear_caches()
- # Collect cyclic trash and read memory statistics immediately after.
- func1 = sys.getallocatedblocks
- func2 = sys.gettotalrefcount
- gc.collect()
- return func1(), func2(), support.fd_count()
-
def clear_caches():
- import gc
-
# Clear the warnings registry, so they can be displayed again
for mod in sys.modules.values():
if hasattr(mod, '__warningregistry__'):
@@ -256,7 +273,7 @@ def clear_caches():
for f in typing._cleanups:
f()
- gc.collect()
+ support.gc_collect()
def warm_caches():
diff --git a/Lib/test/libregrtest/runtest.py b/Lib/test/libregrtest/runtest.py
index dc2abf237bc0..99486c72db3e 100644
--- a/Lib/test/libregrtest/runtest.py
+++ b/Lib/test/libregrtest/runtest.py
@@ -177,7 +177,7 @@ def test_runner():
raise Exception("errors while loading tests")
support.run_unittest(tests)
if ns.huntrleaks:
- refleak = dash_R(the_module, test, test_runner, ns.huntrleaks)
+ refleak = dash_R(ns, the_module, test, test_runner)
else:
test_runner()
test_time = time.perf_counter() - start_time
diff --git a/Lib/test/libregrtest/setup.py b/Lib/test/libregrtest/setup.py
index 910aca1b1a6c..9a6585af9d0d 100644
--- a/Lib/test/libregrtest/setup.py
+++ b/Lib/test/libregrtest/setup.py
@@ -10,8 +10,6 @@
except ImportError:
gc = None
-from test.libregrtest.refleak import warm_caches
-
def setup_tests(ns):
try:
@@ -79,10 +77,6 @@ def setup_tests(ns):
if ns.huntrleaks:
unittest.BaseTestSuite._cleanup = False
- # Avoid false positives due to various caches
- # filling slowly with random data:
- warm_caches()
-
if ns.memlimit is not None:
support.set_memlimit(ns.memlimit)
diff --git a/Misc/NEWS.d/next/Tests/2019-04-09-14-08-02.bpo-36560._ejeOr.rst b/Misc/NEWS.d/next/Tests/2019-04-09-14-08-02.bpo-36560._ejeOr.rst
new file mode 100644
index 000000000000..ad0f681ae877
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2019-04-09-14-08-02.bpo-36560._ejeOr.rst
@@ -0,0 +1,4 @@
+Fix reference leak hunting in regrtest: compute also deltas (of reference
+count, allocated memory blocks, file descriptor count) during warmup, to
+ensure that everything is initialized before starting to hunt reference
+leaks.
More information about the Python-checkins
mailing list