Skip to content

Commit

Permalink
refactor: rename module-scope entities to indicate status
Browse files Browse the repository at this point in the history
  • Loading branch information
@tseaver
tseaver committed Jun 6, 2024
1 parent 68a706b commit c4f2bba
Showing 1 changed file with 30 additions and 30 deletions.
60 changes: 30 additions & 30 deletions src/BTrees/BTreeModuleTemplate.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -914,7 +914,7 @@ _finish_set_iteration(SetIteration *i)
* Module functions / initialization
*/

static struct PyModuleDef module_def;
static struct PyModuleDef BTrees_module_def;

static char BTree_module_documentation[] =
"\n"
Expand All @@ -932,7 +932,7 @@ VALUEMACROS_H
BTREEITEMSTEMPLATE_C
;

static struct PyMethodDef module_methods[] = {
static struct PyMethodDef BTrees_module_methods[] = {
{"difference", (PyCFunction) difference_m, METH_VARARGS,
"difference(o1, o2)\n"
"compute the difference between o1 and o2"
Expand Down Expand Up @@ -977,12 +977,12 @@ typedef struct {
PyTypeObject* tree_set_type;
PyTypeObject* btree_items_type;
PyTypeObject* btree_iter_type;
} module_state;
} BTrees_module_state;

static int
module_traverse(PyObject* module, visitproc visit, void *arg)
BTrees_module_traverse(PyObject* module, visitproc visit, void *arg)
{
module_state* state = PyModule_GetState(module);
BTrees_module_state* state = PyModule_GetState(module);
Py_VISIT(state->conflict_error);
if (state->per_capi)
Py_VISIT(state->per_capi->pertype);
Expand All @@ -998,9 +998,9 @@ module_traverse(PyObject* module, visitproc visit, void *arg)
}

static int
module_clear(PyObject* module)
BTrees_module_clear(PyObject* module)
{
module_state* state = PyModule_GetState(module);
BTrees_module_state* state = PyModule_GetState(module);
Py_CLEAR(state->conflict_error);
if (state->per_capi)
Py_CLEAR(state->per_capi->pertype);
Expand All @@ -1019,11 +1019,11 @@ static inline PyObject*
_get_module(PyTypeObject* typeobj)
{
#if USE_STATIC_MODULE_INIT
return PyState_FindModule(&module_def);
return PyState_FindModule(&BTrees_module_def);
#else
if (PyType_Check(typeobj)) {
/* Only added in Python 3.11 */
return PyType_GetModuleByDef(typeobj, &module_def);
return PyType_GetModuleByDef(typeobj, &BTrees_module_def);
}

PyErr_SetString(PyExc_TypeError, "_get_module: called w/ non-type");
Expand All @@ -1045,7 +1045,7 @@ _get_conflict_error(PyObject* bt_obj_or_module)
/* Probably occurs during shutdown. Just bail.*/
return NULL;

module_state* state = PyModule_GetState(module);
BTrees_module_state* state = PyModule_GetState(module);
return state->conflict_error;
}

Expand All @@ -1056,7 +1056,7 @@ _get_btreetype_allowed_attrs(PyTypeObject* type)
if (module == NULL)
return NULL;

module_state* state = PyModule_GetState(module);
BTrees_module_state* state = PyModule_GetState(module);
return state->btreetype_allowed_attrs;
}

Expand All @@ -1075,49 +1075,49 @@ _get_per_capi(PyObject* bt_obj_or_module)
return NULL;
}

module_state* state = PyModule_GetState(module);
BTrees_module_state* state = PyModule_GetState(module);
return state->per_capi;
}

static inline PyTypeObject*
_get_btree_type(PyObject* module)
{
module_state* state = PyModule_GetState(module);
BTrees_module_state* state = PyModule_GetState(module);
return state->btree_type;
}

static inline PyTypeObject*
_get_bucket_type(PyObject* module)
{
module_state* state = PyModule_GetState(module);
BTrees_module_state* state = PyModule_GetState(module);
return state->bucket_type;
}

static inline PyTypeObject*
_get_set_type(PyObject* module)
{
module_state* state = PyModule_GetState(module);
BTrees_module_state* state = PyModule_GetState(module);
return state->set_type;
}

static inline PyTypeObject*
_get_tree_set_type(PyObject* module)
{
module_state* state = PyModule_GetState(module);
BTrees_module_state* state = PyModule_GetState(module);
return state->tree_set_type;
}

static inline PyTypeObject*
_get_btree_items_type(PyObject* module)
{
module_state* state = PyModule_GetState(module);
BTrees_module_state* state = PyModule_GetState(module);
return state->btree_items_type;
}

static inline PyTypeObject*
_get_btree_iter_type(PyObject* module)
{
module_state* state = PyModule_GetState(module);
BTrees_module_state* state = PyModule_GetState(module);
return state->btree_iter_type;
}

Expand Down Expand Up @@ -1277,7 +1277,7 @@ init_tree_type_heap(
static int
module_exec(PyObject* module)
{
module_state* state = PyModule_GetState(module);
BTrees_module_state* state = PyModule_GetState(module);
PyObject *mod_dict;
PyObject *interfaces;

Expand Down Expand Up @@ -1495,27 +1495,27 @@ module_exec(PyObject* module)
* See: https://docs.python.org/3/c-api/module.html#multi-phase-initialization
* and: https://peps.python.org/pep-0489
*/
static PyModuleDef_Slot module_slots[] = {
static PyModuleDef_Slot BTrees_module_slots[] = {
{Py_mod_exec, module_exec},
{0, NULL}
};
#endif

static struct PyModuleDef module_def = {
static struct PyModuleDef BTrees_module_def = {
PyModuleDef_HEAD_INIT,
.m_name = "_" MOD_NAME_PREFIX "BTree",
.m_doc = BTree_module_documentation,
.m_size = sizeof(module_state),
.m_methods = module_methods,
.m_traverse = module_traverse,
.m_clear = module_clear,
.m_size = sizeof(BTrees_module_state),
.m_methods = BTrees_module_methods,
.m_traverse = BTrees_module_traverse,
.m_clear = BTrees_module_clear,
#if USE_MULTIPHASE_MODULE_INIT
.m_slots = module_slots,
.m_slots = BTrees_module_slots,
#endif
};

static PyObject*
module_init(void)
BTrees_module_init(void)
{
if (intern_strings() < 0 )
return NULL;
Expand All @@ -1525,7 +1525,7 @@ module_init(void)
PyObject *module;

/* Create the module and add the functions */
module = PyModule_Create(&module_def);
module = PyModule_Create(&BTrees_module_def);

if (module_exec(module) < 0)
return NULL;
Expand All @@ -1534,13 +1534,13 @@ module_init(void)
#endif

#if USE_MULTIPHASE_MODULE_INIT
return PyModuleDef_Init(&module_def);
return PyModuleDef_Init(&BTrees_module_def);
#endif

}

PyMODINIT_FUNC
INITMODULE(void)
{
return module_init();
return BTrees_module_init();
}

0 comments on commit c4f2bba

Please sign in to comment.