mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-11 12:29:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merged revisions 78638 via svnmerge from

Browse source 
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.
........
This commit is contained in:
Victor Stinner 2010-03-21 13:32:31 +00:00
parent 27bf15ef8d
commit d156fa3033
4 changed files with 38 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Python/pystate.c
View file

@ -154,8 +154,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));
@ -193,9 +193,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;
@ -206,6 +205,25 @@ 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
}
void
PyThreadState_Clear(PyThreadState *tstate)