diff options
author | Antoine Pitrou <solipsis@pitrou.net> | 2009-11-10 19:50:40 +0000 |
---|---|---|
committer | Antoine Pitrou <solipsis@pitrou.net> | 2009-11-10 19:50:40 +0000 |
commit | 074e5ed974be65fbcfe75a4c0529dbc53f13446f (patch) | |
tree | dc07f407c721cad3da8659ba173ce0c778bf59a9 /Include/ceval.h | |
parent | 434736a1a621f785858e58efe682320178de7993 (diff) | |
download | cpython-git-074e5ed974be65fbcfe75a4c0529dbc53f13446f.tar.gz |
Merge in the new GIL.
Diffstat (limited to 'Include/ceval.h')
-rw-r--r-- | Include/ceval.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Include/ceval.h b/Include/ceval.h index 7bd8179e76..a48d23c143 100644 --- a/Include/ceval.h +++ b/Include/ceval.h @@ -112,10 +112,6 @@ PyAPI_FUNC(PyObject *) PyEval_GetCallStats(PyObject *); PyAPI_FUNC(PyObject *) PyEval_EvalFrame(struct _frame *); PyAPI_FUNC(PyObject *) PyEval_EvalFrameEx(struct _frame *f, int exc); -/* 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 @@ -174,6 +170,9 @@ PyAPI_FUNC(void) PyEval_AcquireThread(PyThreadState *tstate); PyAPI_FUNC(void) PyEval_ReleaseThread(PyThreadState *tstate); PyAPI_FUNC(void) PyEval_ReInitThreads(void); +PyAPI_FUNC(void) _PyEval_SetSwitchInterval(unsigned long microseconds); +PyAPI_FUNC(unsigned long) _PyEval_GetSwitchInterval(void); + #define Py_BEGIN_ALLOW_THREADS { \ PyThreadState *_save; \ _save = PyEval_SaveThread(); @@ -192,6 +191,7 @@ PyAPI_FUNC(void) PyEval_ReInitThreads(void); #endif /* !WITH_THREAD */ PyAPI_FUNC(int) _PyEval_SliceIndex(PyObject *, Py_ssize_t *); +PyAPI_FUNC(void) _PyEval_SignalAsyncExc(void); #ifdef __cplusplus |