8000 bpo-46323: Use PyObject_Vectorcall while calling ctypes callback function by corona10 · Pull Request #31138 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

bpo-46323: Use PyObject_Vectorcall while calling ctypes callback function #31138

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 10 commits into from
Feb 8, 2022
Merged

bpo-46323: Use PyObject_Vectorcall while calling ctypes callback function #31138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
53bcb97
bpo-46323: Use PyObject_Vectorcall while calling ctypes callback funtion
corona10 Feb 5, 2022
403b94a
bpo-46323: Check lint
corona10 Feb 5, 2022
eba3eea
bpo-46323: fix typo
corona10 Feb 5, 2022
e11a6ab
bpo-46323 Address Victor's suggestion
corona10 Feb 5, 2022
43cc3d8
bpo-46323: Use PySequence_Fast_ITEMS if possible
corona10 Feb 7, 2022
afd67eb
bpo-46323 nit
corona10 Feb 7, 2022
4b18483
bpo-46323 Address code review
corona10 Feb 8, 2022
fad4210
bpo-46323 Address code review
corona10 Feb 8, 2022
dae7d5b
bpo-46323 Address code review
corona10 Feb 8, 2022
c4db624
bpo-46323 Update
corona10 Feb 8, 2022
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
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Core and Builtins/2022-02-05-14-46-21.bpo-46323.FC1OJg.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Use :c:func:`PyObject_Vectorcall` while calling ctypes callback function.
Patch by Dong-hee Na.
78 changes: 40 additions & 38 deletions Modules/_ctypes/callbacks.c
View file
Open in desktop
8000
Original file line number Diff line number Diff line change
Expand Up @@ -146,47 +146,48 @@ static void _CallPythonObject(void *mem,
int flags,
void **pArgs)
{
Py_ssize_t i;
PyObject *result;
PyObject *arglist = NULL;
Py_ssize_t nArgs;
PyObject *result = NULL;
PyObject **args = NULL;
Py_ssize_t i = 0, j = 0, nargs = 0;
PyObject *error_object = NULL;
int *space;
PyGILState_STATE state = PyGILState_Ensure();

nArgs = PySequence_Length(converters);
assert(PyTuple_Check(converters));
nargs = PyTuple_GET_SIZE(converters);
/* Hm. What to return in case of error?
For COM, 0xFFFFFFFF seems better than 0.
*/
Comment on lines 158 to 160
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This comment is now misleading; it should be removed. Previously, PySequence_Length could return -1 on error, but PyTuple_GET_SIZE always succeeds (or, more correct: it does no error checking).

if (nArgs < 0) {
if (nargs < 0) {
PrintError("BUG: PySequence_Length");
goto Done;
}

arglist = PyTuple_New(nArgs);
if (!arglist) {
PrintError("PyTuple_New()");
goto Done;
PyObject *args_stack[CTYPES_MAX_ARGCOUNT];
if (nargs <= CTYPES_MAX_ARGCOUNT) {
args = args_stack;
}
for (i = 0; i < nArgs; ++i) {
/* Note: new reference! */
PyObject *cnv = PySequence_GetItem(converters, i);
StgDictObject *dict;
if (cnv)
dict = PyType_stgdict(cnv);
else {
PrintError("Getting argument converter %zd\n", i);
else {
args = PyMem_Malloc(nargs * sizeof(PyObject *));
if (args == NULL) {
PyErr_NoMemory();
goto Done;
}
}

PyObject **cnvs = PySequence_Fast_ITEMS(converters);
for (i = 0; i < nargs; i++) {
PyObject *cnv = cnvs[i]; // borrowed ref
StgDictObject *dict;
dict = PyType_stgdict(cnv);

if (dict && dict->getfunc && !_ctypes_simple_instance(cnv)) {
PyObject *v = dict->getfunc(*pArgs, dict->size);
if (!v) {
PrintError("create argument %zd:\n", i);
Py_DECREF(cnv);
goto Done;
}
PyTuple_SET_ITEM(arglist, i, v);
args[i] = v;
/* XXX XXX XX
We have the problem that c_byte or c_short have dict->size of
1 resp. 4, but these parameters are pushed as sizeof(int) bytes.
Expand All @@ -202,23 +203,20 @@ static void _CallPythonObject(void *mem,
}
if (!CDataObject_Check(obj)) {
Py_DECREF(obj);
Py_DECREF(cnv);
PrintError("unexpected result of create argument %zd:\n", i);
goto Done;
}
memcpy(obj->b_ptr, *pArgs, dict->size);
PyTuple_SET_ITEM(arglist, i, (PyObject *)obj);
args[i] = (PyObject *)obj;
#ifdef MS_WIN32
TryAddRef(dict, obj);
#endif
} else {
PyErr_SetString(PyExc_TypeError,
"cannot build parameter");
PrintError("Parsing argument %zd\n", i);
Py_DECREF(cnv);
goto Done;
}
Py_DECREF(cnv);
/* XXX error handling! */
pArgs++;
}
Expand All @@ -241,7 +239,7 @@ static void _CallPythonObject(void *mem,
#endif
}

result = PyObject_CallObject(callable, arglist);
result = PyObject_Vectorcall(callable, args, nargs, NULL);
if (result == NULL) {
_PyErr_WriteUnraisableMsg("on calling ctypes callback function",
callable);
Expand Down Expand Up @@ -308,7 +306,12 @@ static void _CallPythonObject(void *mem,
Py_XDECREF(result);

Done:
Py_XDECREF(arglist);
for (j = 0; j < i; j++) {
Py_DECREF(args[j]);
}
if (args != args_stack) {
PyMem_Free(args);
}
PyGILState_Release(state);
}

Expand All @@ -328,12 +331,12 @@ static void closure_fcn(ffi_cif *cif,
args);
}

static CThunkObject* CThunkObject_new(Py_ssize_t nArgs)
static CThunkObject* CThunkObject_new(Py_ssize_t nargs)
{
CThunkObject *p;
Py_ssize_t i;

p = PyObject_GC_NewVar(CThunkObject, &PyCThunk_Type, nArgs);
p = PyObject_GC_NewVar(CThunkObject, &PyCThunk_Type, nargs);
if (p == NULL) {
return NULL;
}
Expand All @@ -348,7 +351,7 @@ static CThunkObject* CThunkObject_new(Py_ssize_t nArgs)
p->setfunc = NULL;
p->ffi_restype = NULL;

for (i = 0; i < nArgs + 1; ++i)
for (i = 0; i < nargs + 1; ++i)
p->atypes[i] = NULL;
PyObject_GC_Track((PyObject *)p);
return p;
Expand All @@ -361,11 +364,12 @@ CThunkObject *_ctypes_alloc_callback(PyObject *callable,
{
int result;
CThunkObject *p;
Py_ssize_t nArgs, i;
Py_ssize_t nargs, i;
ffi_abi cc;

nArgs = PySequence_Size(converters);
p = CThunkObject_new(nArgs);
assert(PyTuple_Check(converters));
nargs = PyTuple_GET_SIZE(converters);
p = CThunkObject_new(nargs);
if (p == NULL)
return NULL;

Expand All @@ -378,12 +382,10 @@ CThunkObject *_ctypes_alloc_callback(PyObject *callable,
}

p->flags = flags;
for (i = 0; i < nArgs; ++i) {
PyObject *cnv = PySequence_GetItem(converters, i);
if (cnv == NULL)
goto error;
PyObject **cnvs = PySequence_Fast_ITEMS(converters);
for (i = 0; i < nargs; ++i) {
PyObject *cnv = cnvs[i]; // borrowed ref
p->atypes[i] = _ctypes_get_ffi_type(cnv);
Py_DECREF(cnv);
}
p->atypes[i] = NULL;

Expand All @@ -409,7 +411,7 @@ CThunkObject *_ctypes_alloc_callback(PyObject *callable,
cc = FFI_STDCALL;
#endif
result = ffi_prep_cif(&p->cif, cc,
Py_SAFE_DOWNCAST(nArgs, Py_ssize_t, int),
Py_SAFE_DOWNCAST(nargs, Py_ssize_t, int),
_ctypes_get_ffi_type(restype),
&p->atypes[0]);
if (result != FFI_OK) {
Expand Down
0