mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-20 07:31:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

remove gil_drop_request in --without-threads

Browse source
This commit is contained in:
Benjamin Peterson 2010-09-10 22:47:02 +00:00
parent b4ba986a71
commit d2be5b4fe4
1 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Python/ceval.c
View file

@ -217,16 +217,24 @@ PyEval_GetCallStats(PyObject *self)
#endif #endif
#ifdef WITH_THREAD
#define GIL_REQUEST _Py_atomic_load_relaxed(&gil_drop_request)
#else
#define GIL_REQUEST 0
#endif
/* This can set eval_breaker to 0 even though gil_drop_request became /* This can set eval_breaker to 0 even though gil_drop_request became
1. We believe this is all right because the eval loop will release 1. We believe this is all right because the eval loop will release
the GIL eventually anyway. */ the GIL eventually anyway. */
#define COMPUTE_EVAL_BREAKER() \ #define COMPUTE_EVAL_BREAKER() \
_Py_atomic_store_relaxed( \ _Py_atomic_store_relaxed( \
&eval_breaker, \ &eval_breaker, \
_Py_atomic_load_relaxed(&gil_drop_request) | \ GIL_REQUEST | \
_Py_atomic_load_relaxed(&pendingcalls_to_do) | \ _Py_atomic_load_relaxed(&pendingcalls_to_do) | \
pending_async_exc) pending_async_exc)
#ifdef WITH_THREAD
#define SET_GIL_DROP_REQUEST() \ #define SET_GIL_DROP_REQUEST() \
do { \ do { \
_Py_atomic_store_relaxed(&gil_drop_request, 1); \ _Py_atomic_store_relaxed(&gil_drop_request, 1); \
@ -239,6 +247,8 @@ PyEval_GetCallStats(PyObject *self)
COMPUTE_EVAL_BREAKER(); \ COMPUTE_EVAL_BREAKER(); \
} while (0) } while (0)
#endif
/* Pending calls are only modified under pending_lock */ /* Pending calls are only modified under pending_lock */
#define SIGNAL_PENDING_CALLS() \ #define SIGNAL_PENDING_CALLS() \
do { \ do { \
@ -387,7 +397,6 @@ PyEval_ReInitThreads(void)
#else #else
static _Py_atomic_int eval_breaker = {0}; static _Py_atomic_int eval_breaker = {0};
static _Py_atomic_int gil_drop_request = {0};
static int pending_async_exc = 0; static int pending_async_exc = 0;
#endif /* WITH_THREAD */ #endif /* WITH_THREAD */
@ -1277,8 +1286,8 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
goto on_error; goto on_error;
} }
} }
if (_Py_atomic_load_relaxed(&gil_drop_request)) {
#ifdef WITH_THREAD #ifdef WITH_THREAD
if (_Py_atomic_load_relaxed(&gil_drop_request)) {
/* Give another thread a chance */ /* Give another thread a chance */
if (PyThreadState_Swap(NULL) != tstate) if (PyThreadState_Swap(NULL) != tstate)
Py_FatalError("ceval: tstate mix-up"); Py_FatalError("ceval: tstate mix-up");
@ -1289,8 +1298,8 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
take_gil(tstate); take_gil(tstate);
if (PyThreadState_Swap(tstate) != NULL) if (PyThreadState_Swap(tstate) != NULL)
Py_FatalError("ceval: orphan tstate"); Py_FatalError("ceval: orphan tstate");
#endif
} }
#endif
/* Check for asynchronous exceptions. */ /* Check for asynchronous exceptions. */
if (tstate->async_exc != NULL) { if (tstate->async_exc != NULL) {
x = tstate->async_exc; x = tstate->async_exc;