diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2009-11-10 19:50:40 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2009-11-10 19:50:40 (GMT) |
| commit | 074e5ed974be65fbcfe75a4c0529dbc53f13446f (patch) | |
| tree | dc07f407c721cad3da8659ba173ce0c778bf59a9 /Include | |
| parent | 434736a1a621f785858e58efe682320178de7993 (diff) | |
| download | cpython-074e5ed974be65fbcfe75a4c0529dbc53f13446f.zip cpython-074e5ed974be65fbcfe75a4c0529dbc53f13446f.tar.gz cpython-074e5ed974be65fbcfe75a4c0529dbc53f13446f.tar.bz2 | |
Merge in the new GIL.
Diffstat (limited to 'Include')
| -rw-r--r-- | Include/ceval.h | 8 | ||||
| -rw-r--r-- | Include/pystate.h | 2 | ||||
| -rw-r--r-- | Include/sysmodule.h | 1 |
3 files changed, 6 insertions, 5 deletions
diff --git a/Include/ceval.h b/Include/ceval.h index 7bd8179..a48d23c 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 diff --git a/Include/pystate.h b/Include/pystate.h index e02df88..c27e827 100644 --- a/Include/pystate.h +++ b/Include/pystate.h @@ -88,6 +88,8 @@ typedef struct _ts { 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 diff --git a/Include/sysmodule.h b/Include/sysmodule.h index eeb8619..5078fe0 100644 --- a/Include/sysmodule.h +++ b/Include/sysmodule.h @@ -18,7 +18,6 @@ PyAPI_FUNC(void) PySys_WriteStderr(const char *format, ...) Py_GCC_ATTRIBUTE((format(printf, 1, 2))); PyAPI_DATA(PyObject *) _PySys_TraceFunc, *_PySys_ProfileFunc; -PyAPI_DATA(int) _PySys_CheckInterval; PyAPI_FUNC(void) PySys_ResetWarnOptions(void); PyAPI_FUNC(void) PySys_AddWarnOption(const wchar_t *); |