Skip to content

gh-103092: Convert some _ctypes metatypes to heap types #113620

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

Merged
encukou merged 18 commits into from
Jan 18, 2024
Merged

gh-103092: Convert some _ctypes metatypes to heap types #113620

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
d5a196d
convert PyCSimpleType_Type to heap type
aisk Dec 22, 2023
78acadf
turn all meta type to heap type
aisk Jan 1, 2024
799494d
simplify the slots and spec names
aisk Jan 1, 2024
ad3e1ec
update the traverse function
aisk Jan 1, 2024
55d9fc4
fix codes ident
aisk Jan 1, 2024
fc91804
remove unused CDataType_as_sequence
aisk Jan 1, 2024
d1b9652
Update Modules/_ctypes/_ctypes.c
aisk Jan 3, 2024
5bfea09
Update Modules/_ctypes/_ctypes.c
aisk Jan 3, 2024
3b661b7
Update Modules/_ctypes/_ctypes.c
aisk Jan 3, 2024
748d18c
Update Modules/_ctypes/_ctypes.c
aisk Jan 3, 2024
7744075
Update Modules/_ctypes/_ctypes.c
aisk Jan 3, 2024
abe4c3f
Update Modules/_ctypes/_ctypes.c
aisk Jan 3, 2024
04cf63f
Update Modules/_ctypes/_ctypes.c
aisk Jan 3, 2024
96194a1
re-order the metatypes in ctypes.h
aisk Jan 3, 2024
1877f7b
fix memory leak
aisk Jan 4, 2024
c0b333b
Merge branch 'main' into ctypes-heap-types
erlend-aasland Jan 9, 2024
bfa771b
Merge branch 'main' into ctypes-heap-types
erlend-aasland Jan 9, 2024
1c09a0c
Using traverse / clear slot function from CDataType
aisk Jan 13, 2024
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
Prev Previous commit
Next Next commit
turn all meta type to heap type
  • Loading branch information
@aisk
aisk committed Jan 1, 2024
commit 78acadfe5e855c4874b639176c89e3e8d3ce06dc
314 changes: 101 additions & 213 deletions Modules/_ctypes/_ctypes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -903,8 +903,12 @@ static int
CDataType_traverse(PyTypeObject *self, visitproc visit, void *arg)
{
StgDictObject *dict = PyType_stgdict((PyObject *)self);
if (dict)
if (dict) {
Py_VISIT(dict->proto);
}
if (!(self->tp_base->tp_flags & Py_TPFLAGS_HEAPTYPE)) {
Py_VISIT(Py_TYPE(self));
}
return PyType_Type.tp_traverse((PyObject *)self, visit, arg);
}

Expand Down Expand Up @@ -935,91 +939,41 @@ UnionType_setattro(PyObject *self, PyObject *key, PyObject *value)
return 0;
}

static PyType_Slot pycstruct_type_type_slots[] = {
{Py_sq_repeat, CDataType_repeat},
{Py_tp_setattro, PyCStructType_setattro},
{Py_tp_doc, PyDoc_STR("metatype for the CData Objects")},
{Py_tp_traverse, CDataType_traverse},
{Py_tp_clear, CDataType_clear},
{Py_tp_methods, CDataType_methods},
{Py_tp_new, PyCStructType_new},
Comment thread
aisk marked this conversation as resolved.
Outdated
{0, NULL},
};

PyTypeObject PyCStructType_Type = {
PyVarObject_HEAD_INIT(NULL, 0)
"_ctypes.PyCStructType", /* tp_name */
0, /* tp_basicsize */
0, /* tp_itemsize */
0, /* tp_dealloc */
0, /* tp_vectorcall_offset */
0, /* tp_getattr */
0, /* tp_setattr */
0, /* tp_as_async */
0, /* tp_repr */
0, /* tp_as_number */
&CDataType_as_sequence, /* tp_as_sequence */
0, /* tp_as_mapping */
0, /* tp_hash */
0, /* tp_call */
0, /* tp_str */
0, /* tp_getattro */
PyCStructType_setattro, /* tp_setattro */
0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC, /* tp_flags */
PyDoc_STR("metatype for the CData Objects"), /* tp_doc */
(traverseproc)CDataType_traverse, /* tp_traverse */
(inquiry)CDataType_clear, /* tp_clear */
0, /* tp_richcompare */
0, /* tp_weaklistoffset */
0, /* tp_iter */
0, /* tp_iternext */
CDataType_methods, /* tp_methods */
0, /* tp_members */
0, /* tp_getset */
0, /* tp_base */
0, /* tp_dict */
0, /* tp_descr_get */
0, /* tp_descr_set */
0, /* tp_dictoffset */
0, /* tp_init */
0, /* tp_alloc */
PyCStructType_new, /* tp_new */
0, /* tp_free */
PyType_Spec pycstruct_type_type_spec = {
.name = "_ctypes.PyCStructType",
.flags = (Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC |
Py_TPFLAGS_IMMUTABLETYPE),
.slots = pycstruct_type_type_slots,
};

static PyTypeObject UnionType_Type = {
PyVarObject_HEAD_INIT(NULL, 0)
"_ctypes.UnionType", /* tp_name */
0, /* tp_basicsize */
0, /* tp_itemsize */
0, /* tp_dealloc */
0, /* tp_vectorcall_offset */
0, /* tp_getattr */
0, /* tp_setattr */
0, /* tp_as_async */
0, /* tp_repr */
0, /* tp_as_number */
&CDataType_as_sequence, /* tp_as_sequence */
0, /* tp_as_mapping */
0, /* tp_hash */
0, /* tp_call */
0, /* tp_str */
0, /* tp_getattro */
UnionType_setattro, /* tp_setattro */
0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC, /* tp_flags */
PyDoc_STR("metatype for the CData Objects"), /* tp_doc */
(traverseproc)CDataType_traverse, /* tp_traverse */
(inquiry)CDataType_clear, /* tp_clear */
0, /* tp_richcompare */
0, /* tp_weaklistoffset */
0, /* tp_iter */
0, /* tp_iternext */
CDataType_methods, /* tp_methods */
0, /* tp_members */
0, /* tp_getset */
0, /* tp_base */
0, /* tp_dict */
0, /* tp_descr_get */
0, /* tp_descr_set */
0, /* tp_dictoffset */
0, /* tp_init */
0, /* tp_alloc */
UnionType_new, /* tp_new */
0, /* tp_free */
static PyType_Slot union_type_type_slots[] = {
{Py_sq_repeat, CDataType_repeat},
{Py_tp_setattro, UnionType_setattro},
{Py_tp_doc, PyDoc_STR("metatype for the Union Objects")},
{Py_tp_traverse, CDataType_traverse},
{Py_tp_clear, CDataType_clear},
{Py_tp_methods, CDataType_methods},
{Py_tp_new, UnionType_new},
Comment thread
aisk marked this conversation as resolved.
Outdated
{0, NULL},
};

static PyType_Spec union_type_type_spec = {
.name = "_ctypes.UnionType",
.flags = (Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC |
Py_TPFLAGS_IMMUTABLETYPE),
.slots = union_type_type_slots,
};

/******************************************************************/

Expand Down Expand Up @@ -1234,46 +1188,21 @@ static PyMethodDef PyCPointerType_methods[] = {
{ NULL, NULL },
};

PyTypeObject PyCPointerType_Type = {
PyVarObject_HEAD_INIT(NULL, 0)
"_ctypes.PyCPointerType", /* tp_name */
0, /* tp_basicsize */
0, /* tp_itemsize */
0, /* tp_dealloc */
0, /* tp_vectorcall_offset */
0, /* tp_getattr */
0, /* tp_setattr */
0, /* tp_as_async */
0, /* tp_repr */
0, /* tp_as_number */
&CDataType_as_sequence, /* tp_as_sequence */
0, /* tp_as_mapping */
0, /* tp_hash */
0, /* tp_call */
0, /* tp_str */
0, /* tp_getattro */
0, /* tp_setattro */
0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC, /* tp_flags */
PyDoc_STR("metatype for the Pointer Objects"), /* tp_doc */
(traverseproc)CDataType_traverse, /* tp_traverse */
(inquiry)CDataType_clear, /* tp_clear */
0, /* tp_richcompare */
0, /* tp_weaklistoffset */
0, /* tp_iter */
0, /* tp_iternext */
PyCPointerType_methods, /* tp_methods */
0, /* tp_members */
0, /* tp_getset */
0, /* tp_base */
0, /* tp_dict */
0, /* tp_descr_get */
0, /* tp_descr_set */
0, /* tp_dictoffset */
0, /* tp_init */
0, /* tp_alloc */
PyCPointerType_new, /* tp_new */
0, /* tp_free */
static PyType_Slot pycpointer_type_type_slots[] = {
{Py_sq_repeat, CDataType_repeat},
{Py_tp_doc, PyDoc_STR("metatype for the Pointer Objects")},
{Py_tp_traverse, CDataType_traverse},
{Py_tp_clear, CDataType_clear},
{Py_tp_methods, PyCPointerType_methods},
{Py_tp_new, PyCPointerType_new},
Comment thread
aisk marked this conversation as resolved.
Outdated
{0, NULL},
};

static PyType_Spec pycpointer_type_type_spec = {
.name = "_ctypes.PyCPointerType",
.flags = (Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC |
Py_TPFLAGS_IMMUTABLETYPE),
.slots = pycpointer_type_type_slots,
};


Expand Down Expand Up @@ -1606,48 +1535,28 @@ PyCArrayType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
return NULL;
}

PyTypeObject PyCArrayType_Type = {
PyVarObject_HEAD_INIT(NULL, 0)
"_ctypes.PyCArrayType", /* tp_name */
0, /* tp_basicsize */
0, /* tp_itemsize */
0, /* tp_dealloc */
0, /* tp_vectorcall_offset */
0, /* tp_getattr */
0, /* tp_setattr */
0, /* tp_as_async */
0, /* tp_repr */
0, /* tp_as_number */
&CDataType_as_sequence, /* tp_as_sequence */
0, /* tp_as_mapping */
0, /* tp_hash */
0, /* tp_call */
0, /* tp_str */
0, /* tp_getattro */
0, /* tp_setattro */
0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
PyDoc_STR("metatype for the Array Objects"), /* tp_doc */
0, /* tp_traverse */
0, /* tp_clear */
0, /* tp_richcompare */
0, /* tp_weaklistoffset */
0, /* tp_iter */
0, /* tp_iternext */
CDataType_methods, /* tp_methods */
0, /* tp_members */
0, /* tp_getset */
0, /* tp_base */
0, /* tp_dict */
0, /* tp_descr_get */
0, /* tp_descr_set */
0, /* tp_dictoffset */
0, /* tp_init */
0, /* tp_alloc */
PyCArrayType_new, /* tp_new */
0, /* tp_free */
static int
PyCArrayType_traverse(PyTypeObject *self, visitproc visit, void *arg)
{
Py_VISIT(Py_TYPE(self));
return 0;
}

static PyType_Slot pycarray_type_type_slots[] = {
{Py_sq_repeat, CDataType_repeat},
{Py_tp_doc, PyDoc_STR("metatype for the Array Objects")},
{Py_tp_traverse, PyCArrayType_traverse},
{Py_tp_methods, CDataType_methods},
{Py_tp_new, PyCArrayType_new},
Comment thread
aisk marked this conversation as resolved.
Outdated
{0, NULL},
};

static PyType_Spec pycarray_type_type_spec = {
.name = "_ctypes.PyCArrayType",
.flags = (Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC |
Py_TPFLAGS_IMMUTABLETYPE),
.slots = pycarray_type_type_slots,
};

/******************************************************************/
/*
Expand Down Expand Up @@ -2557,46 +2466,21 @@ PyCFuncPtrType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
return (PyObject *)result;
}

PyTypeObject PyCFuncPtrType_Type = {
PyVarObject_HEAD_INIT(NULL, 0)
"_ctypes.PyCFuncPtrType", /* tp_name */
0, /* tp_basicsize */
0, /* tp_itemsize */
0, /* tp_dealloc */
0, /* tp_vectorcall_offset */
0, /* tp_getattr */
0, /* tp_setattr */
0, /* tp_as_async */
0, /* tp_repr */
0, /* tp_as_number */
&CDataType_as_sequence, /* tp_as_sequence */
0, /* tp_as_mapping */
0, /* tp_hash */
0, /* tp_call */
0, /* tp_str */
0, /* tp_getattro */
0, /* tp_setattro */
0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC, /* tp_flags */
PyDoc_STR("metatype for C function pointers"), /* tp_doc */
(traverseproc)CDataType_traverse, /* tp_traverse */
(inquiry)CDataType_clear, /* tp_clear */
0, /* tp_richcompare */
0, /* tp_weaklistoffset */
0, /* tp_iter */
0, /* tp_iternext */
CDataType_methods, /* tp_methods */
0, /* tp_members */
0, /* tp_getset */
0, /* tp_base */
0, /* tp_dict */
0, /* tp_descr_get */
0, /* tp_descr_set */
0, /* tp_dictoffset */
0, /* tp_init */
0, /* tp_alloc */
PyCFuncPtrType_new, /* tp_new */
0, /* tp_free */
static PyType_Slot pycfunc_ptr_type_type_slots[] = {
{Py_sq_repeat, CDataType_repeat},
{Py_tp_doc, PyDoc_STR("metatype for C function pointers")},
{Py_tp_traverse, CDataType_traverse},
{Py_tp_clear, CDataType_clear},
{Py_tp_methods, CDataType_methods},
{Py_tp_new, PyCFuncPtrType_new},
Comment thread
aisk marked this conversation as resolved.
Outdated
{0, NULL},
};

static PyType_Spec pycfunc_ptr_type_type_spec = {
.name = "_ctypes.PyCFuncPtrType",
.flags = (Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC |
Py_TPFLAGS_IMMUTABLETYPE),
.slots = pycfunc_ptr_type_type_slots,
};


Expand Down Expand Up @@ -4863,7 +4747,8 @@ PyCArrayType_from_ctype(PyObject *itemtype, Py_ssize_t length)
((PyTypeObject *)itemtype)->tp_name, (long)length);
#endif

result = PyObject_CallFunction((PyObject *)&PyCArrayType_Type,
ctypes_state *st = GLOBAL_STATE();
result = PyObject_CallFunction((PyObject *)st->PyCArrayType_Type,
"s(O){s:n,s:O}",
name,
&PyCArray_Type,
Expand Down Expand Up @@ -5672,26 +5557,29 @@ _ctypes_add_types(PyObject *mod)
*
* Metaclasses
*/
TYPE_READY_BASE(&PyCStructType_Type, &PyType_Type);
TYPE_READY_BASE(&UnionType_Type, &PyType_Type);
TYPE_READY_BASE(&PyCPointerType_Type, &PyType_Type);
TYPE_READY_BASE(&PyCArrayType_Type, &PyType_Type);
// TYPE_READY_BASE(&PyCSimpleType_Type, &PyType_Type);
CREATE_TYPE(mod, st->PyCStructType_Type, &pycstruct_type_type_spec,
&PyType_Type);
CREATE_TYPE(mod, st->UnionType_Type, &union_type_type_spec, &PyType_Type);
CREATE_TYPE(mod, st->PyCPointerType_Type, &pycpointer_type_type_spec,
&PyType_Type);
CREATE_TYPE(mod, st->PyCArrayType_Type, &pycarray_type_type_spec,
&PyType_Type);
CREATE_TYPE(mod, st->PyCSimpleType_Type, &pycsimple_type_type_spec,
&PyType_Type);
TYPE_READY_BASE(&PyCFuncPtrType_Type, &PyType_Type);
CREATE_TYPE(mod, st->PyCFuncPtrType_Type, &pycfunc_ptr_type_type_spec,
&PyType_Type);

/*************************************************
*
* Classes using a custom metaclass
*/

MOD_ADD_TYPE(&Struct_Type, &PyCStructType_Type, &PyCData_Type);
MOD_ADD_TYPE(&Union_Type, &UnionType_Type, &PyCData_Type);
MOD_ADD_TYPE(&PyCPointer_Type, &PyCPointerType_Type, &PyCData_Type);
MOD_ADD_TYPE(&PyCArray_Type, &PyCArrayType_Type, &PyCData_Type);
MOD_ADD_TYPE(&Struct_Type, st->PyCStructType_Type, &PyCData_Type);
MOD_ADD_TYPE(&Union_Type, st->UnionType_Type, &PyCData_Type);
MOD_ADD_TYPE(&PyCPointer_Type, st->PyCPointerType_Type, &PyCData_Type);
MOD_ADD_TYPE(&PyCArray_Type, st->PyCArrayType_Type, &PyCData_Type);
MOD_ADD_TYPE(&Simple_Type, st->PyCSimpleType_Type, &PyCData_Type);
MOD_ADD_TYPE(&PyCFuncPtr_Type, &PyCFuncPtrType_Type, &PyCData_Type);
MOD_ADD_TYPE(&PyCFuncPtr_Type, st->PyCFuncPtrType_Type, &PyCData_Type);

/*************************************************
*
Expand Down
Loading