diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2010-03-03 23:28:07 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2010-03-03 23:28:07 (GMT) |
| commit | 45b9be52de2a418761da197599c01d6719ac5b88 (patch) | |
| tree | 455fbe266934b9c822a63d4fa4ea6126b534a6f0 /Modules/_threadmodule.c | |
| parent | a761227ae0595062897c3dfacfa01b8ed026288e (diff) | |
| download | cpython-45b9be52de2a418761da197599c01d6719ac5b88.zip cpython-45b9be52de2a418761da197599c01d6719ac5b88.tar.gz cpython-45b9be52de2a418761da197599c01d6719ac5b88.tar.bz2 | |
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 'Modules/_threadmodule.c')
| -rw-r--r-- | Modules/_threadmodule.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Modules/_threadmodule.c b/Modules/_threadmodule.c index aab7ab1..58aa231 100644 --- a/Modules/_threadmodule.c +++ b/Modules/_threadmodule.c @@ -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; } |