8000 bpo-1635741: Port _random to the multi-phase init by vstinner · Pull Request #23381 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

bpo-1635741: Port _random to the multi-phase init #23381

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 1 commit into from
Closed

bpo-1635741: Port _random to the multi-phase init #23381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2020-11-19-00-00-20.bpo-1635741.w50sJK.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Port the ``_random`` extension module to the multi-phase initialization API
(:pep:`489`).
101 changes: 57 additions & 44 deletions Modules/_randommodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,15 @@ get_random_state(PyObject *module)
return (_randomstate *)state;
}

static struct PyModuleDef _randommodule;
static struct PyModuleDef _random_module;

#define _randomstate_global get_random_state(PyState_FindModule(&_randommodule))
static inline _randomstate*
get_random_state_from_type(PyTypeObject *type)
{
PyObject *module = _PyType_GetModuleByDef(type, &_random_module); // borrowed ref
assert(module != NULL);
return get_random_state(module);
}

typedef struct {
PyObject_HEAD
Expand Down Expand Up @@ -290,7 +296,8 @@ random_seed(RandomObject *self, PyObject *arg)
} else if (PyLong_Check(arg)) {
/* Calling int.__abs__() prevents calling arg.__abs__(), which might
return an invalid value. See issue #31478. */
n = PyObject_CallOneArg(_randomstate_global->Long___abs__, arg);
_randomstate *state = get_random_state_from_type(Py_TYPE(self));
n = PyObject_CallOneArg(state->Long___abs__, arg);
}
else {
Py_hash_t hash = PyObject_Hash(arg);
Expand Down Expand Up @@ -518,7 +525,8 @@ random_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
RandomObject *self;
PyObject *tmp;

if (type == (PyTypeObject*)_randomstate_global->Random_Type &&
_randomstate *state = get_random_state_from_type(type);
if (type == (PyTypeObject*)state->Random_Type &&
!_PyArg_NoKeywords("Random()", kwds)) {
return NULL;
}
Expand Down Expand Up @@ -588,58 +596,63 @@ _random_free(void *module)
_random_clear((PyObject *)module);
}

static struct PyModuleDef _randommodule = {
PyModuleDef_HEAD_INIT,
"_random",
module_doc,
sizeof(_randomstate),
NULL,
NULL,
_random_traverse,
_random_clear,
_random_free,
};

PyMODINIT_FUNC
PyInit__random(void)
int
random_module_exec(PyObject *module)
{
PyObject *m;
_randomstate *state = get_random_state(module);

PyObject *Random_Type = PyType_FromSpec(&Random_Type_spec);
if (Random_Type == NULL) {
return NULL;
state->Random_Type = PyType_FromModuleAndSpec(module, &Random_Type_spec,
NULL);
if (state->Random_Type == NULL) {
return -1;
}

m = PyModule_Create(&_randommodule);
if (m == NULL) {
Py_DECREF(Random_Type);
return NULL;
if (PyModule_AddObject(module, "Random", Py_NewRef(state->Random_Type)) < 0) {
return -1;
}
get_random_state(m)->Random_Type = Random_Type;

Py_INCREF(Random_Type);
PyModule_AddObject(m, "Random", Random_Type);

/* Look up and save int.__abs__, which is needed in random_seed(). */
PyObject *longval = NULL, *longtype = NULL;
longval = PyLong_FromLong(0);
if (longval == NULL) goto fail;
PyObject *longval = PyLong_FromLong(0);
if (longval == NULL) {
return -1;
}

longtype = PyObject_Type(longval);
if (longtype == NULL) goto fail;
PyObject *longtype = PyObject_Type(longval);
if (longtype == NULL) {
Py_DECREF(longval);
return -1;
}

PyObject *abs = PyObject_GetAttrString(longtype, "__abs__");
if (abs == NULL) goto fail;

Py_DECREF(longtype);
Py_DECREF(longval);
get_random_state(m)->Long___abs__ = abs;
if (abs == NULL) {
return -1;
}
state->Long___abs__ = abs;

return m;
return 0;
}

fail:
Py_XDECREF(longtype);
Py_XDECREF(longval);
Py_DECREF(m);
return NULL;

static PyModuleDef_Slot random_module_slots[] = {
{Py_mod_exec, random_module_exec},
{0, NULL}
};

static struct PyModuleDef _random_module = {
PyModuleDef_HEAD_INIT,
.m_name = "_random",
.m_doc = module_doc,
.m_size = sizeof(_randomstate),
.m_slots = random_module_slots,
.m_traverse = _random_traverse,
.m_clear = _random_clear,
.m_free = _random_free,
};

PyMODINIT_FUNC
PyInit__random(void)
{
return PyModuleDef_Init(&_random_module);
}
0