Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 67832 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r67832 | antoine.pitrou | 2008-12-17 23:46:54 +0100 (mer., 17 déc. 2008) | 4 lines

  Issue #2467: gc.DEBUG_STATS reports invalid elapsed times.
  Patch by Neil Schemenauer, very slightly modified.
........
This commit is contained in:
Antoine Pitrou 2008-12-17 23:18:19 +00:00
parent 54bc1ec4c7
commit 621601a698
2 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Misc/NEWS
View File

@ -12,6 +12,10 @@ What's New in Python 3.1 alpha 0
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #2467: gc.DEBUG_STATS reported invalid elapsed times. Also, always
print elapsed times, not only when some objects are uncollectable /
unreachable. Original patch by Neil Schemenauer.
- Issue #3439: Add a bit_length method to int. - Issue #3439: Add a bit_length method to int.
- Issue #2173: When getting device encoding, check that return value of - Issue #2173: When getting device encoding, check that return value of

49
Modules/gcmodule.c
View File

@ -709,6 +709,24 @@ clear_freelists(void)
(void)PyFloat_ClearFreeList(); (void)PyFloat_ClearFreeList();
} }
static double
get_time(void)
{
double result = 0;
if (tmod != NULL) {
PyObject *f = PyObject_CallMethod(tmod, "time", NULL);
if (f == NULL) {
PyErr_Clear();
}
else {
if (PyFloat_Check(f))
result = PyFloat_AsDouble(f);
Py_DECREF(f);
}
}
return result;
}
/* This is the main function. Read this to understand how the /* This is the main function. Read this to understand how the
* collection process works. */ * collection process works. */
static Py_ssize_t static Py_ssize_t
@ -731,16 +749,7 @@ collect(int generation)
} }
if (debug & DEBUG_STATS) { if (debug & DEBUG_STATS) {
if (tmod != NULL) { t1 = get_time();
PyObject *f = PyObject_CallMethod(tmod, "time", NULL);
if (f == NULL) {
PyErr_Clear();
}
else {
t1 = PyFloat_AsDouble(f);
Py_DECREF(f);
}
}
PySys_WriteStderr("gc: collecting generation %d...\n", PySys_WriteStderr("gc: collecting generation %d...\n",
generation); generation);
PySys_WriteStderr("gc: objects in each generation:"); PySys_WriteStderr("gc: objects in each generation:");
@ -813,17 +822,6 @@ collect(int generation)
if (debug & DEBUG_COLLECTABLE) { if (debug & DEBUG_COLLECTABLE) {
debug_cycle("collectable", FROM_GC(gc)); debug_cycle("collectable", FROM_GC(gc));
} }
if (tmod != NULL && (debug & DEBUG_STATS)) {
PyObject *f = PyObject_CallMethod(tmod, "time", NULL);
if (f == NULL) {
PyErr_Clear();
}
else {
t1 = PyFloat_AsDouble(f)-t1;
Py_DECREF(f);
PySys_WriteStderr("gc: %.4fs elapsed.\n", t1);
}
}
} }
/* Clear weakrefs and invoke callbacks as necessary. */ /* Clear weakrefs and invoke callbacks as necessary. */
@ -845,14 +843,19 @@ collect(int generation)
debug_cycle("uncollectable", FROM_GC(gc)); debug_cycle("uncollectable", FROM_GC(gc));
} }
if (debug & DEBUG_STATS) { if (debug & DEBUG_STATS) {
double t2 = get_time();
if (m == 0 && n == 0) if (m == 0 && n == 0)
PySys_WriteStderr("gc: done.\n"); PySys_WriteStderr("gc: done");
else else
PySys_WriteStderr( PySys_WriteStderr(
"gc: done, " "gc: done, "
"%" PY_FORMAT_SIZE_T "d unreachable, " "%" PY_FORMAT_SIZE_T "d unreachable, "
"%" PY_FORMAT_SIZE_T "d uncollectable.\n", "%" PY_FORMAT_SIZE_T "d uncollectable",
n+m, n); n+m, n);
if (t1 && t2) {
PySys_WriteStderr(", %.4fs elapsed", t2-t1);
}
PySys_WriteStderr(".\n");
} }
/* Append instances in the uncollectable set to a Python /* Append instances in the uncollectable set to a Python