Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Lib/profiling/tracing/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,9 @@ def main():
# in the module's namespace.
globs = module.__dict__
globs.update({
'__spec__': spec,
# Set __spec__ to None so the profiled program behaves like a
# script run directly (gh-140729).
'__spec__': None,
'__file__': spec.origin,
'__name__': spec.name,
'__package__': None,
Expand Down
35 changes: 34 additions & 1 deletion Lib/test/test_profiling/test_tracing_profiler.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
"""Test suite for the cProfile module."""

import sys
import unittest

Expand Down Expand Up @@ -192,6 +191,40 @@ class Foo:
f.close()
assert_python_ok('-m', "cProfile", f.name)

def _test_process_run_pickle(self, start_method):
val = 10
with tempfile.NamedTemporaryFile("w+", delete_on_close=False) as f:
f.write(textwrap.dedent(
f'''\
import multiprocessing

def worker(x):
print(__name__)
exit(x ** 2)

if __name__ == "__main__":
multiprocessing.set_start_method('{start_method}')
p = multiprocessing.Process(target=worker, args=({val},))
p.start()
p.join()
print("p.exitcode =", p.exitcode)
'''))
f.close()
_, out, err = assert_python_ok('-m', "cProfile", f.name)
self.assertIn(b"__mp_main__", out)
self.assertIn(bytes(f"exitcode = {val**2}", encoding='utf8'), out)
self.assertNotIn(b"Can't pickle", err)

def test_process_spawn_pickle(self):
# gh-140729: test use Process in cProfile.
self._test_process_run_pickle('spawn')

@unittest.skipIf(sys.platform == 'win32',
"No 'forkserver' start method on Windows")
def test_process_forkserver_pickle(self):
# gh-140729: test use Process in cProfile.
self._test_process_run_pickle('forkserver')


def main():
if '-r' not in sys.argv:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Fix a pickling error in the ``cProfile`` module when profiling a script that
uses :class:`multiprocessing.Process` with the ``spawn`` and ``forkserver``
start methods.
Loading