Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

[3.13] gh-117657: Acquire a critical section around `SemLock.__{enter,exit}__` (GH-118812) (#118856) 

These methods are purely wrappers around `Semlock.{acquire,release}`,
which expect a critical section to be held.
(cherry picked from commit c30d8e5d6c)

Co-authored-by: mpage <mpage@meta.com>
This commit is contained in:
Miss Islington (bot) 2024-05-09 18:31:38 +02:00 committed by GitHub
parent 738877a101
commit 62a559ac09
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Modules/_multiprocessing/clinic/semaphore.c.h generated
View File

@ -473,7 +473,13 @@ _multiprocessing_SemLock___enter___impl(SemLockObject *self);
static PyObject * static PyObject *
_multiprocessing_SemLock___enter__(SemLockObject *self, PyObject *Py_UNUSED(ignored)) _multiprocessing_SemLock___enter__(SemLockObject *self, PyObject *Py_UNUSED(ignored))
{ {
return _multiprocessing_SemLock___enter___impl(self); PyObject *return_value = NULL;
Py_BEGIN_CRITICAL_SECTION(self);
return_value = _multiprocessing_SemLock___enter___impl(self);
Py_END_CRITICAL_SECTION();
return return_value;
} }
#endif /* defined(HAVE_MP_SEMAPHORE) */ #endif /* defined(HAVE_MP_SEMAPHORE) */
@ -518,7 +524,9 @@ _multiprocessing_SemLock___exit__(SemLockObject *self, PyObject *const *args, Py
} }
exc_tb = args[2]; exc_tb = args[2];
skip_optional: skip_optional:
Py_BEGIN_CRITICAL_SECTION(self);
return_value = _multiprocessing_SemLock___exit___impl(self, exc_type, exc_value, exc_tb); return_value = _multiprocessing_SemLock___exit___impl(self, exc_type, exc_value, exc_tb);
Py_END_CRITICAL_SECTION();
exit: exit:
return return_value; return return_value;
@ -565,4 +573,4 @@ exit:
#ifndef _MULTIPROCESSING_SEMLOCK___EXIT___METHODDEF #ifndef _MULTIPROCESSING_SEMLOCK___EXIT___METHODDEF
#define _MULTIPROCESSING_SEMLOCK___EXIT___METHODDEF #define _MULTIPROCESSING_SEMLOCK___EXIT___METHODDEF
#endif /* !defined(_MULTIPROCESSING_SEMLOCK___EXIT___METHODDEF) */ #endif /* !defined(_MULTIPROCESSING_SEMLOCK___EXIT___METHODDEF) */
/*[clinic end generated code: output=713b597256233716 input=a9049054013a1b77]*/ /*[clinic end generated code: output=dea36482d23a355f input=a9049054013a1b77]*/

6
Modules/_multiprocessing/semaphore.c
View File

@ -682,6 +682,7 @@ _multiprocessing_SemLock__after_fork_impl(SemLockObject *self)
} }
/*[clinic input] /*[clinic input]
@critical_section
_multiprocessing.SemLock.__enter__ _multiprocessing.SemLock.__enter__
Enter the semaphore/lock. Enter the semaphore/lock.
@ -689,12 +690,13 @@ Enter the semaphore/lock.
static PyObject * static PyObject *
_multiprocessing_SemLock___enter___impl(SemLockObject *self) _multiprocessing_SemLock___enter___impl(SemLockObject *self)
/*[clinic end generated code: output=beeb2f07c858511f input=c5e27d594284690b]*/ /*[clinic end generated code: output=beeb2f07c858511f input=d35c9860992ee790]*/
{ {
return _multiprocessing_SemLock_acquire_impl(self, 1, Py_None); return _multiprocessing_SemLock_acquire_impl(self, 1, Py_None);
} }
/*[clinic input] /*[clinic input]
@critical_section
_multiprocessing.SemLock.__exit__ _multiprocessing.SemLock.__exit__
exc_type: object = None exc_type: object = None
@ -709,7 +711,7 @@ static PyObject *
_multiprocessing_SemLock___exit___impl(SemLockObject *self, _multiprocessing_SemLock___exit___impl(SemLockObject *self,
PyObject *exc_type, PyObject *exc_type,
PyObject *exc_value, PyObject *exc_tb) PyObject *exc_value, PyObject *exc_tb)
/*[clinic end generated code: output=3b37c1a9f8b91a03 input=7d644b64a89903f8]*/ /*[clinic end generated code: output=3b37c1a9f8b91a03 input=1610c8cc3e0e337e]*/
{ {
return _multiprocessing_SemLock_release_impl(self); return _multiprocessing_SemLock_release_impl(self);
} }