diff options
| author | Graham Dumpleton <Graham.Dumpleton@gmail.com> | 2019-05-14 16:14:42 +1000 |
|---|---|---|
| committer | Graham Dumpleton <Graham.Dumpleton@gmail.com> | 2019-05-14 16:14:42 +1000 |
| commit | b03b02df6318afe26052db5b0365732152cacea2 (patch) | |
| tree | af8caef02f6282f7a69047f3a29d0a5a52224e97 /src/server | |
| parent | 3dce228134f21cb0239e93cad9647a9697e49105 (diff) | |
| download | mod_wsgi-b03b02df6318afe26052db5b0365732152cacea2.tar.gz | |
Use official APIs for accessing interpreter list.
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/wsgi_interp.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/server/wsgi_interp.c b/src/server/wsgi_interp.c index 4a94850..3fbca04 100644 --- a/src/server/wsgi_interp.c +++ b/src/server/wsgi_interp.c @@ -338,9 +338,10 @@ static PyObject *ShutdownInterpreter_call( PyThreadState_Swap(NULL); - tstate = tstate->interp->tstate_head; + tstate = PyInterpreterState_ThreadHead(tstate->interp); + while (tstate) { - tstate_next = tstate->next; + tstate_next = PyThreadState_Next(tstate); if (tstate != tstate_save) { PyThreadState_Swap(tstate); PyThreadState_Clear(tstate); @@ -436,9 +437,13 @@ InterpreterObject *newInterpreterObject(const char *name) */ if (!name) { +#if PY_MAJOR_VERSION > 3 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7) + interp = PyInterpreterState_Main(); +#else interp = PyInterpreterState_Head(); - while (interp->next) - interp = interp->next; + while (PyInterpreterState_Next(interp)) + interp = PyInterpreterState_Next(interp); +#endif name = ""; } @@ -1883,9 +1888,10 @@ static void Interpreter_dealloc(InterpreterObject *self) PyThreadState_Swap(NULL); - tstate = tstate->interp->tstate_head; + tstate = PyInterpreterState_ThreadHead(tstate->interp); + while (tstate) { - tstate_next = tstate->next; + tstate_next = PyThreadState_Next(tstate); if (tstate != tstate_save) { PyThreadState_Swap(tstate); PyThreadState_Clear(tstate); |