traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue 12620: Make pendingbusy flag static to Py_MakePendingCalls().

This commit is contained in:
Charles-François Natali 2011-07-23 18:15:43 +02:00
parent d2d7a3b0bb
commit f23339a7bb
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Python/ceval.c
View File

@ -491,7 +491,6 @@ static struct {
} pendingcalls[NPENDINGCALLS]; } pendingcalls[NPENDINGCALLS];
static int pendingfirst = 0; static int pendingfirst = 0;
static int pendinglast = 0; static int pendinglast = 0;
static char pendingbusy = 0;
int int
Py_AddPendingCall(int (*func)(void *), void *arg) Py_AddPendingCall(int (*func)(void *), void *arg)
@ -538,6 +537,7 @@ Py_AddPendingCall(int (*func)(void *), void *arg)
int int
Py_MakePendingCalls(void) Py_MakePendingCalls(void)
{ {
static int busy = 0;
int i; int i;
int r = 0; int r = 0;
@ -552,9 +552,9 @@ Py_MakePendingCalls(void)
if (main_thread && PyThread_get_thread_ident() != main_thread) if (main_thread && PyThread_get_thread_ident() != main_thread)
return 0; return 0;
/* don't perform recursive pending calls */ /* don't perform recursive pending calls */
if (pendingbusy) if (busy)
return 0; return 0;
pendingbusy = 1; busy = 1;
/* perform a bounded number of calls, in case of recursion */ /* perform a bounded number of calls, in case of recursion */
for (i=0; i<NPENDINGCALLS; i++) { for (i=0; i<NPENDINGCALLS; i++) {
int j; int j;
@ -583,7 +583,7 @@ Py_MakePendingCalls(void)
if (r) if (r)
break; break;
} }
pendingbusy = 0; busy = 0;
return r; return r;
} }