Skip to content

gh-151157: Speed up PyObject_CallMethod via _PyObject_GetMethod #151158

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

Open
eendebakpt wants to merge 1 commit into
base: main
Choose a base branch
from
+72 −50
Open

gh-151157: Speed up PyObject_CallMethod via _PyObject_GetMethod #151158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 0 additions & 6 deletions Include/internal/pycore_call.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,6 @@ extern PyObject* _PyObject_Call(
PyObject *args,
PyObject *kwargs);

extern PyObject * _PyObject_CallMethodFormat(
PyThreadState *tstate,
PyObject *callable,
const char *format,
...);

// Export for 'array' shared extension
PyAPI_FUNC(PyObject*) _PyObject_CallMethod(
PyObject *obj,
Expand Down
111 changes: 70 additions & 41 deletions Objects/call.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,18 +612,66 @@ _PyObject_CallFunction_SizeT(PyObject *callable, const char *format, ...)
}


static PyObject*
callmethod(PyThreadState *tstate, PyObject* callable, const char *format, va_list va)
/* Resolve 'name' on 'obj' with _PyObject_GetMethod and call it directly,
avoiding the bound-method object that PyObject_GetAttr()+call would allocate. */
static PyObject *
callmethod_va(PyObject *obj, PyObject *name,
const char *format, va_list va)
{
assert(callable != NULL);
if (!PyCallable_Check(callable)) {
PyThreadState *tstate = _PyThreadState_GET();

PyObject *method = NULL;
/* unbound: 1 -> 'method' is an unbound function, call method(obj, *args);
0 -> 'method' is the resolved attribute, call method(*args). */
int unbound = _PyObject_GetMethod(obj, name, &method);
if (method == NULL) {
return NULL;
}
if (!PyCallable_Check(method)) {
_PyErr_Format(tstate, PyExc_TypeError,
"attribute of type '%.200s' is not callable",
Py_TYPE(callable)->tp_name);
Py_TYPE(method)->tp_name);
Py_DECREF(method);
return NULL;
}

return _PyObject_CallFunctionVa(tstate, callable, format, va);
/* Build the positional arguments from the format string. */
PyObject *small_stack[_PY_FASTCALL_SMALL_STACK];
Py_ssize_t nargs = 0;
PyObject **built = NULL;
if (format != NULL && *format != '\0') {
built = _Py_VaBuildStack(small_stack, _PY_FASTCALL_SMALL_STACK,
format, va, &nargs);
if (built == NULL) {
Py_DECREF(method);
return NULL;
}
}

/* Backward compat: a single tuple from "O" is unpacked. */
PyObject *const *args = built;
Py_ssize_t n = nargs;
if (nargs == 1 && PyTuple_Check(built[0])) {
args = _PyTuple_ITEMS(built[0]);
n = PyTuple_GET_SIZE(built[0]);
}

PyObject *result;
if (unbound) {
result = _PyObject_VectorcallPrepend(tstate, method, obj, args, n, NULL);
}
else {
result = _PyObject_VectorcallTstate(tstate, method, args, n, NULL);
}

for (Py_ssize_t i = 0; i < nargs; i++) {
Py_DECREF(built[i]);
}
if (built != NULL && built != small_stack) {
PyMem_Free(built);
}
Py_DECREF(method);
return result;
}

PyObject *
Expand All @@ -635,17 +683,17 @@ PyObject_CallMethod(PyObject *obj, const char *name, const char *format, ...)
return null_error(tstate);
}

PyObject *callable = PyObject_GetAttrString(obj, name);
if (callable == NULL) {
PyObject *name_obj = PyUnicode_FromString(name);
if (name_obj == NULL) {
return NULL;
}

va_list va;
va_start(va, format);
PyObject *retval = callmethod(tstate, callable, format, va);
PyObject *retval = callmethod_va(obj, name_obj, format, va);
va_end(va);

Py_DECREF(callable);
Py_DECREF(name_obj);
return retval;
}

Expand All @@ -660,17 +708,17 @@ PyEval_CallMethod(PyObject *obj, const char *name, const char *format, ...)
return null_error(tstate);
}

PyObject *callable = PyObject_GetAttrString(obj, name);
if (callable == NULL) {
PyObject *name_obj = PyUnicode_FromString(name);
if (name_obj == NULL) {
return NULL;
}

va_list va;
va_start(va, format);
PyObject *retval = callmethod(tstate, callable, format, va);
PyObject *retval = callmethod_va(obj, name_obj, format, va);
va_end(va);

Py_DECREF(callable);
Py_DECREF(name_obj);
return retval;
}

Expand All @@ -684,17 +732,11 @@ _PyObject_CallMethod(PyObject *obj, PyObject *name,
return null_error(tstate);
}

PyObject *callable = PyObject_GetAttr(obj, name);
if (callable == NULL) {
return NULL;
}

va_list va;
va_start(va, format);
PyObject *retval = callmethod(tstate, callable, format, va);
PyObject *retval = callmethod_va(obj, name, format, va);
va_end(va);

Py_DECREF(callable);
return retval;
}

Expand All @@ -710,30 +752,17 @@ _PyObject_CallMethodId(PyObject *obj, _Py_Identifier *name,

_Py_COMP_DIAG_PUSH
_Py_COMP_DIAG_IGNORE_DEPR_DECLS
PyObject *callable = _PyObject_GetAttrId(obj, name);
PyObject *name_obj = _PyUnicode_FromId(name); /* borrowed */
_Py_COMP_DIAG_POP
if (callable == NULL) {
if (name_obj == NULL) {
return NULL;
}

va_list va;
va_start(va, format);
PyObject *retval = callmethod(tstate, callable, format, va);
PyObject *retval = callmethod_va(obj, name_obj, format, va);
va_end(va);

Py_DECREF(callable);
return retval;
}


PyObject * _PyObject_CallMethodFormat(PyThreadState *tstate, PyObject *callable,
const char *format, ...)
{
assert(callable != NULL);
va_list va;
va_start(va, format);
PyObject *retval = callmethod(tstate, callable, format, va);
va_end(va);
return retval;
}

Expand All @@ -749,17 +778,17 @@ _PyObject_CallMethod_SizeT(PyObject *obj, const char *name,
return null_error(tstate);
}

PyObject *callable = PyObject_GetAttrString(obj, name);
if (callable == NULL) {
PyObject *name_obj = PyUnicode_FromString(name);
if (name_obj == NULL) {
return NULL;
}

va_list va;
va_start(va, format);
PyObject *retval = callmethod(tstate, callable, format, va);
PyObject *retval = callmethod_va(obj, name_obj, format, va);
va_end(va);

Py_DECREF(callable);
Py_DECREF(name_obj);
return retval;
}

Expand Down
5 changes: 2 additions & 3 deletions Python/traceback.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/* Traceback implementation */

#include "Python.h"
#include "pycore_call.h" // _PyObject_CallMethodFormat()
#include "pycore_call.h" // _PyObject_CallMethod()
#include "pycore_fileutils.h" // _Py_BEGIN_SUPPRESS_IPH
#include "pycore_frame.h" // PyFrameObject
#include "pycore_interp.h" // PyInterpreterState.gc
Expand Down Expand Up @@ -404,7 +404,6 @@ _Py_FindSourceFile(PyObject *filename, char* namebuf, size_t namelen, PyObject *
tail++;
taillen = strlen(tail);

PyThreadState *tstate = _PyThreadState_GET();
if (PySys_GetOptionalAttr(&_Py_ID(path), &syspath) < 0) {
PyErr_Clear();
goto error;
Expand Down Expand Up @@ -444,7 +443,7 @@ _Py_FindSourceFile(PyObject *filename, char* namebuf, size_t namelen, PyObject *
namebuf[len++] = SEP;
strcpy(namebuf+len, tail);

binary = _PyObject_CallMethodFormat(tstate, open, "ss", namebuf, "rb");
binary = PyObject_CallFunction(open, "ss", namebuf, "rb");
if (binary != NULL) {
result = binary;
goto finally;
Expand Down
Loading