diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2010-03-03 23:28:07 +0000 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2010-03-03 23:28:07 +0000 |
| commit | c8b08e48e23aead070d8311341f5343638e0848b (patch) | |
| tree | a7d68a48ef0c2a08ccc58f102c14e9047ca6ed41 /Python/pystate.c | |
| parent | 8683727dbaf4120228eda98ef4762928c6243ddb (diff) | |
| download | cpython-c8b08e48e23aead070d8311341f5343638e0848b.tar.gz | |
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.
........
Diffstat (limited to 'Python/pystate.c')
| -rw-r--r-- | Python/pystate.c | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/Python/pystate.c b/Python/pystate.c index 78c501e4c5..eb2dfa6e3a 100644 --- a/Python/pystate.c +++ b/Python/pystate.c @@ -157,8 +157,8 @@ threadstate_getframe(PyThreadState *self) 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 @@ PyThreadState_New(PyInterpreterState *interp) 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 @@ PyThreadState_New(PyInterpreterState *interp) 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) { |