Skip to content

bpo-33615: avoid extra decref #7251

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 3 commits into from
Jun 2, 2018
+42 −23
Merged

bpo-33615: avoid extra decref #7251

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
28c15d9
Re-enable the crashing test.
ericsnowcurrently Jun 1, 2018
435ce8b
Move incref responsibility to getdata funcs.
ericsnowcurrently May 30, 2018
ea22ea3
Factor out _call_in_interpreter().
ericsnowcurrently May 30, 2018
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
Factor out _call_in_interpreter().
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Jun 1, 2018
commit ea22ea33b995034889a867159d5ee1784e091714
52 changes: 35 additions & 17 deletions Python/pystate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1214,6 +1214,40 @@ _PyObject_GetCrossInterpreterData(PyObject *obj, _PyCrossInterpreterData *data)
return 0;
}

static void
_release_xidata(void *arg)
{
_PyCrossInterpreterData *data = (_PyCrossInterpreterData *)arg;
if (data->free != NULL) {
data->free(data->data);
}
Py_XDECREF(data->obj);
}

static void
_call_in_interpreter(PyInterpreterState *interp,
void (*func)(void *), void *arg)
{
/* We would use Py_AddPendingCall() if it weren't specific to the
* main interpreter (see bpo-33608). In the meantime we take a
* naive approach.
*/
PyThreadState *save_tstate = NULL;
if (interp != PyThreadState_Get()->interp) {
// XXX Using the "head" thread isn't strictly correct.
PyThreadState *tstate = PyInterpreterState_ThreadHead(interp);
// XXX Possible GILState issues?
save_tstate = PyThreadState_Swap(tstate);
}

func(arg);

// Switch back.
if (save_tstate != NULL) {
PyThreadState_Swap(save_tstate);
}
}

void
_PyCrossInterpreterData_Release(_PyCrossInterpreterData *data)
{
Expand All @@ -1232,24 +1266,8 @@ _PyCrossInterpreterData_Release(_PyCrossInterpreterData *data)
return;
}

PyThreadState *save_tstate = NULL;
if (interp != PyThreadState_Get()->interp) {
// XXX Using the "head" thread isn't strictly correct.
PyThreadState *tstate = PyInterpreterState_ThreadHead(interp);
// XXX Possible GILState issues?
save_tstate = PyThreadState_Swap(tstate);
}

// "Release" the data and/or the object.
if (data->free != NULL) {
data->free(data->data);
}
Py_XDECREF(data->obj);

// Switch back.
if (save_tstate != NULL) {
PyThreadState_Swap(save_tstate);
}
_call_in_interpreter(interp, _release_xidata, data);
}

PyObject *
Expand Down