Skip to content

gh-101659: Add _Py_AtExit() #103298

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 10 commits into from
Apr 6, 2023
Merged

gh-101659: Add _Py_AtExit() #103298

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f5ae710
atexit_callback -> atexit_py_callback.
ericsnowcurrently Apr 5, 2023
e6d4776
Add pycore_atexit.h.
ericsnowcurrently Apr 5, 2023
c719f02
Add _Py_AtExit().
ericsnowcurrently Apr 5, 2023
47c302d
Add a TODO comment.
ericsnowcurrently Apr 5, 2023
aaeaaa6
Move _Py_AtExit() to the public API.
ericsnowcurrently Apr 5, 2023
b5396e4
Test a constraint.
ericsnowcurrently Apr 5, 2023
448b48a
Add an atexit callback for _xxinterpchannels.
ericsnowcurrently Apr 5, 2023
c86f738
Implement the callback.
ericsnowcurrently Apr 5, 2023
1827feb
Drop the _PyCrossInterpreterData_Clear() call in _xxinterpchannels.
ericsnowcurrently Apr 5, 2023
82b395c
Drop the _PyCrossInterpreterData_Clear() call in _xxsubinterpreters.
ericsnowcurrently Apr 5, 2023
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
Next Next commit
atexit_callback -> atexit_py_callback.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Apr 5, 2023
commit f5ae7107974ccd6cb942093f9a878635e2f7d327
4 changes: 2 additions & 2 deletions Include/internal/pycore_interp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ typedef struct {
PyObject *func;
PyObject *args;
PyObject *kwargs;
} atexit_callback;
} atexit_py_callback;

struct atexit_state {
atexit_callback **callbacks;
atexit_py_callback **callbacks;
int ncallbacks;
int callback_len;
};
Expand Down
18 changes: 9 additions & 9 deletions Modules/atexitmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ get_atexit_state(void)
static void
atexit_delete_cb(struct atexit_state *state, int i)
{
atexit_callback *cb = state->callbacks[i];
atexit_py_callback *cb = state->callbacks[i];
state->callbacks[i] = NULL;

Py_DECREF(cb->func);
Expand All @@ -39,7 +39,7 @@ atexit_delete_cb(struct atexit_state *state, int i)
static void
atexit_cleanup(struct atexit_state *state)
{
atexit_callback *cb;
atexit_py_callback *cb;
for (int i = 0; i < state->ncallbacks; i++) {
cb = state->callbacks[i];
if (cb == NULL)
Expand All @@ -60,7 +60,7 @@ _PyAtExit_Init(PyInterpreterState *interp)

state->callback_len = 32;
state->ncallbacks = 0;
state->callbacks = PyMem_New(atexit_callback*, state->callback_len);
state->callbacks = PyMem_New(atexit_py_callback*, state->callback_len);
if (state->callbacks == NULL) {
return _PyStatus_NO_MEMORY();
}
Expand Down Expand Up @@ -88,7 +88,7 @@ atexit_callfuncs(struct atexit_state *state)
}

for (int i = state->ncallbacks - 1; i >= 0; i--) {
atexit_callback *cb = state->callbacks[i];
atexit_py_callback *cb = state->callbacks[i];
if (cb == NULL) {
continue;
}
Expand Down Expand Up @@ -152,17 +152,17 @@ atexit_register(PyObject *module, PyObject *args, PyObject *kwargs)

struct atexit_state *state = get_atexit_state();
if (state->ncallbacks >= state->callback_len) {
atexit_callback **r;
atexit_py_callback **r;
state->callback_len += 16;
size_t size = sizeof(atexit_callback*) * (size_t)state->callback_len;
r = (atexit_callback**)PyMem_Realloc(state->callbacks, size);
size_t size = sizeof(atexit_py_callback*) * (size_t)state->callback_len;
r = (atexit_py_callback**)PyMem_Realloc(state->callbacks, size);
if (r == NULL) {
return PyErr_NoMemory();
}
state->callbacks = r;
}

atexit_callback *callback = PyMem_Malloc(sizeof(atexit_callback));
atexit_py_callback *callback = PyMem_Malloc(sizeof(atexit_py_callback));
if (callback == NULL) {
return PyErr_NoMemory();
}
Expand Down Expand Up @@ -233,7 +233,7 @@ atexit_unregister(PyObject *module, PyObject *func)
struct atexit_state *state = get_atexit_state();
for (int i = 0; i < state->ncallbacks; i++)
{
atexit_callback *cb = state->callbacks[i];
atexit_py_callback *cb = state->callbacks[i];
if (cb == NULL) {
continue;
}
Expand Down