Skip to content

bpo-46417: signal uses PyStructSequence_NewType() #30735

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 1 commit into from
Jan 21, 2022
Merged

bpo-46417: signal uses PyStructSequence_NewType() #30735

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 9 additions & 7 deletions Modules/signalmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ typedef struct {
#ifdef MS_WINDOWS
HANDLE sigint_event;
#endif
PyTypeObject *siginfo_type;
} signal_state_t;

// State shared by all Python interpreters
Expand Down Expand Up @@ -1136,12 +1137,13 @@ static PyStructSequence_Desc struct_siginfo_desc = {
7 /* n_in_sequence */
};

static PyTypeObject SiginfoType;

static PyObject *
fill_siginfo(siginfo_t *si)
{
PyObject *result = PyStructSequence_New(&SiginfoType);
signal_state_t *state = &signal_global_state;

PyObject *result = PyStructSequence_New(state->siginfo_type);
if (!result)
return NULL;

Expand Down Expand Up @@ -1660,7 +1662,7 @@ signal_module_exec(PyObject *m)
}
#endif
#if defined(HAVE_SIGWAITINFO) || defined(HAVE_SIGTIMEDWAIT)
if (PyModule_AddType(m, &SiginfoType) < 0) {
if (PyModule_AddType(m, state->siginfo_type) < 0) {
return -1;
}
#endif
Expand Down Expand Up @@ -1758,6 +1760,7 @@ _PySignal_Fini(void)

Py_CLEAR(state->default_handler);
Py_CLEAR(state->ignore_handler);
Py_CLEAR(state->siginfo_type);
}


Expand Down Expand Up @@ -1966,10 +1969,9 @@ _PySignal_Init(int install_signal_handlers)
#endif

#if defined(HAVE_SIGWAITINFO) || defined(HAVE_SIGTIMEDWAIT)
if (SiginfoType.tp_name == NULL) {
if (PyStructSequence_InitType2(&SiginfoType, &struct_siginfo_desc) < 0) {
return -1;
}
state->siginfo_type = PyStructSequence_NewType(&struct_siginfo_desc);
if (state->siginfo_type == NULL) {
return -1;
}
#endif

Expand Down