Skip to content

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

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 15, 2019
Merged

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

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
c0582a4
Add _PyInterpreterState_GetMainModule().
ericsnowcurrently Feb 18, 2019
0574384
Use PyInterpreterState_GetID().
ericsnowcurrently Feb 18, 2019
89e01f2
Fix memory leaks.
ericsnowcurrently Feb 18, 2019
e962a13
Move _PyCrossInterpreterData (and functions) to the public API.
ericsnowcurrently Feb 18, 2019
6e912c0
Add _PyInterpreterID_Type and helpers to public API.
ericsnowcurrently Feb 19, 2019
1f6905b
Initialize the ID refcount in _PyInterpreterState_GetIDObject().
ericsnowcurrently Feb 19, 2019
7715145
Fix InterpreterID intialization.
ericsnowcurrently Feb 23, 2019
60a0579
Fix the makefile.
ericsnowcurrently Mar 1, 2019
5e3ee4f
Make a function static.
ericsnowcurrently Feb 26, 2019
a7b3b65
Do not call PyType_Ready() twice.
ericsnowcurrently Mar 1, 2019
3ea575c
Fix the Windows build.
ericsnowcurrently Feb 24, 2019
67a9421
_PyCrossInterpreterData_Register_Class -> _PyCrossInterpreterData_Reg…
ericsnowcurrently Feb 26, 2019
600bae5
Clarify a comment.
ericsnowcurrently Feb 26, 2019
ecf5664
Add the C++ guard.
ericsnowcurrently Feb 26, 2019
4c232f8
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 memory leaks.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Mar 15, 2019
commit 89e01f28abcb6c2b20560cbd388633f892f851b9
6 changes: 5 additions & 1 deletion Modules/_xxsubinterpretersmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ struct _sharednsitem {
_PyCrossInterpreterData data;
};

static void _sharednsitem_clear(struct _sharednsitem *); // forward

static int
_sharednsitem_init(struct _sharednsitem *item, PyObject *key, PyObject *value)
{
Expand All @@ -79,6 +81,7 @@ _sharednsitem_init(struct _sharednsitem *item, PyObject *key, PyObject *value)
return -1;
}
if (_PyObject_GetCrossInterpreterData(value, &item->data) != 0) {
_sharednsitem_clear(item);
return -1;
}
return 0;
Expand All @@ -89,6 +92,7 @@ _sharednsitem_clear(struct _sharednsitem *item)
{
if (item->name != NULL) {
PyMem_Free(item->name);
item->name = NULL;
}
_PyCrossInterpreterData_Release(&item->data);
}
Expand Down Expand Up @@ -1339,8 +1343,8 @@ _channel_send(_channels *channels, int64_t id, PyObject *obj)
return -1;
}
if (_PyObject_GetCrossInterpreterData(obj, data) != 0) {
PyMem_Free(data);
PyThread_release_lock(mutex);
PyMem_Free(data);
return -1;
}

Expand Down