Merged revisions 78639 via svnmerge from

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.
  ........
................

diff --git a/Include/pystate.h b/Include/pystate.h
index e02df88f8c652490a490eb3a5c869b71e58a889d..81de569112c7914680d25c61bcdbd9556eb8edf9 100644 (file)
--- a/Include/pystate.h
+++ b/Include/pystate.h
@@ -113,6 +113,8 @@ PyAPI_FUNC(int) _PyState_AddModule(PyObject*, struct PyModuleDef*);
 PyAPI_FUNC(PyObject*) PyState_FindModule(struct PyModuleDef*);
 
 PyAPI_FUNC(PyThreadState *) PyThreadState_New(PyInterpreterState *);
+PyAPI_FUNC(PyThreadState *) _PyThreadState_Prealloc(PyInterpreterState *);
+PyAPI_FUNC(void) _PyThreadState_Init(PyThreadState *);
 PyAPI_FUNC(void) PyThreadState_Clear(PyThreadState *);
 PyAPI_FUNC(void) PyThreadState_Delete(PyThreadState *);
 #ifdef WITH_THREAD

diff --git a/Misc/NEWS b/Misc/NEWS
index 361a8a6e3d1e4eb3d457aa9ad93edf01d44f7219..9bc7f613759ab91a94d3272d1d5f0b57d716f80c 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@ What's New in Python 3.1.2?
 Core and Builtins
 -----------------
 
+- Issue #7544: Preallocate thread memory before creating the thread to avoid
+  a fatal error in low memory condition.
+
 - Issue #7820: The parser tokenizer restores all bytes in the right if
   the BOM check fails.
 

diff --git a/Modules/_threadmodule.c b/Modules/_threadmodule.c
index 5181d0705ef1b8f556fe5b6b79f76c9c215bea9b..3d4578a3d82c5dcfb8a0b0d4da9efb21da4380e3 100644 (file)
--- a/Modules/_threadmodule.c
+++ b/Modules/_threadmodule.c
@@ -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;
        }

diff --git a/Python/pystate.c b/Python/pystate.c
index fe5de5f4d2219c31dbabe8c6bb12bd3bec956443..3d5cf04baa114d43079035059de3618a48c7b1ad 100644 (file)
--- 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)
 {