8000 gh-134322: fix the `__repr__` value of `threading.RLock` from `_thread`module, when just created by YvesDup · Pull Request #134389 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-134322: fix the __repr__ v 8000 alue of threading.RLock from _threadmodule, when just created #134389

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
merged 5 commits into from
May 22, 2025
Merged

gh-134322: fix the __repr__ value of threading.RLock from _threadmodule, when just created #134389

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c06df43
Iniial commit
YvesDup May 20, 2025
57b0402
Apply suggestions from code review
YvesDup May 21, 2025
6487bef
Apply last suggestions
YvesDup May 22, 2025
b1d870b
Merge branch 'main' into rlock-threading-erronous-count
YvesDup May 22, 2025
5d6ba2f
Merge branch 'main' into rlock-threading-erronous-count
YvesDup May 22, 2025
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
Apply last suggestions
  • Loading branch information
@YvesDup
YvesDup committed May 22, 2025
commit 6487bef70a050c94e76fe93fa29f8460dd46c518
14 changes: 7 additions & 7 deletions Lib/test/lock_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ class RLockTests(BaseLockTests):
def test_repr_count(self):
# see gh-134322: check that count values are correct:
# when a rlock is just created,
# in a secondary thread when rlock is acquired in the main thread.
# in a second thread when rlock is acquired in the main thread.
lock = self.locktype()
self.assertIn("count=0", repr(lock))
self.assertIn("<unlocked", repr(lock))
Expand All @@ -349,13 +349,13 @@ def test_repr_count(self):
self.assertIn("count=2", repr(lock))
self.assertIn("<locked", repr(lock))

l = []
def acquire():
l.append(repr(lock))
with Bunch(acquire, 1):
result = []
def call_repr():
result.append(repr(lock))
with Bunch(call_repr, 1):
pass
self.assertIn("count=2", l[0])
self.assertIn("<locked", l[0])
self.assertIn("count=2", result[0])
self.assertIn("<locked", result[0])

def test_reacquire(self):
lock = self.locktype()
Expand Down
12 changes: 5 additions & 7 deletions Modules/_threadmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1022,15 +1022,12 @@ rlock_traverse(PyObject *self, visitproc visit, void *arg)
return 0;
}

/*
helper function used by rlock_locked and rlock_repr.
*/
static int
rlock_locked_impl(rlockobject *self) {
rlock_locked_impl(rlockobject *self)
{
return PyMutex_IsLocked(&self->lock.mutex);
}


static void
rlock_dealloc(PyObject *self)
{
Expand Down Expand Up @@ -1227,16 +1224,17 @@ rlock_repr(PyObject *op)
{
rlockobject *self = rlockobject_CAST(op);
PyThread_ident_t owner = self->lock.thread;
int locked = rlock_locked_impl(self);
size_t count;
if (rlock_locked_impl(self)) {
if (locked) {
count = self->lock.level + 1;
}
else {
count = 0;
}
return PyUnicode_FromFormat(
"<%s %s object owner=%" PY_FORMAT_THREAD_IDENT_T " count=%zu at %p>",
owner ? "locked" : "unlocked",
locked ? "locked" : "unlocked",
Py_TYPE(self)->tp_name, owner,
count, self);
}
Expand Down
0