8000 gh-103092: Port some `_ctypes` data types to heap types by neonene · Pull Request #113630 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-103092: Port some _ctypes data types to heap types #113630

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 20 commits into from
Closed

gh-103092: Port some _ctypes data types to heap types #113630

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
8bb0d97
PyCSimpleType_new() -> init()
neonene Jan 1, 2024
45795e4
Make Simple_Type a heap type
neonene Jan 1, 2024
550e467
reconsider Simple_traverse()
neonene Jan 2, 2024
6f005f4
warning
neonene Jan 2, 2024
ae9e2f5
non-fix edit
neonene Jan 2, 2024
68d308b
fixes a critical typo
neonene Jan 2, 2024
282d5d4
base check (for now)
neonene Jan 2, 2024
525de82
cleanup
neonene Jan 2, 2024
d92e896
nit
neonene Jan 2, 2024
b5c2b40
convert PyCData_Type family to heap types
neonene Jan 3, 2024
4a9dfe4
CIFuzz friendly
neonene Jan 3, 2024
a1752d4
minor adjustments
neonene Jan 5, 2024
442194a
drop heap type check
neonene Jan 6, 2024
c80223f
Merge branch 'main' into ctypes_simple
neonene Jan 19, 2024
e817dc2
sync callbacks.c with main
neonene Jan 19, 2024
06f81a0
reduce diff
neonene Jan 21, 2024
5354ffb
revert globals-to-fix.tsv
neonene Jan 21, 2024
724f893
nit
neonene Jan 21, 2024
b9d2452
Merge branch 'main' into ctypes_simple
neonene Jan 22, 2024
ea8bc12
Merge branch 'python:main' into ctypes_simple
neonene Jan 27, 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
Make Simple_Type a heap type
  • Loading branch information
@neonene
neonene committed Jan 1, 2024
commit 45795e475ff37f34d39c70ab2d9a799066ed4f73
149 changes: 74 additions & 75 deletions Modules/_ctypes/_ctypes.c
View file
Open in desktop
8000
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,6 @@ PyObject *PyExc_ArgError = NULL;
/* This dict maps ctypes types to POINTER types */
PyObject *_ctypes_ptrtype_cache = NULL;

static PyTypeObject Simple_Type;

/* a callable object used for unpickling:
strong reference to _ctypes._unpickle() function */
static PyObject *_unpickle;
Expand Down Expand Up @@ -2029,16 +2027,6 @@ PyCSimpleType_paramfunc(CDataObject *self)
return parg;
}

static PyObject *
PyCSimpleType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
{
PyObject *result = PyType_Type.tp_new(type, args, kwds);
#if 0
printf("new: %p %p\n", type, result);
#endif
return result;
}

static int
PyCSimpleType_init(PyObject *self, PyObject *args, PyObject *kwds)
{
Expand All @@ -2054,9 +2042,8 @@ PyCSimpleType_init(PyObject *self, PyObject *args, PyObject *kwds)
since we are a metatype!) */
result = (PyTypeObject *)self; // by PyType_Type.tp_new()
PyTypeObject *type = Py_TYPE(self);
#if 0
printf("ini: %p %p\n\n", type, result);
#endif

ctypes_state *st = GLOBAL_STATE();

if (PyObject_GetOptionalAttr((PyObject *)result, &_Py_ID(_type_), &proto) < 0) {
return -1;
Expand Down Expand Up @@ -2140,7 +2127,7 @@ PyCSimpleType_init(PyObject *self, PyObject *args, PyObject *kwds)
/* Install from_param class methods in ctypes base classes.
Overrides the PyCSimpleType_from_param generic method.
*/
if (result->tp_base == &Simple_Type) {
if (result->tp_base == st->Simple_Type) {
switch (*proto_str) {
case 'z': /* c_char_p */
ml = &c_char_p_method;
Expand Down Expand Up @@ -2335,7 +2322,7 @@ PyTypeObject PyCSimpleType_Type = {
0, /* tp_dictoffset */
(initproc)PyCSimpleType_init, /* tp_init */
0, /* tp_alloc */
PyCSimpleType_new, /* tp_new */
0, /* tp_new */
0, /* tp_free */
};

Expand Down Expand Up @@ -3047,9 +3034,10 @@ PyCData_AtAddress(PyObject *type, void *buf)
int _ctypes_simple_instance(PyObject *obj)
{
PyTypeObject *type = (PyTypeObject *)obj;

if (PyCSimpleTypeObject_Check(type))
return type->tp_base != &Simple_Type;
ctypes_state *st = GLOBAL_STATE();
if (PyCSimpleTypeObject_Check(type)) {
return type->tp_base != st->Simple_Type;
}
return 0;
}

Expand Down Expand Up @@ -4982,26 +4970,14 @@ static int Simple_bool(CDataObject *self)
return memcmp(self->b_ptr, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", self->b_size);
}

static PyNumberMethods Simple_as_number = {
0, /* nb_add */
0, /* nb_subtract */
0, /* nb_multiply */
0, /* nb_remainder */
0, /* nb_divmod */
0, /* nb_power */
0, /* nb_negative */
0, /* nb_positive */
0, /* nb_absolute */
(inquiry)Simple_bool, /* nb_bool */
};

/* "%s(%s)" % (self.__class__.__name__, self.value) */
static PyObject *
Simple_repr(CDataObject *self)
{
PyObject *val, *result;
ctypes_state *st = GLOBAL_STATE();

if (Py_TYPE(self)->tp_base != &Simple_Type) {
if (Py_TYPE(self)->tp_base != st->Simple_Type) {
return PyUnicode_FromFormat("<%s object at %p>",
Py_TYPE(self)->tp_name, self);
}
Expand All @@ -5016,46 +4992,54 @@ Simple_repr(CDataObject *self)
return result;
}

static PyTypeObject Simple_Type = {
PyVarObject_HEAD_INIT(NULL, 0)
"_ctypes._SimpleCData",
sizeof(CDataObject), /* tp_basicsize */
0, /* tp_itemsize */
0, /* tp_dealloc */
0, /* tp_vectorcall_offset */
0, /* tp_getattr */
0, /* tp_setattr */
0, /* tp_as_async */
(reprfunc)&Simple_repr, /* tp_repr */
&Simple_as_number, /* tp_as_number */
0, /* tp_as_sequence */
0, /* tp_as_mapping */
0, /* tp_hash */
0, /* tp_call */
0, /* tp_str */
0, /* tp_getattro */
0, /* tp_setattro */
&PyCData_as_buffer, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
PyDoc_STR("XXX to be provided"), /* tp_doc */
(traverseproc)PyCData_traverse, /* tp_traverse */
(inquiry)PyCData_clear, /* tp_clear */
0, /* tp_richcompare */
0, /* tp_weaklistoffset */
0, /* tp_iter */
0, /* tp_iternext */
Simple_methods, /* tp_methods */
0, /* tp_members */
Simple_getsets, /* tp_getset */
0, /* tp_base */
0, /* tp_dict */
0, /* tp_descr_get */
0, /* tp_descr_set */
0, /* tp_dictoffset */
(initproc)Simple_init, /* tp_init */
0, /* tp_alloc */
GenericPyCData_new, /* tp_new */
0, /* tp_free */
static int
Simple_traverse(CDataObject *self, visitproc visit, void *arg)
{
PyTypeObject *base = Py_TYPE(self)->tp_base;
if (!base || !PyType_HasFeature(base, Py_TPFLAGS_HEAPTYPE)) {
Py_VISIT(self);
}
return 0;
}

static int
Simple_clear(CDataObject *self)
{
PyCData_clear(self);
return 0;
}

static void
Simple_dealloc(PyObject *self) {
PyTypeObject *tp = Py_TYPE(self);
PyObject_GC_UnTrack(self);
Simple_clear((CDataObject *)self);
tp->tp_free(self);
Py_DECREF(tp);
}

static PyType_Slot simple_slots[] = {
{Py_tp_repr, Simple_repr},
{Py_bf_getbuffer, PyCData_NewGetBuffer},
{Py_tp_methods, Simple_methods},
{Py_tp_getset, Simple_getsets},
{Py_tp_new, GenericPyCData_new},
{Py_tp_init, Simple_init},
{Py_tp_traverse, Simple_traverse},
{Py_tp_clear, Simple_clear},
{Py_tp_dealloc, Simple_dealloc},
{Py_nb_bool, Simple_bool},
{0, NULL},
};

static PyType_Spec simple_spec = {
.name = "_ctypes._SimpleCData",
.basicsize = sizeof(CDataObject),
.flags = (Py_TPFLAGS_DEFAULT |
Py_TPFLAGS_BASETYPE |
Py_TPFLAGS_HAVE_GC |
Py_TPFLAGS_IMMUTABLETYPE),
.slots = simple_slots,
};

/******************************************************************/
Expand Down Expand Up @@ -5679,6 +5663,19 @@ _ctypes_add_types(PyObject *mod)
TP = (PyTypeObject *)type; \
} while (0)

#define MOD_ADD_HEAPTYPE(TP, SPEC, BASE, TP_TYPE) do { \
PyObject *type = PyType_FromMetaclass(TP_TYPE, mod, SPEC, \
(PyObject *)BASE); \
if (type == NULL) { \
return -1; \
} \
if (PyModule_AddType(mod, (PyTypeObject *)type) < 0) { \
Py_DECREF(type); \
return -1; \
} \
TP = (PyTypeObject *)type; \
} while (0)

ctypes_state *st = GLOBAL_STATE();

/* Note:
Expand Down Expand Up @@ -5711,7 +5708,8 @@ _ctypes_add_types(PyObject *mod)
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(&Simple_Type, &PyCSimpleType_Type, &PyCData_Type);
MOD_ADD_HEAPTYPE(st->Simple_Type, &simple_spec, &PyCData_Type,
&PyCSimpleType_Type);
MOD_ADD_TYPE(&PyCFuncPtr_Type, &PyCFuncPtrType_Type, &PyCData_Type);

/*************************************************
Expand All @@ -5737,6 +5735,7 @@ _ctypes_add_types(PyObject *mod)
#undef TYPE_READY_BASE
#undef MOD_ADD_TYPE
#undef CREATE_TYPE
#undef MOD_ADD_HEAPTYPE
return 0;
}

Expand Down
1 change: 1 addition & 0 deletions Modules/_ctypes/ctypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ typedef struct {
PyTypeObject *PyComError_Type;
#endif
PyTypeObject *StructParam_Type;
PyTypeObject *Simple_Type;
} ctypes_state;

extern ctypes_state global_state;
Expand Down
1 change: 0 additions & 1 deletion Tools/c-analyzer/cpython/globals-to-fix.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,6 @@ Modules/_ctypes/_ctypes.c - PyCPointerType_Type -
Modules/_ctypes/_ctypes.c - PyCPointer_Type -
Modules/_ctypes/_ctypes.c - PyCSimpleType_Type -
Modules/_ctypes/_ctypes.c - PyCStructType_Type -
Modules/_ctypes/_ctypes.c - Simple_Type -
Modules/_ctypes/_ctypes.c - Struct_Type -
Modules/_ctypes/_ctypes.c - UnionType_Type -
Modules/_ctypes/_ctypes.c - Union_Type -
Expand Down
0