Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-41798: Allocate _decimal extension module C API on the heap (GH-24117)

This commit is contained in:
Erlend Egeberg Aasland 2021-01-06 12:47:28 +01:00 committed by GitHub
parent 315fc52db1
commit fe9f446afe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Include/pydecimal.h
View File

@ -66,6 +66,8 @@ typedef struct {
/* Capsule API */ /* Capsule API */
/****************************************************************************/ /****************************************************************************/
#define PyDec_CAPSULE_NAME "_decimal._API"
/* Simple API */ /* Simple API */
#define PyDec_TypeCheck_INDEX 0 #define PyDec_TypeCheck_INDEX 0
#define PyDec_TypeCheck_RETURN int #define PyDec_TypeCheck_RETURN int
@ -164,7 +166,7 @@ static void **_decimal_api;
static int static int
import_decimal(void) import_decimal(void)
{ {
_decimal_api = (void **)PyCapsule_Import("_decimal._API", 0); _decimal_api = (void **)PyCapsule_Import(PyDec_CAPSULE_NAME, 0);
if (_decimal_api == NULL) { if (_decimal_api == NULL) {
return -1; return -1;
} }

25
Modules/_decimal/_decimal.c
View File

@ -5574,8 +5574,6 @@ static PyTypeObject PyDecContext_Type =
/* C-API */ /* C-API */
/****************************************************************************/ /****************************************************************************/
static void *_decimal_api[CPYTHON_DECIMAL_MAX_API];
/* Simple API */ /* Simple API */
static int static int
PyDec_TypeCheck(const PyObject *v) PyDec_TypeCheck(const PyObject *v)
@ -5699,9 +5697,22 @@ PyDec_GetConst(const PyObject *v)
return MPD(v); return MPD(v);
} }
static void
destroy_api(PyObject *capsule)
{
void *capi = PyCapsule_GetPointer(capsule, PyDec_CAPSULE_NAME);
PyMem_Free(capi);
}
static PyObject * static PyObject *
init_api(void) init_api(void)
{ {
void **_decimal_api = PyMem_Calloc(CPYTHON_DECIMAL_MAX_API, sizeof(void *));
if (_decimal_api == NULL) {
PyErr_NoMemory();
return NULL;
}
/* Simple API */ /* Simple API */
_decimal_api[PyDec_TypeCheck_INDEX] = (void *)PyDec_TypeCheck; _decimal_api[PyDec_TypeCheck_INDEX] = (void *)PyDec_TypeCheck;
_decimal_api[PyDec_IsSpecial_INDEX] = (void *)PyDec_IsSpecial; _decimal_api[PyDec_IsSpecial_INDEX] = (void *)PyDec_IsSpecial;
@ -5716,7 +5727,11 @@ init_api(void)
_decimal_api[PyDec_Get_INDEX] = (void *)PyDec_Get; _decimal_api[PyDec_Get_INDEX] = (void *)PyDec_Get;
_decimal_api[PyDec_GetConst_INDEX] = (void *)PyDec_GetConst; _decimal_api[PyDec_GetConst_INDEX] = (void *)PyDec_GetConst;
return PyCapsule_New(_decimal_api, "_decimal._API", NULL); PyObject *capsule = PyCapsule_New(_decimal_api, PyDec_CAPSULE_NAME, destroy_api);
if (!capsule) {
PyMem_Free(_decimal_api);
}
return capsule;
} }
@ -6080,8 +6095,7 @@ PyInit__decimal(void)
CHECK_INT(PyModule_AddStringConstant(m, "__libmpdec_version__", mpd_version())); CHECK_INT(PyModule_AddStringConstant(m, "__libmpdec_version__", mpd_version()));
/* Add capsule API */ /* Add capsule API */
Py_INCREF(capsule); if (PyModule_AddObjectRef(m, "_API", capsule) < 0) {
if (PyModule_AddObject(m, "_API", capsule) < 0) {
goto error; goto error;
} }
@ -6107,6 +6121,7 @@ error:
Py_CLEAR(basic_context_template); /* GCOV_NOT_REACHED */ Py_CLEAR(basic_context_template); /* GCOV_NOT_REACHED */
Py_CLEAR(extended_context_template); /* GCOV_NOT_REACHED */ Py_CLEAR(extended_context_template); /* GCOV_NOT_REACHED */
Py_CLEAR(m); /* GCOV_NOT_REACHED */ Py_CLEAR(m); /* GCOV_NOT_REACHED */
Py_CLEAR(capsule); /* GCOV_NOT_REACHED */
return NULL; /* GCOV_NOT_REACHED */ return NULL; /* GCOV_NOT_REACHED */
} }