mirror of
https://github.com/pybind/pybind11.git
synced 2024-11-23 13:45:10 +00:00
b07d08f600
* Add option to force the use of the PYPY GIL scoped acquire/release logic to support nested gil access, see https://github.com/pybind/pybind11/issues/1276 and https://github.com/pytorch/pytorch/issues/83101 * Apply suggestions from code review * Update CMakeLists.txt * docs: update upgrade guide * Update docs/upgrade.rst * All bells & whistles. * Add Reminder to common.h, so that we will not forget to purge `!WITH_THREAD` branches when dropping Python 3.6 * New sentence instead of semicolon. * Temporarily pull in snapshot of PR #4246 * Add `test_release_acquire` * Add more unit tests for nested gil locking * Add test_report_builtins_internals_keys * Very minor enhancement: sort list only after filtering. * Revert change in docs/upgrade.rst * Add test_multi_acquire_release_cross_module, while also forcing unique PYBIND11_INTERNALS_VERSION for cross_module_gil_utils.cpp * Hopefully fix apparently new ICC error. ``` 2022-10-28T07:57:54.5187728Z -- The CXX compiler identification is Intel 2021.7.0.20220726 ... 2022-10-28T07:58:53.6758994Z icpc: remark #10441: The Intel(R) C++ Compiler Classic (ICC) is deprecated and will be removed from product release in the second half of 2023. The Intel(R) oneAPI DPC++/C++ Compiler (ICX) is the recommended compiler moving forward. Please transition to use this compiler. Use '-diag-disable=10441' to disable this message. 2022-10-28T07:58:54.5801597Z In file included from /home/runner/work/pybind11/pybind11/include/pybind11/detail/../detail/type_caster_base.h(15), 2022-10-28T07:58:54.5803794Z from /home/runner/work/pybind11/pybind11/include/pybind11/detail/../cast.h(15), 2022-10-28T07:58:54.5805740Z from /home/runner/work/pybind11/pybind11/include/pybind11/detail/../attr.h(14), 2022-10-28T07:58:54.5809556Z from /home/runner/work/pybind11/pybind11/include/pybind11/detail/class.h(12), 2022-10-28T07:58:54.5812154Z from /home/runner/work/pybind11/pybind11/include/pybind11/pybind11.h(13), 2022-10-28T07:58:54.5948523Z from /home/runner/work/pybind11/pybind11/tests/cross_module_gil_utils.cpp(13): 2022-10-28T07:58:54.5949009Z /home/runner/work/pybind11/pybind11/include/pybind11/detail/../detail/internals.h(177): error #2282: unrecognized GCC pragma 2022-10-28T07:58:54.5949374Z PYBIND11_TLS_KEY_INIT(tstate) 2022-10-28T07:58:54.5949579Z ^ 2022-10-28T07:58:54.5949695Z ``` * clang-tidy fixes * Workaround for PYPY WIN exitcode None * Revert "Temporarily pull in snapshot of PR #4246" This reverts commit 23ac16e859150f27fda25ca865cabcb4444e0770. * Another workaround for PYPY WIN exitcode None * Clean up how the tests are run "run in process" Part 1: uniformity * Clean up how the tests are run "run in process" Part 2: use `@pytest.mark.parametrize` and clean up the naming. * Skip some tests `#if defined(THREAD_SANITIZER)` (tested with TSAN using the Google-internal toolchain). * Run all tests again but ignore ThreadSanitizer exitcode 66 (this is less likely to mask unrelated ThreadSanitizer issues in the future). * bug fix: missing common.h include before using `PYBIND11_SIMPLE_GIL_MANAGEMENT` For the tests in the github CI this does not matter, because `PYBIND11_SIMPLE_GIL_MANAGEMENT` is always defined from the command line, but when monkey-patching common.h locally, it matters. * if process.exitcode is None: assert t_delta > 9.9 * More sophisiticated `_run_in_process()` implementation, clearly reporting `DEADLOCK`, additionally exercised via added `intentional_deadlock()` * Wrap m.intentional_deadlock in a Python function, for `ForkingPickler` compatibility. ``` > ForkingPickler(file, protocol).dump(obj) E TypeError: cannot pickle 'PyCapsule' object ``` Observed with all Windows builds including mingw but not PyPy, and macos-latest with Python 3.9, 3.10, 3.11 but not 3.6. * Add link to potential solution for WOULD-BE-NICE-TO-HAVE feature. * Add `SKIP_IF_DEADLOCK = True` option, to not pollute the CI results with expected `DEADLOCK` failures while we figure out what to do about them. * Add COPY-PASTE-THIS: gdb ... command (to be used for debugging the detected deadlock) * style: pre-commit fixes * Do better than automatic pre-commit fixes. * Add `PYBIND11_SIMPLE_GIL_MANAGEMENT` to `pytest_report_header()` (so that we can easily know when harvesting deadlock information from the CI logs). Co-authored-by: Arnim Balzer <arnim@seechange.ai> Co-authored-by: Henry Schreiner <HenrySchreinerIII@gmail.com> Co-authored-by: Ralf W. Grosse-Kunstleve <rwgk@google.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
245 lines
8.4 KiB
Python
245 lines
8.4 KiB
Python
import multiprocessing
|
|
import sys
|
|
import threading
|
|
import time
|
|
|
|
import pytest
|
|
|
|
from pybind11_tests import gil_scoped as m
|
|
|
|
|
|
class ExtendedVirtClass(m.VirtClass):
|
|
def virtual_func(self):
|
|
pass
|
|
|
|
def pure_virtual_func(self):
|
|
pass
|
|
|
|
|
|
def test_callback_py_obj():
|
|
m.test_callback_py_obj(lambda: None)
|
|
|
|
|
|
def test_callback_std_func():
|
|
m.test_callback_std_func(lambda: None)
|
|
|
|
|
|
def test_callback_virtual_func():
|
|
extended = ExtendedVirtClass()
|
|
m.test_callback_virtual_func(extended)
|
|
|
|
|
|
def test_callback_pure_virtual_func():
|
|
extended = ExtendedVirtClass()
|
|
m.test_callback_pure_virtual_func(extended)
|
|
|
|
|
|
def test_cross_module_gil_released():
|
|
"""Makes sure that the GIL can be acquired by another module from a GIL-released state."""
|
|
m.test_cross_module_gil_released() # Should not raise a SIGSEGV
|
|
|
|
|
|
def test_cross_module_gil_acquired():
|
|
"""Makes sure that the GIL can be acquired by another module from a GIL-acquired state."""
|
|
m.test_cross_module_gil_acquired() # Should not raise a SIGSEGV
|
|
|
|
|
|
def test_cross_module_gil_inner_custom_released():
|
|
"""Makes sure that the GIL can be acquired/released by another module
|
|
from a GIL-released state using custom locking logic."""
|
|
m.test_cross_module_gil_inner_custom_released()
|
|
|
|
|
|
def test_cross_module_gil_inner_custom_acquired():
|
|
"""Makes sure that the GIL can be acquired/acquired by another module
|
|
from a GIL-acquired state using custom locking logic."""
|
|
m.test_cross_module_gil_inner_custom_acquired()
|
|
|
|
|
|
def test_cross_module_gil_inner_pybind11_released():
|
|
"""Makes sure that the GIL can be acquired/released by another module
|
|
from a GIL-released state using pybind11 locking logic."""
|
|
m.test_cross_module_gil_inner_pybind11_released()
|
|
|
|
|
|
def test_cross_module_gil_inner_pybind11_acquired():
|
|
"""Makes sure that the GIL can be acquired/acquired by another module
|
|
from a GIL-acquired state using pybind11 locking logic."""
|
|
m.test_cross_module_gil_inner_pybind11_acquired()
|
|
|
|
|
|
def test_cross_module_gil_nested_custom_released():
|
|
"""Makes sure that the GIL can be nested acquired/released by another module
|
|
from a GIL-released state using custom locking logic."""
|
|
m.test_cross_module_gil_nested_custom_released()
|
|
|
|
|
|
def test_cross_module_gil_nested_custom_acquired():
|
|
"""Makes sure that the GIL can be nested acquired/acquired by another module
|
|
from a GIL-acquired state using custom locking logic."""
|
|
m.test_cross_module_gil_nested_custom_acquired()
|
|
|
|
|
|
def test_cross_module_gil_nested_pybind11_released():
|
|
"""Makes sure that the GIL can be nested acquired/released by another module
|
|
from a GIL-released state using pybind11 locking logic."""
|
|
m.test_cross_module_gil_nested_pybind11_released()
|
|
|
|
|
|
def test_cross_module_gil_nested_pybind11_acquired():
|
|
"""Makes sure that the GIL can be nested acquired/acquired by another module
|
|
from a GIL-acquired state using pybind11 locking logic."""
|
|
m.test_cross_module_gil_nested_pybind11_acquired()
|
|
|
|
|
|
def test_release_acquire():
|
|
assert m.test_release_acquire(0xAB) == "171"
|
|
|
|
|
|
def test_nested_acquire():
|
|
assert m.test_nested_acquire(0xAB) == "171"
|
|
|
|
|
|
def test_multi_acquire_release_cross_module():
|
|
for bits in range(16 * 8):
|
|
internals_ids = m.test_multi_acquire_release_cross_module(bits)
|
|
assert len(internals_ids) == 2 if bits % 8 else 1
|
|
|
|
|
|
# Intentionally putting human review in the loop here, to guard against accidents.
|
|
VARS_BEFORE_ALL_BASIC_TESTS = dict(vars()) # Make a copy of the dict (critical).
|
|
ALL_BASIC_TESTS = (
|
|
test_callback_py_obj,
|
|
test_callback_std_func,
|
|
test_callback_virtual_func,
|
|
test_callback_pure_virtual_func,
|
|
test_cross_module_gil_released,
|
|
test_cross_module_gil_acquired,
|
|
test_cross_module_gil_inner_custom_released,
|
|
test_cross_module_gil_inner_custom_acquired,
|
|
test_cross_module_gil_inner_pybind11_released,
|
|
test_cross_module_gil_inner_pybind11_acquired,
|
|
test_cross_module_gil_nested_custom_released,
|
|
test_cross_module_gil_nested_custom_acquired,
|
|
test_cross_module_gil_nested_pybind11_released,
|
|
test_cross_module_gil_nested_pybind11_acquired,
|
|
test_release_acquire,
|
|
test_nested_acquire,
|
|
test_multi_acquire_release_cross_module,
|
|
)
|
|
|
|
|
|
def test_all_basic_tests_completeness():
|
|
num_found = 0
|
|
for key, value in VARS_BEFORE_ALL_BASIC_TESTS.items():
|
|
if not key.startswith("test_"):
|
|
continue
|
|
assert value in ALL_BASIC_TESTS
|
|
num_found += 1
|
|
assert len(ALL_BASIC_TESTS) == num_found
|
|
|
|
|
|
def _intentional_deadlock():
|
|
m.intentional_deadlock()
|
|
|
|
|
|
ALL_BASIC_TESTS_PLUS_INTENTIONAL_DEADLOCK = ALL_BASIC_TESTS + (_intentional_deadlock,)
|
|
SKIP_IF_DEADLOCK = True # See PR #4216
|
|
|
|
|
|
def _run_in_process(target, *args, **kwargs):
|
|
if len(args) == 0:
|
|
test_fn = target
|
|
else:
|
|
test_fn = args[0]
|
|
# Do not need to wait much, 10s should be more than enough.
|
|
timeout = 0.1 if test_fn is _intentional_deadlock else 10
|
|
process = multiprocessing.Process(target=target, args=args, kwargs=kwargs)
|
|
process.daemon = True
|
|
try:
|
|
t_start = time.time()
|
|
process.start()
|
|
if timeout >= 100: # For debugging.
|
|
print(
|
|
"\nprocess.pid STARTED", process.pid, (sys.argv, target, args, kwargs)
|
|
)
|
|
print(f"COPY-PASTE-THIS: gdb {sys.argv[0]} -p {process.pid}", flush=True)
|
|
process.join(timeout=timeout)
|
|
if timeout >= 100:
|
|
print("\nprocess.pid JOINED", process.pid, flush=True)
|
|
t_delta = time.time() - t_start
|
|
if process.exitcode == 66 and m.defined_THREAD_SANITIZER: # Issue #2754
|
|
# WOULD-BE-NICE-TO-HAVE: Check that the message below is actually in the output.
|
|
# Maybe this could work:
|
|
# https://gist.github.com/alexeygrigorev/01ce847f2e721b513b42ea4a6c96905e
|
|
pytest.skip(
|
|
"ThreadSanitizer: starting new threads after multi-threaded fork is not supported."
|
|
)
|
|
elif test_fn is _intentional_deadlock:
|
|
assert process.exitcode is None
|
|
return 0
|
|
elif process.exitcode is None:
|
|
assert t_delta > 0.9 * timeout
|
|
msg = "DEADLOCK, most likely, exactly what this test is meant to detect."
|
|
if SKIP_IF_DEADLOCK:
|
|
pytest.skip(msg)
|
|
raise RuntimeError(msg)
|
|
return process.exitcode
|
|
finally:
|
|
if process.is_alive():
|
|
process.terminate()
|
|
|
|
|
|
def _run_in_threads(test_fn, num_threads, parallel):
|
|
threads = []
|
|
for _ in range(num_threads):
|
|
thread = threading.Thread(target=test_fn)
|
|
thread.daemon = True
|
|
thread.start()
|
|
if parallel:
|
|
threads.append(thread)
|
|
else:
|
|
thread.join()
|
|
for thread in threads:
|
|
thread.join()
|
|
|
|
|
|
# TODO: FIXME, sometimes returns -11 (segfault) instead of 0 on macOS Python 3.9
|
|
@pytest.mark.parametrize("test_fn", ALL_BASIC_TESTS_PLUS_INTENTIONAL_DEADLOCK)
|
|
def test_run_in_process_one_thread(test_fn):
|
|
"""Makes sure there is no GIL deadlock when running in a thread.
|
|
|
|
It runs in a separate process to be able to stop and assert if it deadlocks.
|
|
"""
|
|
assert _run_in_process(_run_in_threads, test_fn, num_threads=1, parallel=False) == 0
|
|
|
|
|
|
# TODO: FIXME on macOS Python 3.9
|
|
@pytest.mark.parametrize("test_fn", ALL_BASIC_TESTS_PLUS_INTENTIONAL_DEADLOCK)
|
|
def test_run_in_process_multiple_threads_parallel(test_fn):
|
|
"""Makes sure there is no GIL deadlock when running in a thread multiple times in parallel.
|
|
|
|
It runs in a separate process to be able to stop and assert if it deadlocks.
|
|
"""
|
|
assert _run_in_process(_run_in_threads, test_fn, num_threads=8, parallel=True) == 0
|
|
|
|
|
|
# TODO: FIXME on macOS Python 3.9
|
|
@pytest.mark.parametrize("test_fn", ALL_BASIC_TESTS_PLUS_INTENTIONAL_DEADLOCK)
|
|
def test_run_in_process_multiple_threads_sequential(test_fn):
|
|
"""Makes sure there is no GIL deadlock when running in a thread multiple times sequentially.
|
|
|
|
It runs in a separate process to be able to stop and assert if it deadlocks.
|
|
"""
|
|
assert _run_in_process(_run_in_threads, test_fn, num_threads=8, parallel=False) == 0
|
|
|
|
|
|
# TODO: FIXME on macOS Python 3.9
|
|
@pytest.mark.parametrize("test_fn", ALL_BASIC_TESTS_PLUS_INTENTIONAL_DEADLOCK)
|
|
def test_run_in_process_direct(test_fn):
|
|
"""Makes sure there is no GIL deadlock when using processes.
|
|
|
|
This test is for completion, but it was never an issue.
|
|
"""
|
|
assert _run_in_process(test_fn) == 0
|