Mercurial > cpython-lru_cache-weakref
diff Python/pystate.c @ 59317:d7a62c16505b 3.1
Merged revisions 78639 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r78639 | victor.stinner | 2010-03-04 00:28:07 +0100 (jeu., 04 mars 2010) | 10 lines
Merged revisions 78638 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78638 | victor.stinner | 2010-03-04 00:20:25 +0100 (jeu., 04 mars 2010) | 3 lines
Issue #7544: Preallocate thread memory before creating the thread to avoid a
fatal error in low memory condition.
........
................
| author | Victor Stinner <victor.stinner@haypocalc.com> |
|---|---|
| date | Wed, 03 Mar 2010 23:32:07 +0000 |
| parents | 620a34dc10f9 |
| children | f197407bdba2 |
line wrap: on
line diff
--- a/Python/pystate.c Wed Mar 03 21:57:58 2010 +0000 +++ b/Python/pystate.c Wed Mar 03 23:32:07 2010 +0000 @@ -157,8 +157,8 @@ return self->frame; } -PyThreadState * -PyThreadState_New(PyInterpreterState *interp) +static PyThreadState * +new_threadstate(PyInterpreterState *interp, int init) { PyThreadState *tstate = (PyThreadState *)malloc(sizeof(PyThreadState)); @@ -198,9 +198,8 @@ tstate->c_profileobj = NULL; tstate->c_traceobj = NULL; -#ifdef WITH_THREAD - _PyGILState_NoteThreadState(tstate); -#endif + if (init) + _PyThreadState_Init(tstate); HEAD_LOCK(); tstate->next = interp->tstate_head; @@ -211,6 +210,26 @@ return tstate; } +PyThreadState * +PyThreadState_New(PyInterpreterState *interp) +{ + return new_threadstate(interp, 1); +} + +PyThreadState * +_PyThreadState_Prealloc(PyInterpreterState *interp) +{ + return new_threadstate(interp, 0); +} + +void +_PyThreadState_Init(PyThreadState *tstate) +{ +#ifdef WITH_THREAD + _PyGILState_NoteThreadState(tstate); +#endif +} + PyObject* PyState_FindModule(struct PyModuleDef* m) {