summaryrefslogtreecommitdiff
path: root/Include
diff options
context:
space:
mode:
authorSkip Montanaro <skip@pobox.com>2002-09-03 20:10:45 +0000
committerSkip Montanaro <skip@pobox.com>2002-09-03 20:10:45 +0000
commitd581d7792bc31e6249ee6ed20bc2a71f53f0d3bb (patch)
tree5dc5dd8a449fabd541a8f1050d49d7a381b60140 /Include
parentd229b3ae048ca51d9f3865e1e9eaf83ba5a6c424 (diff)
downloadcpython-git-d581d7792bc31e6249ee6ed20bc2a71f53f0d3bb.tar.gz
replace thread state objects' ticker and checkinterval fields with two
globals, _Py_Ticker and _Py_CheckInterval. This also implements Jeremy's shortcut in Py_AddPendingCall that zeroes out _Py_Ticker. This allows the test in the main loop to only test a single value. The gory details are at http://python.org/sf/602191
Diffstat (limited to 'Include')
-rw-r--r--Include/ceval.h4
-rw-r--r--Include/pystate.h2
2 files changed, 4 insertions, 2 deletions
diff --git a/Include/ceval.h b/Include/ceval.h
index 63204b267e..e1af801bc0 100644
--- a/Include/ceval.h
+++ b/Include/ceval.h
@@ -48,6 +48,10 @@ PyAPI_FUNC(int) Py_GetRecursionLimit(void);
PyAPI_FUNC(char *) PyEval_GetFuncName(PyObject *);
PyAPI_FUNC(char *) PyEval_GetFuncDesc(PyObject *);
+/* this used to be handled on a per-thread basis - now just two globals */
+PyAPI_DATA(volatile int) _Py_Ticker;
+PyAPI_DATA(int) _Py_CheckInterval;
+
/* Interface for threads.
A module that plans to do a blocking system call (or something else
diff --git a/Include/pystate.h b/Include/pystate.h
index 913dc7a674..9b61ad7d39 100644
--- a/Include/pystate.h
+++ b/Include/pystate.h
@@ -22,7 +22,6 @@ typedef struct _is {
PyObject *sysdict;
PyObject *builtins;
- int checkinterval;
#ifdef HAVE_DLOPEN
int dlopenflags;
#endif
@@ -50,7 +49,6 @@ typedef struct _ts {
struct _frame *frame;
int recursion_depth;
- int ticker;
int tracing;
int use_tracing;