mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-04 00:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-39968: Convert extension modules' macros of get_module_state() to inline functions (GH-19017)

Browse source
This commit is contained in:
Hai Shi 2020-03-16 21:15:01 +08:00 • committed by GitHub
parent 4ab362cec6
commit f707d94af6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 279 additions and 164 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Modules/_struct.c
View file

@ -20,11 +20,17 @@ typedef struct {
PyObject *StructError;
} _structmodulestate;
#define _structmodulestate(o) ((_structmodulestate *)PyModule_GetState(o))
static inline _structmodulestate*
get_struct_state(PyObject *module)
{
void *state = PyModule_GetState(module);
assert(state != NULL);
return (_structmodulestate *)state;
}
static struct PyModuleDef _structmodule;
#define _structmodulestate_global _structmodulestate(PyState_FindModule(&_structmodule))
#define _structmodulestate_global get_struct_state(PyState_FindModule(&_structmodule))
/* The translation function for each format character is table driven */
typedef struct _formatdef {
@ -2310,18 +2316,24 @@ The variable struct.error is an exception raised on errors.\n");
static int
_structmodule_traverse(PyObject *module, visitproc visit, void *arg)
{
Py_VISIT(_structmodulestate(module)->PyStructType);
Py_VISIT(_structmodulestate(module)->unpackiter_type);
Py_VISIT(_structmodulestate(module)->StructError);
_structmodulestate *state = (_structmodulestate *)PyModule_GetState(module);
if (state) {
Py_VISIT(state->PyStructType);
Py_VISIT(state->unpackiter_type);
Py_VISIT(state->StructError);
}
return 0;
}
static int
_structmodule_clear(PyObject *module)
{
Py_CLEAR(_structmodulestate(module)->PyStructType);
Py_CLEAR(_structmodulestate(module)->unpackiter_type);
Py_CLEAR(_structmodulestate(module)->StructError);
_structmodulestate *state = (_structmodulestate *)PyModule_GetState(module);
if (state) {
Py_CLEAR(state->PyStructType);
Py_CLEAR(state->unpackiter_type);
Py_CLEAR(state->StructError);
}
return 0;
}
@ -2358,13 +2370,13 @@ PyInit__struct(void)
}
Py_INCREF(PyStructType);
PyModule_AddObject(m, "Struct", PyStructType);
_structmodulestate(m)->PyStructType = PyStructType;
get_struct_state(m)->PyStructType = PyStructType;
PyObject *unpackiter_type = PyType_FromSpec(&unpackiter_type_spec);
if (unpackiter_type == NULL) {
return NULL;
}
_structmodulestate(m)->unpackiter_type = unpackiter_type;
get_struct_state(m)->unpackiter_type = unpackiter_type;
/* Check endian and swap in faster functions */
{
@ -2411,7 +2423,7 @@ PyInit__struct(void)
return NULL;
Py_INCREF(StructError);
PyModule_AddObject(m, "error", StructError);
_structmodulestate(m)->StructError = StructError;
get_struct_state(m)->StructError = StructError;
return m;
}