Skip to content

gh-94393: Remove unneeded module state from _json #94394

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
Jul 2, 2022
Merged

gh-94393: Remove unneeded module state from _json #94394

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ec6f7a
gh-94393: Remove unneeded module state from _json
erlend-aasland Jun 28, 2022
0900c66
Update Modules/_json.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
73 changes: 15 additions & 58 deletions Modules/_json.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,6 @@
#include "structmember.h" // PyMemberDef
#include "pycore_accu.h"

typedef struct {
PyObject *PyScannerType;
PyObject *PyEncoderType;
} _jsonmodulestate;

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


typedef struct _PyScannerObject {
PyObject_HEAD
Expand Down Expand Up @@ -1815,70 +1802,40 @@ PyDoc_STRVAR(module_doc,
static int
_json_exec(PyObject *module)
{
_jsonmodulestate *state = get_json_state(module);

state->PyScannerType = PyType_FromSpec(&PyScannerType_spec);
if (state->PyScannerType == NULL) {
PyObject *PyScannerType = PyType_FromSpec(&PyScannerType_spec);
if (PyScannerType == NULL) {
return -1;
}
Py_INCREF(state->PyScannerType);
if (PyModule_AddObject(module, "make_scanner", state->PyScannerType) < 0) {
Py_DECREF(state->PyScannerType);
int rc = PyModule_AddObjectRef(module, "make_scanner", PyScannerType);
Py_DECREF(PyScannerType);
if (rc < 0) {
return -1;
}

state->PyEncoderType = PyType_FromSpec(&PyEncoderType_spec);
if (state->PyEncoderType == NULL) {
PyObject *PyEncoderType = PyType_FromSpec(&PyEncoderType_spec);
if (PyEncoderType == NULL) {
return -1;
}
Py_INCREF(state->PyEncoderType);
if (PyModule_AddObject(module, "make_encoder", state->PyEncoderType) < 0) {
Py_DECREF(state->PyEncoderType);
rc = PyModule_AddObjectRef(module, "make_encoder", PyEncoderType);
Py_DECREF(PyEncoderType);
if (rc < 0) {
return -1;
}

return 0;
}

static int
_jsonmodule_traverse(PyObject *module, visitproc visit, void *arg)
{
_jsonmodulestate *state = get_json_state(module);
Py_VISIT(state->PyScannerType);
Py_VISIT(state->PyEncoderType);
return 0;
}

static int
_jsonmodule_clear(PyObject *module)
{
_jsonmodulestate *state = get_json_state(module);
Py_CLEAR(state->PyScannerType);
Py_CLEAR(state->PyEncoderType);
return 0;
}

static void
_jsonmodule_free(void *module)
{
_jsonmodule_clear((PyObject *)module);
}

static PyModuleDef_Slot _json_slots[] = {
{Py_mod_exec, _json_exec},
{0, NULL}
};

static struct PyModuleDef jsonmodule = {
PyModuleDef_HEAD_INIT,
"_json",
module_doc,
sizeof(_jsonmodulestate),
speedups_methods,
_json_slots,
_jsonmodule_traverse,
_jsonmodule_clear,
_jsonmodule_free,
.m_base = PyModuleDef_HEAD_INIT,
.m_name = "_json",
.m_doc = module_doc,
.m_methods = speedups_methods,
.m_slots = _json_slots,
};

PyMODINIT_FUNC
Expand Down