Skip to content

gh-76785: Minor Improvements to "interpreters" Module #116328

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 15 commits into from
Mar 5, 2024
Merged

gh-76785: Minor Improvements to "interpreters" Module #116328

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
efd5f33
Make Interpreter instances pickleable.
ericsnowcurrently Mar 1, 2024
acd472a
Make interpreters.Queue instances pickleable.
ericsnowcurrently Mar 1, 2024
98a03d2
Make interpreters.*Channel instances pickleable.
ericsnowcurrently Mar 4, 2024
46c6fb5
Raise QueueNotFoundError from _interpqueues.release().
ericsnowcurrently Mar 1, 2024
7df489d
Combine the two QueueEmpty (and QueueFull) exception types.
ericsnowcurrently Mar 1, 2024
dddd40b
Fix docstrings in the low-level module.
ericsnowcurrently Mar 1, 2024
512bed1
get_default_fmt -> get_queue_defaults
ericsnowcurrently Mar 1, 2024
55e0e92
Drop the default arg from _interpqueues.get().
ericsnowcurrently Mar 1, 2024
b15e706
Add low-level tests.
ericsnowcurrently Mar 2, 2024
38fe300
_PyCrossInterpreterData_UnregisterClass -> clear_xid_class
ericsnowcurrently Mar 4, 2024
9496113
Destroy any remaining queues.
ericsnowcurrently Mar 4, 2024
5645bcf
Do not crash for an unbalanced queue release.
ericsnowcurrently Mar 4, 2024
c43da0c
Fix a compiler warning.
ericsnowcurrently Mar 5, 2024
50a84f4
Fix TestBase.tearDown().
ericsnowcurrently Mar 5, 2024
3bd92b7
Fix a compiler warning.
ericsnowcurrently Mar 5, 2024
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
Do not crash for an unbalanced queue release.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Mar 4, 2024
commit 5645bcff9b444d38dc06d42b0672f966b3337414
15 changes: 4 additions & 11 deletions Lib/test/test_interpreters/test_queues.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,17 +87,10 @@ def test_bind_release(self):
self.assertEqual(get_num_queues(), 0)

with self.subTest('release without binding'):
stdout, stderr = self.assert_python_failure(
'-c',
dedent(f"""
import {_queues.__name__} as _queues
_queues.create(2, 0)
_queues.release(qid)
"""),
)
# It should have aborted due to an assert.
self.assertEqual(stdout, '')
self.assertNotEqual(stderr, '')
qid = _queues.create(2, 0)
self.addCleanup(lambda: _queues.destroy(qid))
with self.assertRaises(queues.QueueError):
_queues.release(qid)


class QueueTests(TestBase):
Expand Down
9 changes: 9 additions & 0 deletions Modules/_xxinterpqueuesmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@ clear_module_state(module_state *state)
// single-queue errors
#define ERR_QUEUE_EMPTY (-21)
#define ERR_QUEUE_FULL (-22)
#define ERR_QUEUE_NEVER_BOUND (-23)

static int ensure_external_exc_types(module_state *);

Expand Down Expand Up @@ -245,6 +246,10 @@ resolve_module_errcode(module_state *state, int errcode, int64_t qid,
exctype = state->QueueFull;
msg = PyUnicode_FromFormat("queue %" PRId64 " is full", qid);
break;
case ERR_QUEUE_NEVER_BOUND:
exctype = state->QueueError;
msg = PyUnicode_FromFormat("queue %" PRId64 " never bound", qid);
break;
default:
PyErr_Format(PyExc_ValueError,
"unsupported error code %d", errcode);
Expand Down Expand Up @@ -936,6 +941,10 @@ _queues_decref(_queues *queues, int64_t qid)
res = ERR_QUEUE_NOT_FOUND;
goto finally;
}
if (ref->refcount == 0) {
res = ERR_QUEUE_NEVER_BOUND;
goto finally;
}
assert(ref->refcount > 0);
ref->refcount -= 1;

Expand Down