mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 78639 via svnmerge from

Browse source 
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.
  ........
................
This commit is contained in:
Victor Stinner 2010-03-03 23:32:07 +00:00
parent 925ca76ae7
commit ef32bc8569
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

@ -423,6 +423,7 @@ struct bootstate {
PyObject *func;
PyObject *args;
PyObject *keyw;
PyThreadState *tstate;
};
static void
@ -432,8 +433,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);
res = PyEval_CallObjectWithKeywords(
boot->func, boot->args, boot->keyw);
@ -496,6 +498,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);
@ -506,6 +513,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;
}