mirror of https://github.com/python/cpython.git
Make current_tstate a global, _PyThreadState_Current. This is to
support a macro in pystate.h.
This commit is contained in:
parent
dfaac4df9e
commit
18bc7c2276
|
@ -42,7 +42,7 @@ PERFORMANCE OF THIS SOFTWARE.
|
||||||
|
|
||||||
static PyInterpreterState *interp_head = NULL;
|
static PyInterpreterState *interp_head = NULL;
|
||||||
|
|
||||||
static PyThreadState *current_tstate = NULL;
|
PyThreadState *_PyThreadState_Current = NULL;
|
||||||
|
|
||||||
|
|
||||||
PyInterpreterState *
|
PyInterpreterState *
|
||||||
|
@ -180,7 +180,7 @@ PyThreadState_Delete(tstate)
|
||||||
PyThreadState **p;
|
PyThreadState **p;
|
||||||
if (tstate == NULL)
|
if (tstate == NULL)
|
||||||
Py_FatalError("PyThreadState_Delete: NULL tstate");
|
Py_FatalError("PyThreadState_Delete: NULL tstate");
|
||||||
if (tstate == current_tstate)
|
if (tstate == _PyThreadState_Current)
|
||||||
Py_FatalError("PyThreadState_Delete: tstate is still current");
|
Py_FatalError("PyThreadState_Delete: tstate is still current");
|
||||||
interp = tstate->interp;
|
interp = tstate->interp;
|
||||||
if (interp == NULL)
|
if (interp == NULL)
|
||||||
|
@ -200,10 +200,10 @@ PyThreadState_Delete(tstate)
|
||||||
PyThreadState *
|
PyThreadState *
|
||||||
PyThreadState_Get()
|
PyThreadState_Get()
|
||||||
{
|
{
|
||||||
if (current_tstate == NULL)
|
if (_PyThreadState_Current == NULL)
|
||||||
Py_FatalError("PyThreadState_Get: no current thread");
|
Py_FatalError("PyThreadState_Get: no current thread");
|
||||||
|
|
||||||
return current_tstate;
|
return _PyThreadState_Current;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -211,9 +211,9 @@ PyThreadState *
|
||||||
PyThreadState_Swap(new)
|
PyThreadState_Swap(new)
|
||||||
PyThreadState *new;
|
PyThreadState *new;
|
||||||
{
|
{
|
||||||
PyThreadState *old = current_tstate;
|
PyThreadState *old = _PyThreadState_Current;
|
||||||
|
|
||||||
current_tstate = new;
|
_PyThreadState_Current = new;
|
||||||
|
|
||||||
return old;
|
return old;
|
||||||
}
|
}
|
||||||
|
@ -227,10 +227,10 @@ PyThreadState_Swap(new)
|
||||||
PyObject *
|
PyObject *
|
||||||
PyThreadState_GetDict()
|
PyThreadState_GetDict()
|
||||||
{
|
{
|
||||||
if (current_tstate == NULL)
|
if (_PyThreadState_Current == NULL)
|
||||||
Py_FatalError("PyThreadState_GetDict: no current thread");
|
Py_FatalError("PyThreadState_GetDict: no current thread");
|
||||||
|
|
||||||
if (current_tstate->dict == NULL)
|
if (_PyThreadState_Current->dict == NULL)
|
||||||
current_tstate->dict = PyDict_New();
|
_PyThreadState_Current->dict = PyDict_New();
|
||||||
return current_tstate->dict;
|
return _PyThreadState_Current->dict;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue