8000 bpo-1635741: Convert socket.SocketType to heap type, and establish global state by erlend-aasland · Pull Request #24175 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

bpo-1635741: Convert socket.SocketType to heap type, and establish global state #24175

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

Closed
wants to merge 3 commits into from
Closed

bpo-1635741: Convert socket.SocketType to heap type, and establish global state #24175

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c1533b
Convert socket to heap type
Dec 28, 2020
fc923e7
Establish global state
Jan 6, 2021
b41d9aa
Clean up first part of init function
Jan 8, 2021
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
Clean up first part of init function
  • Loading branch information
Erlend E. Aasland committed Jan 8, 2021
commit b41d9aaba196b6fbe2a37d7e745552e4f2b3a01d
100 changes: 64 additions & 36 deletions Modules/socketmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7079,13 +7079,56 @@ static struct PyModuleDef socketmodule = {
NULL
};

static void
socket_free_state(PyObject *Py_UNUSED(module))
{
socket_state *state = socket_get_state();
Py_CLEAR(state->sock_type);
Py_CLEAR(state->socket_herror);
Py_CLEAR(state->socket_gaierror);
}

static int
socket_init_state(PyObject *module)
{
socket_state *state = socket_get_state();
state->sock_type = (PyTypeObject *)PyType_FromModuleAndSpec(module, &sock_spec, NULL);
if (state->sock_type == NULL) {
goto error;
}

state->socket_herror = PyErr_NewException("socket.herror", PyExc_OSError, NULL);
if (state->socket_herror == NULL) {
goto error;
}

state->socket_gaierror = PyErr_NewException("socket.gaierror", PyExc_OSError, NULL);
if (state->socket_gaierror == NULL) {
goto error;
}

return 0;

error:
socket_free_state(module);
return -1;
}

#define ADD_OBJ_REF(module, name, obj) \
do { \
if (PyModule_AddObjectRef(module, name, obj) < 0) { \
goto error; \
} \
} while (0)

PyMODINIT_FUNC
PyInit__socket(void)
{
PyObject *m, *has_ipv6;
PyObject *m = NULL, *has_ipv6;

if (!os_init())
return NULL;
if (!os_init()) {
goto error;
}

#ifdef MS_WINDOWS
if (support_wsa_no_inherit == -1) {
Expand All @@ -7094,43 +7137,22 @@ PyInit__socket(void)
#endif

m = PyModule_Create(&socketmodule);
if (m == NULL)
return NULL;

socket_state *state = socket_get_state();
state->sock_type = (PyTypeObject *)PyType_FromModuleAndSpec(m, &sock_spec, NULL);
if (!state->sock_type) {
Py_DECREF(m);
return NULL;
if (m == NULL) {
goto error;
}

Py_INCREF(PyExc_OSError);
PyModule_AddObject(m, "error", PyExc_OSError);
state->socket_herror = PyErr_NewException("socket.herror",
PyExc_OSError, NULL);
if (state->socket_herror == NULL)
return NULL;
Py_INCREF(state->socket_herror);
PyModule_AddObject(m, "herror", state->socket_herror);
state->socket_gaierror = PyErr_NewException("socket.gaierror", PyExc_OSError,
NULL);
if (state->socket_gaierror == NULL)
return NULL;
Py_INCREF(state->socket_gaierror);
PyModule_AddObject(m, "gaierror", state->socket_gaierror);
PyModule_AddObjectRef(m, "timeout", PyExc_TimeoutError);

Py_INCREF(state->sock_type);
if (PyModule_AddObject(m, "SocketType", (PyObject *)state->sock_type) < 0) {
Py_CLEAR(state->sock_type);
return NULL;
}
Py_INCREF((PyObject *)state->sock_type);
if (PyModule_AddObject(m, "socket", (PyObject *)state->sock_type) < 0) {
Py_CLEAR(state->sock_type);
return NULL;
if (socket_init_state(m)) {
goto error;
}

socket_state *state = socket_get_state();
ADD_OBJ_REF(m, "SocketType", (PyObject *)state->sock_type);
ADD_OBJ_REF(m, "socket", (PyObject *)state->sock_type);
ADD_OBJ_REF(m, "herror", (PyObject *)state->socket_herror);
ADD_OBJ_REF(m, "gaierror", (PyObject *)state->socket_gaierror);
ADD_OBJ_REF(m, "error", PyExc_OSError);
ADD_OBJ_REF(m, "timeout", PyExc_TimeoutError);

#ifdef ENABLE_IPV6
has_ipv6 = Py_True;
#else
Expand Down Expand Up @@ -8395,4 +8417,10 @@ PyInit__socket(void)
#endif

return m;

error:
socket_free_state(m);
Py_XDECREF(m);
return NULL;
}
#undef ADD_OBJ_REF
0