mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-25 04:34:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Issue #7222: Make thread "reaping" more reliable so that reference

Browse source 
leak-chasing test runs give sensible results. The previous method of
reaping threads could return successfully while some Thread objects were
still referenced. This also introduces a new private function:
:func:hread._count().
This commit is contained in:
Antoine Pitrou 2009-10-30 17:07:08 +00:00
parent 93c2171494
commit 59c44f36e0
5 changed files with 84 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Modules/threadmodule.c
View file

@ -14,7 +14,7 @@
#include "pythread.h"
static PyObject *ThreadError;
static long nb_threads = 0;
/* Lock objects */
@ -439,6 +439,7 @@ t_bootstrap(void *boot_raw)
tstate = PyThreadState_New(boot->interp);
PyEval_AcquireThread(tstate);
nb_threads++;
res = PyEval_CallObjectWithKeywords(
boot->func, boot->args, boot->keyw);
if (res == NULL) {
@ -463,6 +464,7 @@ t_bootstrap(void *boot_raw)
Py_DECREF(boot->args);
Py_XDECREF(boot->keyw);
PyMem_DEL(boot_raw);
nb_threads--;
PyThreadState_Clear(tstate);
PyThreadState_DeleteCurrent();
PyThread_exit_thread();
@ -605,6 +607,18 @@ allocated consecutive numbers starting at 1, this behavior should not\n\
be relied upon, and the number should be seen purely as a magic cookie.\n\
A thread's identity may be reused for another thread after it exits.");
static PyObject *
thread__count(PyObject *self)
{
return PyInt_FromLong(nb_threads);
}
PyDoc_STRVAR(_count_doc,
"_count() -> integer\n\
\n\
Return the number of currently running (sub)threads.\n\
This excludes the main thread.");
static PyObject *
thread_stack_size(PyObject *self, PyObject *args)
{
@ -678,6 +692,8 @@ static PyMethodDef thread_methods[] = {
METH_NOARGS, interrupt_doc},
{"get_ident", (PyCFunction)thread_get_ident,
METH_NOARGS, get_ident_doc},
{"_count", (PyCFunction)thread__count,
METH_NOARGS, _count_doc},
{"stack_size", (PyCFunction)thread_stack_size,
METH_VARARGS,
stack_size_doc},
@ -735,6 +751,8 @@ initthread(void)
if (PyModule_AddObject(m, "_local", (PyObject *)&localtype) < 0)
return;
nb_threads = 0;
/* Initialize the C thread library */
PyThread_init_thread();
}