Revert "bpo-30860: Consolidate stateful runtime globals." (#3379)

Windows buildbots started failing due to include-related errors.
This commit is contained in:
Eric Snow 2017-09-05 21:43:08 -07:00 committed by GitHub
parent 833860615b
commit 05351c1bd8
40 changed files with 1327 additions and 2726 deletions

View file

@ -205,9 +205,8 @@ PyThread_start_new_thread(void (*func)(void *), void *arg)
return PYTHREAD_INVALID_THREAD_ID;
#endif
#if defined(THREAD_STACK_SIZE)
PyThreadState *tstate = PyThreadState_GET();
size_t stacksize = tstate ? tstate->interp->pythread_stacksize : 0;
tss = (stacksize != 0) ? stacksize : THREAD_STACK_SIZE;
tss = (_pythread_stacksize != 0) ? _pythread_stacksize
: THREAD_STACK_SIZE;
if (tss != 0) {
if (pthread_attr_setstacksize(&attrs, tss) != 0) {
pthread_attr_destroy(&attrs);
@ -579,7 +578,7 @@ _pythread_pthread_set_stacksize(size_t size)
/* set to default */
if (size == 0) {
PyThreadState_GET()->interp->pythread_stacksize = 0;
_pythread_stacksize = 0;
return 0;
}
@ -596,7 +595,7 @@ _pythread_pthread_set_stacksize(size_t size)
rc = pthread_attr_setstacksize(&attrs, size);
pthread_attr_destroy(&attrs);
if (rc == 0) {
PyThreadState_GET()->interp->pythread_stacksize = size;
_pythread_stacksize = size;
return 0;
}
}