Skip to content

bpo-36097: Use only public C-API in the_xxsubinterpreters module (adding as necessary). #12003

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 15 commits into from
Mar 1, 2019
Merged

bpo-36097: Use only public C-API in the_xxsubinterpreters module (adding as necessary). #12003

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
247de37
Add _PyInterpreterState_GetMainModule().
ericsnowcurrently Feb 18, 2019
b498efa
Use PyInterpreterState_GetID().
ericsnowcurrently Feb 18, 2019
3732dde
Fix memory leaks.
ericsnowcurrently Feb 18, 2019
165e96c
Move _PyCrossInterpreterData (and functions) to the public API.
ericsnowcurrently Feb 18, 2019
892ea20
Add _PyInterpreterID_Type and helpers to public API.
ericsnowcurrently Feb 19, 2019
b400800
Initialize the ID refcount in _PyInterpreterState_GetIDObject().
ericsnowcurrently Feb 19, 2019
582e520
Fix InterpreterID intialization.
ericsnowcurrently Feb 23, 2019
586d2bf
Fix the makefile.
ericsnowcurrently Mar 1, 2019
405f024
Make a function static.
ericsnowcurrently Feb 26, 2019
1ab3501
Do not call PyType_Ready() twice.
ericsnowcurrently Mar 1, 2019
ba9b368
Fix the Windows build.
ericsnowcurrently Feb 24, 2019
5ad779d
_PyCrossInterpreterData_Register_Class -> _PyCrossInterpreterData_Reg…
ericsnowcurrently Feb 26, 2019
c7aaefd
Clarify a comment.
ericsnowcurrently Feb 26, 2019
b0b4ddb
Add the C++ guard.
ericsnowcurrently Feb 26, 2019
16c0b7b
Only destroy interpreters (by ID refcount) when created by the module.
ericsnowcurrently Mar 1, 2019
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
Fix InterpreterID intialization.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Mar 1, 2019
commit 582e52043f89393b6e11e99bab7bd4a86adf4ec3
1 change: 1 addition & 0 deletions Makefile.pre.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1010,6 +1010,7 @@ PYTHON_HEADERS= \
$(srcdir)/Include/funcobject.h \
$(srcdir)/Include/genobject.h \
$(srcdir)/Include/import.h \
$(srcdir)/Include//interpreteridobject.h \
$(srcdir)/Include/intrcheck.h \
$(srcdir)/Include/iterobject.h \
$(srcdir)/Include/listobject.h \
Expand Down
2 changes: 1 addition & 1 deletion Objects/interpreteridobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ PyDoc_STRVAR(interpid_doc,

PyTypeObject _PyInterpreterID_Type = {
PyVarObject_HEAD_INIT(&PyType_Type, 0)
"interpreters.InterpreterID", /* tp_name */
"InterpreterID", /* tp_name */
sizeof(interpid), /* tp_basicsize */
0, /* tp_itemsize */
(destructor)interpid_dealloc, /* tp_dealloc */
Expand Down
2 changes: 2 additions & 0 deletions Objects/object.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "pycore_pystate.h"
#include "pycore_context.h"
#include "frameobject.h"
#include "interpreteridobject.h"

#ifdef __cplusplus
extern "C" {
Expand Down Expand Up @@ -1806,6 +1807,7 @@ _PyTypes_Init(void)
INIT_TYPE(&PySeqIter_Type, "sequence iterator");
INIT_TYPE(&PyCoro_Type, "coroutine");
INIT_TYPE(&_PyCoroWrapper_Type, "coroutine wrapper");
INIT_TYPE(&_PyInterpreterID_Type, "interpreter ID");
return _Py_INIT_OK();

#undef INIT_TYPE
Expand Down
4 changes: 1 addition & 3 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -784,9 +784,7 @@ def detect_simple_extensions(self):
self.add(Extension('syslog', ['syslogmodule.c']))

# Python interface to subinterpreter C-API.
self.add(Extension('_xxsubinterpreters',
['_xxsubinterpretersmodule.c'],
define_macros=[('Py_BUILD_CORE', '')]))
self.add(Extension('_xxsubinterpreters', ['_xxsubinterpretersmodule.c']))

#
# Here ends the simple stuff. From here on, modules need certain
Expand Down