Mercurial > cpython-lru_cache-weakref

diff Python/ceval.c @ 71481:cda93720c06d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Issue 12620: Make pendingbusy flag static to Py_MakePendingCalls().
author Charles-François Natali <neologix@free.fr>
date Sat, 23 Jul 2011 18:15:43 +0200
parents d30b54ffd5e8
children 8beaa9a37387
line wrap: on
line diff
--- a/Python/ceval.c	Sat Jul 23 15:17:19 2011 +0200
+++ b/Python/ceval.c	Sat Jul 23 18:15:43 2011 +0200
@@ -491,7 +491,6 @@
 } pendingcalls[NPENDINGCALLS];
 static int pendingfirst = 0;
 static int pendinglast = 0;
-static char pendingbusy = 0;
 
 int
 Py_AddPendingCall(int (*func)(void *), void *arg)
@@ -538,6 +537,7 @@
 int
 Py_MakePendingCalls(void)
 {
+    static int busy = 0;
     int i;
     int r = 0;
 
@@ -552,9 +552,9 @@
     if (main_thread && PyThread_get_thread_ident() != main_thread)
         return 0;
     /* don't perform recursive pending calls */
-    if (pendingbusy)
+    if (busy)
         return 0;
-    pendingbusy = 1;
+    busy = 1;
     /* perform a bounded number of calls, in case of recursion */
     for (i=0; i<NPENDINGCALLS; i++) {
         int j;
@@ -583,7 +583,7 @@
         if (r)
             break;
     }
-    pendingbusy = 0;
+    busy = 0;
     return r;
 }