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

gh-127945: move initialization of field desc to module exec in ctypes (#132552)

Browse source
This commit is contained in:
Kumar Aditya 2025-04-15 19:30:33 +05:30 • committed by GitHub
parent b6c552f9e6
commit 2ff5eb8582
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Modules/_ctypes/_ctypes.c
View file

@ -6239,6 +6239,8 @@ _ctypes_mod_exec(PyObject *mod)
}
Py_ffi_closure_free(ptr);
_ctypes_init_fielddesc();
ctypes_state *st = get_module_state(mod);
st->_unpickle = PyObject_GetAttrString(mod, "_unpickle");
if (st->_unpickle == NULL) {

20
Modules/_ctypes/cfield.c
View file

@ -1461,8 +1461,8 @@ _Py_COMP_DIAG_PUSH
/* Delayed initialization. Windows cannot statically reference dynamically
loaded addresses from DLLs. */
static void
_ctypes_init_fielddesc_locked(void)
void
_ctypes_init_fielddesc(void)
{
/* Fixed-width integers */
@ -1659,30 +1659,14 @@ print(f" formattable.simple_type_chars[i] = 0;")
#undef FIXINT_FIELDDESC_FOR
_Py_COMP_DIAG_POP
static void
_ctypes_init_fielddesc(void)
{
static bool initialized = false;
static PyMutex mutex = {0};
PyMutex_Lock(&mutex);
if (!initialized) {
_ctypes_init_fielddesc_locked();
initialized = true;
}
PyMutex_Unlock(&mutex);
}
char *
_ctypes_get_simple_type_chars(void) {
_ctypes_init_fielddesc();
return formattable.simple_type_chars;
}
struct fielddesc *
_ctypes_get_fielddesc(const char *fmt)
{
_ctypes_init_fielddesc();
struct fielddesc *result = NULL;
switch(fmt[0]) {
/*[python input]

2
Modules/_ctypes/ctypes.h
View file

@ -537,6 +537,8 @@ extern int _ctypes_simple_instance(ctypes_state *st, PyObject *obj);
PyObject *_ctypes_get_errobj(ctypes_state *st, int **pspace);
extern void _ctypes_init_fielddesc(void);
#ifdef USING_MALLOC_CLOSURE_DOT_C
void Py_ffi_closure_free(void *p);
void *Py_ffi_closure_alloc(size_t size, void** codeloc);