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

2
Include/pystate.h
View file

@ -113,6 +113,8 @@ PyAPI_FUNC(int) _PyState_AddModule(PyObject*, struct PyModuleDef*);
PyAPI_FUNC(PyObject*) PyState_FindModule(struct PyModuleDef*); PyAPI_FUNC(PyObject*) PyState_FindModule(struct PyModuleDef*);
PyAPI_FUNC(PyThreadState *) PyThreadState_New(PyInterpreterState *); 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_Clear(PyThreadState *);
PyAPI_FUNC(void) PyThreadState_Delete(PyThreadState *); PyAPI_FUNC(void) PyThreadState_Delete(PyThreadState *);
#ifdef WITH_THREAD #ifdef WITH_THREAD

3
Misc/NEWS
View file

@ -12,6 +12,9 @@ What's New in Python 3.1.2?
Core and Builtins 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 - Issue #7820: The parser tokenizer restores all bytes in the right if
the BOM check fails. the BOM check fails.

12
Modules/_threadmodule.c
View file

@ -423,6 +423,7 @@ struct bootstate {
PyObject *func; PyObject *func;
PyObject *args; PyObject *args;
PyObject *keyw; PyObject *keyw;
PyThreadState *tstate;
}; };
static void static void
@ -432,8 +433,9 @@ t_bootstrap(void *boot_raw)
PyThreadState *tstate; PyThreadState *tstate;
PyObject *res; PyObject *res;
tstate = PyThreadState_New(boot->interp); tstate = boot->tstate;
tstate->thread_id = PyThread_get_thread_ident();
_PyThreadState_Init(tstate);
PyEval_AcquireThread(tstate); PyEval_AcquireThread(tstate);
res = PyEval_CallObjectWithKeywords( res = PyEval_CallObjectWithKeywords(
boot->func, boot->args, boot->keyw); boot->func, boot->args, boot->keyw);
@ -496,6 +498,11 @@ thread_PyThread_start_new_thread(PyObject *self, PyObject *fargs)
boot->func = func; boot->func = func;
boot->args = args; boot->args = args;
boot->keyw = keyw; boot->keyw = keyw;
boot->tstate = _PyThreadState_Prealloc(boot->interp);
if (boot->tstate == NULL) {
PyMem_DEL(boot);
return PyErr_NoMemory();
}
Py_INCREF(func); Py_INCREF(func);
Py_INCREF(args); Py_INCREF(args);
Py_XINCREF(keyw); Py_XINCREF(keyw);
@ -506,6 +513,7 @@ thread_PyThread_start_new_thread(PyObject *self, PyObject *fargs)
Py_DECREF(func); Py_DECREF(func);
Py_DECREF(args); Py_DECREF(args);
Py_XDECREF(keyw); Py_XDECREF(keyw);
PyThreadState_Clear(boot->tstate);
PyMem_DEL(boot); PyMem_DEL(boot);
return NULL; return NULL;
} }

29
Python/pystate.c
View file

@ -157,8 +157,8 @@ threadstate_getframe(PyThreadState *self)
return self->frame; return self->frame;
} }
PyThreadState * static PyThreadState *
PyThreadState_New(PyInterpreterState *interp) new_threadstate(PyInterpreterState *interp, int init)
{ {
PyThreadState *tstate = (PyThreadState *)malloc(sizeof(PyThreadState)); PyThreadState *tstate = (PyThreadState *)malloc(sizeof(PyThreadState));
@ -198,9 +198,8 @@ PyThreadState_New(PyInterpreterState *interp)
tstate->c_profileobj = NULL; tstate->c_profileobj = NULL;
tstate->c_traceobj = NULL; tstate->c_traceobj = NULL;
#ifdef WITH_THREAD if (init)
_PyGILState_NoteThreadState(tstate); _PyThreadState_Init(tstate);
#endif
HEAD_LOCK(); HEAD_LOCK();
tstate->next = interp->tstate_head; tstate->next = interp->tstate_head;
@ -211,6 +210,26 @@ PyThreadState_New(PyInterpreterState *interp)
return tstate; 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* PyObject*
PyState_FindModule(struct PyModuleDef* m) PyState_FindModule(struct PyModuleDef* m)
{ {