FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

gh-127124: Pass optional state to context watcher callback by rhansen · Pull Request #127140 · python/cpython · GitHub

  1. python
  2. cpython

Repository navigation

gh-127124: Pass optional state to context watcher callback #127140

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

Open
rhansen wants to merge 3 commits into
base: main
Choose a base branch
Could not load branches
Branch not found: {{ refName }}

Are you sure you want to change the base?

Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
from
Conversation 7 Commits 3 Checks 0 Files changed
Open

gh-127124: Pass optional state to context watcher callback #127140

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c9e95d4
gh-127124: Pass optional state to context watcher callback
rhansen Nov 22, 2024
133e00c
fixup! gh-127124: Pass optional state to context watcher callback
rhansen Nov 25, 2024
3e28b5f
fixup! gh-127124: Change context watcher callback to a callable object
rhansen Nov 26, 2024
File filter

Filter by extension

Filter by extension .c  (1) .py  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
Prev Previous commit
Next Next commit
fixup! gh-127124: Pass optional state to context watcher callback
  • Loading branch information
rhansen committed Nov 25, 2024
commit 133e00c08d488b297eb30f9833b2569cb08cd2d3
12 changes: 8 additions & 4 deletions Lib/test/test_capi/test_watchers.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import contextlib
import unittest
import contextvars

Expand Down Expand Up @@ -639,16 +640,19 @@ def _in_outer():
def test_clear_out_of_range_watcher_id(self):
with self.assertRaisesRegex(ValueError, r"Invalid context watcher ID -1"):
_testcapi.clear_context_watcher(-1)
with self.assertRaisesRegex(ValueError, r"Invalid context watcher ID 8"):
_testcapi.clear_context_watcher(8) # CONTEXT_MAX_WATCHERS = 8
with self.assertRaisesRegex(ValueError, f"Invalid context watcher ID {_testcapi.CONTEXT_MAX_WATCHERS}"):
_testcapi.clear_context_watcher(_testcapi.CONTEXT_MAX_WATCHERS)

def test_clear_unassigned_watcher_id(self):
with self.assertRaisesRegex(ValueError, r"No context watcher set for ID 1"):
_testcapi.clear_context_watcher(1)

def test_allocate_too_many_watchers(self):
with self.assertRaisesRegex(RuntimeError, r"no more context watcher IDs available"):
_testcapi.allocate_too_many_context_watchers()
with contextlib.ExitStack() as stack:
for i in range(_testcapi.CONTEXT_MAX_WATCHERS):
stack.enter_context(self.context_watcher())
with self.assertRaisesRegex(RuntimeError, r"no more context watcher IDs available"):
stack.enter_context(self.context_watcher())

def test_exit_base_context(self):
ctx = contextvars.Context()
Expand Down
42 changes: 10 additions & 32 deletions Modules/_testcapi/watchers.c
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -710,36 +710,6 @@ clear_context_stack(PyObject *Py_UNUSED(self), PyObject *Py_UNUSED(args))
Py_RETURN_NONE;
}

static PyObject *
allocate_too_many_context_watchers(PyObject *self, PyObject *args)
{
int watcher_ids[CONTEXT_MAX_WATCHERS + 1];
int num_watchers = 0;
for (unsigned long i = 0; i < sizeof(watcher_ids) / sizeof(int); i++) {
int watcher_id = PyContext_AddWatcher(&context_watcher, NULL);
if (watcher_id == -1) {
break;
}
watcher_ids[i] = watcher_id;
num_watchers++;
}
PyObject *exc = PyErr_GetRaisedException();
for (int i = 0; i < num_watchers; i++) {
if (PyContext_ClearWatcher(watcher_ids[i]) < 0) {
PyErr_WriteUnraisable(Py_None);
break;
}
}
if (exc) {
PyErr_SetRaisedException(exc);
return NULL;
}
else if (PyErr_Occurred()) {
return NULL;
}
Py_RETURN_NONE;
}

/*[clinic input]
_testcapi.set_func_defaults_via_capi
func: object
Expand Down Expand Up @@ -812,8 +782,6 @@ static PyMethodDef test_methods[] = {
_TESTCAPI_ADD_CONTEXT_WATCHER_METHODDEF
_TESTCAPI_CLEAR_CONTEXT_WATCHER_METHODDEF
{"clear_context_stack", clear_context_stack, METH_NOARGS, NULL},
{"allocate_too_many_context_watchers",
(PyCFunction) allocate_too_many_context_watchers, METH_NOARGS, NULL},
{NULL},
};

Expand All @@ -824,6 +792,16 @@ _PyTestCapi_Init_Watchers(PyObject *mod)
return -1;
}

#define ADD_INT_CONST(INT) \
do { \
if (PyModule_AddIntConstant(mod, #INT, INT) < 0) { \
return -1; \
} \
} while(0)
ADD_INT_CONST(CONTEXT_MAX_WATCHERS);
ADD_INT_CONST(Py_CONTEXT_SWITCHED);
#undef ADD_INT_CONST

/* Expose each event as an attribute on the module */
#define ADD_EVENT(event) \
if (add_func_event(mod, "PYFUNC_EVENT_" #event, \
Expand Down
Back | FazBrowse Home | New Git URL