Skip to content

gh-119333: Add c-api to have contextvar enter/exit callbacks #119335

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
gvanrossum merged 16 commits into from
Sep 24, 2024
Merged

gh-119333: Add c-api to have contextvar enter/exit callbacks #119335

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
b8767c3
Add c-api to have contextvar enter/exit callbacks
fried May 21, 2024
55e642a
📜🤖 Added by blurb_it.
blurb-it[bot] May 21, 2024
1e0317a
fix exception codes for 3.13+
fried May 21, 2024
0d54500
fix docs
fried May 21, 2024
3592633
remove weird line endings from the blurbit tool
fried May 21, 2024
80d6f55
fix unraisable error handling in test_capi
fried May 21, 2024
9ec2260
fix typos and naming for pep7
fried May 22, 2024
2b4bd53
Add ignores to c-analyzer
fried May 28, 2024
1ed9657
Update Doc/c-api/contextvars.rst for pep-7
fried Sep 23, 2024
546538a
Update Python/context.c - pep7
fried Sep 23, 2024
a7b60d6
Move macro to internal
fried Sep 23, 2024
c7e5b85
Fix the rest of pep-7 issues
fried Sep 23, 2024
3480c66
Fix Foreach Macro Name
fried Sep 23, 2024
c210351
Yeah can't internalize foreach macro
fried Sep 23, 2024
c80dd9d
de-macro-ing as suggested by guido
fried Sep 23, 2024
4b78fd3
default switch case ?
fried Sep 24, 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
Fix the rest of pep-7 issues
  • Loading branch information
@fried
fried committed Sep 23, 2024
commit c7e5b85933c2ddd95ebe9ec59973af230687b32b
4 changes: 2 additions & 2 deletions Doc/c-api/contextvars.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ Context object management functions:
.. c:type:: PyContextEvent

Enumeration of possible context object watcher events:
- ``PY_CONTEXT_EVENT_ENTER``
- ``PY_CONTEXT_EVENT_EXIT``
- ``Py_CONTEXT_EVENT_ENTER``
- ``Py_CONTEXT_EVENT_EXIT``

.. versionadded:: 3.14

Expand Down
2 changes: 1 addition & 1 deletion Include/cpython/context.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ PyAPI_FUNC(int) PyContext_Enter(PyObject *);
PyAPI_FUNC(int) PyContext_Exit(PyObject *);

typedef enum {
#define Py_DEF_EVENT(op) PY_CONTEXT_EVENT_##op,
#define Py_DEF_EVENT(op) Py_CONTEXT_EVENT_##op,
PY_FOREACH_CONTEXT_EVENT(Py_DEF_EVENT)
#undef Py_DEF_EVENT
} PyContextEvent;
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_capi/test_watchers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,7 @@ def test_enter_error(self):
self.assertEqual(
cm.unraisable.err_msg,
"Exception ignored in "
f"PY_CONTEXT_EVENT_EXIT watcher callback for {ctx!r}"
f"Py_CONTEXT_EVENT_EXIT watcher callback for {ctx!r}"
)
self.assertEqual(str(cm.unraisable.exc_value), "boom!")

Expand Down
4 changes: 2 additions & 2 deletions Modules/_testcapi/watchers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -631,10 +631,10 @@ static int num_context_object_exit_events[NUM_CONTEXT_WATCHERS] = {0, 0};

static int
handle_context_watcher_event(int which_watcher, PyContextEvent event, PyContext *ctx) {
if (event == PY_CONTEXT_EVENT_ENTER) {
if (event == Py_CONTEXT_EVENT_ENTER) {
num_context_object_enter_events[which_watcher]++;
}
else if (event == PY_CONTEXT_EVENT_EXIT) {
else if (event == Py_CONTEXT_EVENT_EXIT) {
num_context_object_exit_events[which_watcher]++;
}
else {
Expand Down
8 changes: 4 additions & 4 deletions Python/context.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,9 @@ static const char *
context_event_name(PyContextEvent event) {
switch (event) {
#define CASE(op) \
case PY_CONTEXT_EVENT_##op: \
return "PY_CONTEXT_EVENT_" #op;
Py_FOREACH_CONTEXT_EVENT(CASE)
case Py_CONTEXT_EVENT_##op: \
return "Py_CONTEXT_EVENT_" #op;
P_FOREACH_CONTEXT_EVENT(CASE)
#undef CASE
}
Py_UNREACHABLE();
Expand Down Expand Up @@ -225,7 +225,7 @@ _PyContext_Exit(PyThreadState *ts, PyObject *octx)
return -1;
}

notify_context_watchers(PY_CONTEXT_EVENT_EXIT, ctx);
notify_context_watchers(Py_CONTEXT_EVENT_EXIT, ctx);
Py_SETREF(ts->context, (PyObject *)ctx->ctx_prev);
ts->context_ver++;

Expand Down