Skip to content

gh-76785: Support Running Some Functions in Subinterpreters #110251

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
ericsnowcurrently merged 13 commits into from
Oct 6, 2023
Merged

gh-76785: Support Running Some Functions in Subinterpreters #110251

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c3a669e
Update the Interpreter.run() docstring.
ericsnowcurrently Sep 20, 2023
5cf8df6
run_string() -> exec().
ericsnowcurrently Sep 20, 2023
7a39e9f
Generalize interp_exec().
ericsnowcurrently Sep 20, 2023
a25c7c7
Support passing basic functions to Interpreter.run().
ericsnowcurrently Sep 20, 2023
5b3f4e8
Fix validate_code_object().
ericsnowcurrently Oct 3, 2023
eece6f9
Add tests.
ericsnowcurrently Oct 3, 2023
ed70ffc
Factor out _interp_exec().
ericsnowcurrently Oct 4, 2023
0c443ad
Fix the docstring.
ericsnowcurrently Oct 4, 2023
b8e32fe
Clean up arg parsing.
ericsnowcurrently Oct 4, 2023
7e8320c
Restore _interpreters.run_string().
ericsnowcurrently Oct 4, 2023
f5589e0
Add _interpreters.run_func().
ericsnowcurrently Oct 4, 2023
8dc6609
Merge branch 'main' into run-func-in-interpreter
ericsnowcurrently Oct 4, 2023
e12d3a2
Fix ref leaks.
ericsnowcurrently Oct 5, 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
Add _interpreters.run_func().
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Oct 4, 2023
commit f5589e00680bec8a3a54d517a4d04ddf07e26ac0
1 change: 0 additions & 1 deletion Lib/test/test__xxsubinterpreters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@


interpreters = import_helper.import_module('_xxsubinterpreters')
interpreters.run_func = interpreters.exec


##################################
Expand Down
36 changes: 36 additions & 0 deletions Modules/_xxsubinterpretersmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -961,6 +961,40 @@ Execute the provided string in the identified interpreter.\n\
\n\
(See " MODULE_NAME ".exec().");

static PyObject *
interp_run_func(PyObject *self, PyObject *args, PyObject *kwds)
{
static char *kwlist[] = {"id", "func", "shared", NULL};
PyObject *id, *func;
PyObject *shared = NULL;
if (!PyArg_ParseTupleAndKeywords(args, kwds,
"OO|O:" MODULE_NAME ".run_func", kwlist,
&id, &func, &shared)) {
return NULL;
}

PyCodeObject *code = convert_code_arg(func, MODULE_NAME ".exec",
"argument 2",
"a function or a code object");
if (code == NULL) {
return NULL;
}

if (_interp_exec(self, id, (PyObject *)code, shared) < 0) {
return NULL;
}
Py_RETURN_NONE;
}

PyDoc_STRVAR(run_func_doc,
"run_func(id, func, shared=None)\n\
\n\
Execute the body of the provided function in the identified interpreter.\n\
Code objects are also supported. In both cases, closures and args\n\
are not supported. Methods and other callables are not supported either.\n\
\n\
(See " MODULE_NAME ".exec().");


static PyObject *
object_is_shareable(PyObject *self, PyObject *args, PyObject *kwds)
Expand Down Expand Up @@ -1030,6 +1064,8 @@ static PyMethodDef module_functions[] = {
METH_VARARGS | METH_KEYWORDS, exec_doc},
{"run_string", _PyCFunction_CAST(interp_run_string),
METH_VARARGS | METH_KEYWORDS, run_string_doc},
{"run_func", _PyCFunction_CAST(interp_run_func),
METH_VARARGS | METH_KEYWORDS, run_func_doc},

{"is_shareable", _PyCFunction_CAST(object_is_shareable),
METH_VARARGS | METH_KEYWORDS, is_shareable_doc},
Expand Down