Skip to content

gh-94401: Remove unneeded bz2 module state #94402

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 2 commits into from
Jun 29, 2022
Merged

gh-94401: Remove unneeded bz2 module state #94402

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4b8db4
Remove unneeded bz2 module state
erlend-aasland Jun 28, 2022
1174b16
Update Modules/_bz2module.c
Jun 29, 2022
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
62 changes: 11 additions & 51 deletions Modules/_bz2module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,19 +81,6 @@ OutputBuffer_OnError(_BlocksOutputBuffer *buffer)
#define RELEASE_LOCK(obj) PyThread_release_lock((obj)->lock)


typedef struct {
PyTypeObject *bz2_compressor_type;
PyTypeObject *bz2_decompressor_type;
} _bz2_state;

static inline _bz2_state*
get_bz2_state(PyObject *module)
{
void *state = PyModule_GetState(module);
assert(state != NULL);
return (_bz2_state *)state;
}

typedef struct {
PyObject_HEAD
bz_stream bzs;
Expand Down Expand Up @@ -775,67 +762,40 @@ static PyType_Spec bz2_decompressor_type_spec = {
static int
_bz2_exec(PyObject *module)
{
_bz2_state *state = get_bz2_state(module);
state->bz2_compressor_type = (PyTypeObject *)PyType_FromModuleAndSpec(module,
PyTypeObject *bz2_compressor_type = (PyTypeObject *)PyType_FromModuleAndSpec(module,
&bz2_compressor_type_spec, NULL);
if (state->bz2_compressor_type == NULL) {
if (bz2_compressor_type == NULL) {
return -1;
}

if (PyModule_AddType(module, state->bz2_compressor_type) < 0) {
int rc = PyModule_AddType(module, bz2_compressor_type);
Py_DECREF(bz2_compressor_type);
if (rc < 0) {
return -1;
}

state->bz2_decompressor_type = (PyTypeObject *)PyType_FromModuleAndSpec(module,
PyTypeObject *bz2_decompressor_type = (PyTypeObject *)PyType_FromModuleAndSpec(module,
&bz2_decompressor_type_spec, NULL);
if (state->bz2_decompressor_type == NULL) {
if (bz2_decompressor_type == NULL) {
return -1;
}

if (PyModule_AddType(module, state->bz2_decompressor_type) < 0) {
rc = PyModule_AddType(module, bz2_decompressor_type);
Py_DECREF(bz2_decompressor_type);
if (rc < 0) {
return -1;
}

return 0;
}

static int
_bz2_traverse(PyObject *module, visitproc visit, void *arg)
{
_bz2_state *state = get_bz2_state(module);
Py_VISIT(state->bz2_compressor_type);
Py_VISIT(state->bz2_decompressor_type);
return 0;
}

static int
_bz2_clear(PyObject *module)
{
_bz2_state *state = get_bz2_state(module);
Py_CLEAR(state->bz2_compressor_type);
Py_CLEAR(state->bz2_decompressor_type);
return 0;
}

static void
_bz2_free(void *module)
{
_bz2_clear((PyObject *)module);
}

static struct PyModuleDef_Slot _bz2_slots[] = {
{Py_mod_exec, _bz2_exec},
{0, NULL}
};

static struct PyModuleDef _bz2module = {
PyModuleDef_HEAD_INIT,
.m_base = PyModuleDef_HEAD_INIT,
.m_name = "_bz2",
.m_size = sizeof(_bz2_state),
.m_slots = _bz2_slots,
.m_traverse = _bz2_traverse,
.m_clear = _bz2_clear,
.m_free = _bz2_free,
};

PyMODINIT_FUNC
Expand Down