8000 gh-103092: Isolate _ctypes, part 1 by erlend-aasland · Pull Request #103893 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-103092: Isolate _ctypes, part 1 #103893

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
merged 9 commits into from
Apr 27, 2023
Merged

gh-103092: Isolate _ctypes, part 1 #103893

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1206b13
Establish global state
erlend-aasland Mar 24, 2023
1371dbd
Adapt DictRemover type
erlend-aasland Mar 24, 2023
0e39150
Adapt PyCArg type
erlend-aasland Mar 28, 2023
90b5c8f
Adapt PyCThunk type
erlend-aasland Apr 26, 2023
bcd391f
Adapt PyCField type
erlend-aasland Apr 26, 2023
a0d3a68
Adapt StructParam type
erlend-aasland Apr 26, 2023
77882d6
Clean up macro
erlend-aasland Apr 26, 2023
e5ce31a
Add global state to c analyzer
erlend-aasland Apr 26, 2023
a276753
Fix 'has no __module__ attribute' warning
erlend-aasland Apr 26, 2023
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
Adapt PyCArg type
  • Loading branch information
@erlend-aasland
erlend-aasland committed Apr 26, 2023
commit 0e391509d8292ccf5625e951d4df756e470d5216
17 changes: 11 additions & 6 deletions Modules/_ctypes/_ctypes.c
View file
Open in desktop
10000
Original file line number Diff line number Diff line change
Expand Up @@ -798,7 +798,8 @@ CDataType_from_param(PyObject *type, PyObject *value)
if (res) {
return Py_NewRef(value);
}
if (PyCArg_CheckExact(value)) {
ctypes_state *st = GLOBAL_STATE();
if (PyCArg_CheckExact(st, value)) {
PyCArgObject *p = (PyCArgObject *)value;
PyObject *ob = p->obj;
const char *ob_name;
Expand Down Expand Up @@ -1681,7 +1682,8 @@ c_wchar_p_from_param(PyObject *type, PyObject *value)
return Py_NewRef(value);
}
}
if (PyCArg_CheckExact(value)) {
ctypes_state *st = GLOBAL_STATE();
if (PyCArg_CheckExact(st, value)) {
/* byref(c_char(...)) */
PyCArgObject *a = (PyCArgObject *)value;
StgDictObject *dict = PyObject_stgdict(a->obj);
Expand Down Expand Up @@ -1744,7 +1746,8 @@ c_char_p_from_param(PyObject *type, PyObject *value)
return Py_NewRef(value);
}
}
if (PyCArg_CheckExact(value)) {
ctypes_state *st = GLOBAL_STATE();
if (PyCArg_CheckExact(st, value)) {
/* byref(c_char(...)) */
PyCArgObject *a = (PyCArgObject *)value;
StgDictObject *dict = PyObject_stgdict(a->obj);
Expand Down Expand Up @@ -1845,7 +1848,8 @@ c_void_p_from_param(PyObject *type, PyObject *value)
return Py_NewRef(value);
}
/* byref(...) */
if (PyCArg_CheckExact(value)) {
ctypes_state *st = GLOBAL_STATE();
if (PyCArg_CheckExact(st, value)) {
/* byref(c_xxx()) */
PyCArgObject *a = (PyCArgObject *)value;
if (a->tag == 'P') {
Expand Down Expand Up @@ -5642,11 +5646,13 @@ _ctypes_add_types(PyObject *mod)
TP = (PyTypeObject *)type; \
} while (0)

ctypes_state *st = GLOBAL_STATE();

/* Note:
ob_type is the metatype (the 'type'), defaults to PyType_Type,
tp_base is the base type, defaults to 'object' aka PyBaseObject_Type.
*/
TYPE_READY(&PyCArg_Type);
CREATE_TYPE(mod, st->PyCArg_Type, &carg_spec);
TYPE_READY(&PyCThunk_Type);
TYPE_READY(&PyCData_Type);
/* StgDict is derived from PyDict_Type */
Expand Down Expand Up @@ -5688,7 +5694,6 @@ _ctypes_add_types(PyObject *mod)
* Other stuff
*/

ctypes_state *st = GLOBAL_STATE();
CREATE_TYPE(mod, st->DictRemover_Type, &dictremover_spec);
TYPE_READY(&StructParam_Type);

Expand Down
74 changes: 40 additions & 34 deletions Modules/_ctypes/callproc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,21 +469,41 @@ PyCArgObject *
PyCArgObject_new(void)
{
PyCArgObject *p;
p = PyObject_New(PyCArgObject, &PyCArg_Type);
ctypes_state *st = GLOBAL_STATE();
p = PyObject_GC_New(PyCArgObject, st->PyCArg_Type);
if (p == NULL)
return NULL;
p->pffi_type = NULL;
p->tag = '\0';
p->obj = NULL;
memset(&p->value, 0, sizeof(p->value));
PyObject_GC_Track(p);
return p;
}

static int
PyCArg_traverse(PyCArgObject *self, visitproc visit, void *arg)
{
Py_VISIT(Py_TYPE(self));
Py_VISIT(self->obj);
return 0;
}

static int
PyCArg_clear(PyCArgObject *self)
{
Py_CLEAR(self->obj);
return 0;
}

static void
PyCArg_dealloc(PyCArgObject *self)
{
Py_XDECREF(self->obj);
PyObject_Free(self);
PyTypeObject *tp = Py_TYPE(self);
PyObject_GC_UnTrack(self);
(void)PyCArg_clear(self);
tp->tp_free((PyObject *)self);
Py_DECREF(tp);
}

static int
Expand Down Expand Up @@ -567,36 +587,21 @@ static PyMemberDef PyCArgType_members[] = {
{ NULL },
};

PyTypeObject PyCArg_Type = {
PyVarObject_HEAD_INIT(NULL, 0)
"CArgObject",
sizeof(PyCArgObject),
0,
(destructor)PyCArg_dealloc, /* tp_dealloc */
0, /* tp_vectorcall_offset */
0, /* tp_getattr */
0, /* tp_setattr */
0, /* tp_as_async */
(reprfunc)PyCArg_repr, /* tp_repr */
0, /* 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 */
0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT, /* tp_flags */
0, /* tp_doc */
0, /* tp_traverse */
0, /* tp_clear */
0, /* tp_richcompare */
0, /* tp_weaklistoffset */
0, /* tp_iter */
0, /* tp_iternext */
0, /* tp_methods */
PyCArgType_members, /* tp_members */
static PyType_Slot carg_slots[] = {
{Py_tp_dealloc, PyCArg_dealloc},
{Py_tp_traverse, PyCArg_traverse},
{Py_tp_clear, PyCArg_clear},
{Py_tp_repr, PyCArg_repr},
{Py_tp_members, PyCArgType_members},
{0, NULL},
};

PyType_Spec carg_spec = {
.name = "CArgObject",
.basicsize = sizeof(PyCArgObject),
.flags = (Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC |
Py_TPFLAGS_IMMUTABLETYPE | Py_TPFLAGS_DISALLOW_INSTANTIATION),
.slots = carg_slots,
};

/****************************************************************/
Expand Down Expand Up @@ -669,7 +674,8 @@ static int ConvParam(PyObject *obj, Py_ssize_t index, struct argument *pa)
return 0;
}

if (PyCArg_CheckExact(obj)) {
ctypes_state *st = GLOBAL_STATE();
if (PyCArg_CheckExact(st, obj)) {
PyCArgObject *carg = (PyCArgObject *)obj;
pa->ffi_type = carg->pffi_type;
pa->keep = Py_NewRef(obj);
Expand Down
6 changes: 4 additions & 2 deletions Modules/_ctypes/ctypes.h
View file
Open in desktop
53B8
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,15 @@

typedef struct {
PyTypeObject *DictRemover_Type;
PyTypeObject *PyCArg_Type;
} ctypes_state;

extern ctypes_state global_state;

#define GLOBAL_STATE() (&global_state)

extern PyType_Spec carg_spec;

typedef struct tagPyCArgObject PyCArgObject;
typedef struct tagCDataObject CDataObject;
typedef PyObject *(* GETFUNC)(void *, Py_ssize_t size);
Expand Down Expand Up @@ -342,8 +345,7 @@ struct tagPyCArgObject {
Py_ssize_t size; /* for the 'V' tag */
};

extern PyTypeObject PyCArg_Type;
#define PyCArg_CheckExact(v) Py_IS_TYPE(v, &PyCArg_Type)
#define PyCArg_CheckExact(st, v) Py_IS_TYPE(v, st->PyCArg_Type)
extern PyCArgObject *PyCArgObject_new(void);

extern PyObject *
Expand Down
0