Skip to content

gh-111569: Implement Python critical section API #111571

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ericsnowcurrently merged 6 commits into from
Nov 8, 2023
Merged

gh-111569: Implement Python critical section API #111571

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6bf34f5
gh-111569: Implement Python critical section API
colesbury Nov 4, 2021
da3c6c3
Changes from review.
colesbury Nov 6, 2023
4b4d38d
Merge branch 'main' into critical_sections
colesbury Nov 6, 2023
3fbc42d
Update comments
colesbury Nov 7, 2023
d434904
Fix default build of test_critical_sections.c
colesbury Nov 7, 2023
4c83a1a
Update pycore_critical_section.h comments from review
colesbury Nov 8, 2023
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
Prev Previous commit
Next Next commit
Fix default build of test_critical_sections.c
  • Loading branch information
@colesbury
colesbury committed Nov 7, 2023
commit d4349048dff01f38586cd210065eba893eeb8189
16 changes: 8 additions & 8 deletions Modules/_testinternalcapi/test_critical_sections.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,21 +33,21 @@ test_critical_sections(PyObject *self, PyObject *Py_UNUSED(args))
Py_END_CRITICAL_SECTION();
assert_nogil(!PyMutex_IsLocked(&d1->ob_mutex));

assert(!PyMutex_IsLocked(&d1->ob_mutex));
assert(!PyMutex_IsLocked(&d2->ob_mutex));
assert_nogil(!PyMutex_IsLocked(&d1->ob_mutex));
assert_nogil(!PyMutex_IsLocked(&d2->ob_mutex));
Py_BEGIN_CRITICAL_SECTION2(d1, d2);
assert_nogil(PyMutex_IsLocked(&d1->ob_mutex));
assert_nogil(PyMutex_IsLocked(&d2->ob_mutex));
Py_END_CRITICAL_SECTION2();
assert(!PyMutex_IsLocked(&d1->ob_mutex));
assert(!PyMutex_IsLocked(&d2->ob_mutex));
assert_nogil(!PyMutex_IsLocked(&d1->ob_mutex));
assert_nogil(!PyMutex_IsLocked(&d2->ob_mutex));

// Passing the same object twice should work (and not deadlock).
assert(!PyMutex_IsLocked(&d2->ob_mutex));
assert_nogil(!PyMutex_IsLocked(&d2->ob_mutex));
Py_BEGIN_CRITICAL_SECTION2(d2, d2);
assert_nogil(PyMutex_IsLocked(&d2->ob_mutex));
Py_END_CRITICAL_SECTION2();
assert(!PyMutex_IsLocked(&d2->ob_mutex));
assert_nogil(!PyMutex_IsLocked(&d2->ob_mutex));

Py_DECREF(d2);
Py_DECREF(d1);
Expand Down Expand Up @@ -86,13 +86,13 @@ test_critical_sections_nest(PyObject *self, PyObject *Py_UNUSED(args))
assert(b != NULL);

// Locking an object recursively with this API should not deadlock.
assert(!PyMutex_IsLocked(&a->ob_mutex));
assert_nogil(!PyMutex_IsLocked(&a->ob_mutex));
Py_BEGIN_CRITICAL_SECTION(a);
assert_nogil(PyMutex_IsLocked(&a->ob_mutex));
lock_unlock_object(a, 10);
assert_nogil(PyMutex_IsLocked(&a->ob_mutex));
Py_END_CRITICAL_SECTION();
assert(!PyMutex_IsLocked(&a->ob_mutex));
assert_nogil(!PyMutex_IsLocked(&a->ob_mutex));

// Same test but with two objects.
Py_BEGIN_CRITICAL_SECTION2(b, a);
Expand Down