Skip to content

bpo-33608: Minor cleanup related to pending calls. #12247

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

bpo-33608: Minor cleanup related to pending calls. #12247

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
999fe83
Add a note about clear an interpreter's objects during shutdown.
ericsnowcurrently Mar 8, 2019
88cd036
Simplify DISPATCH by hoisting eval_breaker ahead of time.
ericsnowcurrently Mar 8, 2019
5b3260c
Zero-out PyInterpreterState when initializing.
ericsnowcurrently Sep 10, 2018
53d1e56
Lock "HEAD" around looking up intepreter by ID.
ericsnowcurrently Jan 28, 2019
b382ad8
Add PyInterpreterState.finalizing.
ericsnowcurrently Mar 8, 2019
deafc77
Factor out _push_pending_call() and _pop_pending_call().
ericsnowcurrently Dec 4, 2018
d6b12ab
Add _PyRuntimeState.main_thread.
ericsnowcurrently Sep 15, 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
Next Next commit
Lock "HEAD" around looking up intepreter by ID.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Mar 8, 2019
commit 53d1e56c93bbe52a62e7920551c7ac791a4b4565
33 changes: 22 additions & 11 deletions Python/pystate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,28 +314,39 @@ PyInterpreterState_GetID(PyInterpreterState *interp)
}


PyInterpreterState *
_PyInterpreterState_LookUpID(PY_INT64_T requested_id)
static PyInterpreterState *
interp_look_up_id(PY_INT64_T requested_id)
{
if (requested_id < 0)
goto error;

PyInterpreterState *interp = PyInterpreterState_Head();
while (interp != NULL) {
PY_INT64_T id = PyInterpreterState_GetID(interp);
if (id < 0)
if (id < 0) {
return NULL;
if (requested_id == id)
}
if (requested_id == id) {
return interp;
}
interp = PyInterpreterState_Next(interp);
}

error:
PyErr_Format(PyExc_RuntimeError,
"unrecognized interpreter ID %lld", requested_id);
return NULL;
}

PyInterpreterState *
_PyInterpreterState_LookUpID(PY_INT64_T requested_id)
{
PyInterpreterState *interp = NULL;
if (requested_id >= 0) {
HEAD_LOCK();
interp = interp_look_up_id(requested_id);
HEAD_UNLOCK();
}
if (interp == NULL && !PyErr_Occurred()) {
PyErr_Format(PyExc_RuntimeError,
"unrecognized interpreter ID %lld", requested_id);
}
return interp;
}


int
_PyInterpreterState_IDInitref(PyInterpreterState *interp)
Expand Down