(original) (raw)

changeset: 86185:3ce0102e4c1f user: Victor Stinner victor.stinner@gmail.com date: Wed Oct 09 14:53:01 2013 +0200 files: Doc/whatsnew/3.4.rst Include/pystate.h Misc/NEWS Python/ceval.c Python/pystate.c description: Close #19199: Remove ``PyThreadState.tick_counter`` field diff -r d76e91a29f64 -r 3ce0102e4c1f Doc/whatsnew/3.4.rst --- a/Doc/whatsnew/3.4.rst Wed Oct 09 14:20:37 2013 +0300 +++ b/Doc/whatsnew/3.4.rst Wed Oct 09 14:53:01 2013 +0200 @@ -523,7 +523,8 @@ Deprecated functions and types of the C API ------------------------------------------- -* None yet. +* The ``PyThreadState.tick_counter`` field has been value: its value was meaningless + since Python 3.2 ("new GIL"). Deprecated features diff -r d76e91a29f64 -r 3ce0102e4c1f Include/pystate.h --- a/Include/pystate.h Wed Oct 09 14:20:37 2013 +0300 +++ b/Include/pystate.h Wed Oct 09 14:53:01 2013 +0200 @@ -100,16 +100,6 @@ PyObject *dict; /* Stores per-thread state */ - /* XXX doesn't mean anything anymore (the comment below is obsolete) - => deprecate or remove? */ - /* tick_counter is incremented whenever the check_interval ticker - * reaches zero. The purpose is to give a useful measure of the number - * of interpreted bytecode instructions in a given thread. This - * extremely lightweight statistic collector may be of interest to - * profilers (like psyco.jit()), although nothing in the core uses it. - */ - int tick_counter; - int gilstate_counter; PyObject *async_exc; /* Asynchronous exception to raise */ diff -r d76e91a29f64 -r 3ce0102e4c1f Misc/NEWS --- a/Misc/NEWS Wed Oct 09 14:20:37 2013 +0300 +++ b/Misc/NEWS Wed Oct 09 14:53:01 2013 +0200 @@ -10,6 +10,8 @@ Core and Builtins ----------------- +- Issue #19199: Remove ``PyThreadState.tick_counter`` field + - Fix macro expansion of _PyErr_OCCURRED(), and make sure to use it in at least one place so as to avoid regressions. diff -r d76e91a29f64 -r 3ce0102e4c1f Python/ceval.c --- a/Python/ceval.c Wed Oct 09 14:20:37 2013 +0300 +++ b/Python/ceval.c Wed Oct 09 14:53:01 2013 +0200 @@ -1247,7 +1247,6 @@ a try: finally: block uninterruptible. */ goto fast_next_opcode; } - tstate->tick_counter++; #ifdef WITH_TSC ticked = 1; #endif diff -r d76e91a29f64 -r 3ce0102e4c1f Python/pystate.c --- a/Python/pystate.c Wed Oct 09 14:20:37 2013 +0300 +++ b/Python/pystate.c Wed Oct 09 14:53:01 2013 +0200 @@ -182,7 +182,6 @@ tstate->recursion_critical = 0; tstate->tracing = 0; tstate->use_tracing = 0; - tstate->tick_counter = 0; tstate->gilstate_counter = 0; tstate->async_exc = NULL; #ifdef WITH_THREAD /victor.stinner@gmail.com