ilusha/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2026-09-29 12:10:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

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-03 23:28:07 +00:00
parent a761227ae0
commit 45b9be52de
4 changed files with 39 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Modules/_threadmodule.c
View file

@ -695,6 +695,7 @@ struct bootstate {
PyObject *func;
PyObject *args;
PyObject *keyw;
PyThreadState *tstate;
};
static void
@ -704,8 +705,9 @@ t_bootstrap(void *boot_raw)
PyThreadState *tstate;
PyObject *res;
tstate = PyThreadState_New(boot->interp);
tstate = boot->tstate;
tstate->thread_id = PyThread_get_thread_ident();
_PyThreadState_Init(tstate);
PyEval_AcquireThread(tstate);
nb_threads++;
res = PyEval_CallObjectWithKeywords(
@ -770,6 +772,11 @@ thread_PyThread_start_new_thread(PyObject *self, PyObject *fargs)
boot->func = func;
boot->args = args;
boot->keyw = keyw;
boot->tstate = _PyThreadState_Prealloc(boot->interp);
if (boot->tstate == NULL) {
PyMem_DEL(boot);
return PyErr_NoMemory();
}
Py_INCREF(func);
Py_INCREF(args);
Py_XINCREF(keyw);
@ -780,6 +787,7 @@ thread_PyThread_start_new_thread(PyObject *self, PyObject *fargs)
Py_DECREF(func);
Py_DECREF(args);
Py_XDECREF(keyw);
PyThreadState_Clear(boot->tstate);
PyMem_DEL(boot);
return NULL;
}