remove ensure added

Author: kumaraditya303

Lib/test/test_capi/test_misc.py

@@ -1564,20 +1564,18 @@ def callback():
                 if _testcapi._pending_threadfunc(callback):
                     break
 
-    def pendingcalls_submit(self, l, n, *, main=True, ensure=False):
+    def pendingcalls_submit(self, l, n, *, main=True):
         def callback():
             #this function can be interrupted by thread switching so let's
             #use an atomic operation
             l.append(None)
 
         if main:
             return _testcapi._pending_threadfunc(callback, n,
-                                                 blocking=False,
-                                                 ensure_added=ensure)
+                                                 blocking=False)
         else:
             return _testinternalcapi.pending_threadfunc(callback, n,
-                                                        blocking=False,
-                                                        ensure_added=ensure)
+                                                        blocking=False)
 
     def pendingcalls_wait(self, l, numadded, context = None):
         #now, stick around until l[0] has grown to 10
@@ -1676,7 +1674,7 @@ def test_max_pending(self):
             self.assertEqual(added, maxpending)
 
             l = []
-            added = self.pendingcalls_submit(l, maxpending+1, main=False)
+            added = self.pendingcalls_submit(l, 1000, main=False)
             self.pendingcalls_wait(l, added)
             self.assertEqual(added, maxpending)
 

Modules/_testcapimodule.c

@@ -837,14 +837,13 @@ static PyObject *
 pending_threadfunc(PyObject *self, PyObject *arg, PyObject *kwargs)
 {
     static char *kwlist[] = {"callback", "num",
-                             "blocking", "ensure_added", NULL};
+                             "blocking", NULL};
     PyObject *callable;
     unsigned int num = 1;
     int blocking = 0;
-    int ensure_added = 0;
     if (!PyArg_ParseTupleAndKeywords(arg, kwargs,
-                                     "O|I$pp:_pending_threadfunc", kwlist,
-                                     &callable, &num, &blocking, &ensure_added))
+                                     "O|I$p:_pending_threadfunc", kwlist,
+                                     &callable, &num, &blocking))
     {
         return NULL;
     }
@@ -861,16 +860,8 @@ pending_threadfunc(PyObject *self, PyObject *arg, PyObject *kwargs)
 
     unsigned int num_added = 0;
     for (; num_added < num; num_added++) {
-        if (ensure_added) {
-            int r;
-            do {
-                r = Py_AddPendingCall(&_pending_callback, callable);
-            } while (r < 0);
-        }
-        else {
-            if (Py_AddPendingCall(&_pending_callback, callable) < 0) {
-                break;
-            }
+        if (Py_AddPendingCall(&_pending_callback, callable) < 0) {
+            break;
         }
     }
 

Modules/_testinternalcapi.c

@@ -1074,10 +1074,10 @@ pending_threadfunc(PyObject *self, PyObject *args, PyObject *kwargs)
     int blocking = 0;
     int ensure_added = 0;
     static char *kwlist[] = {"callback", "num",
-                             "blocking", "ensure_added", NULL};
+                             "blocking", NULL};
     if (!PyArg_ParseTupleAndKeywords(args, kwargs,
-                                     "O|I$pp:pending_threadfunc", kwlist,
-                                     &callable, &num, &blocking, &ensure_added))
+                                     "O|I$p:pending_threadfunc", kwlist,
+                                     &callable, &num, &blocking))
     {
         return NULL;
     }
@@ -1095,16 +1095,8 @@ pending_threadfunc(PyObject *self, PyObject *args, PyObject *kwargs)
 
     unsigned int num_added = 0;
     for (; num_added < num; num_added++) {
-        if (ensure_added) {
-            int r;
-            do {
-                r = _PyEval_AddPendingCall(interp, &_pending_callback, callable, 0);
-            } while (r < 0);
-        }
-        else {
-            if (_PyEval_AddPendingCall(interp, &_pending_callback, callable, 0) < 0) {
-                break;
-            }
+        if (_PyEval_AddPendingCall(interp, &_pending_callback, callable, 0) < 0) {
+            break;
         }
     }
 

Python/ceval_gil.c

@@ -753,7 +753,7 @@ pop_pending_call(struct _pending_calls *pending,
         *func = call->func;
         *arg = call->arg;
         *flags = call->flags;
-        if (pending->freelist_num < _Py_PENDING_CALLS_FREELIST_SIZE) {
+        if (pending->freelist_num <= _Py_PENDING_CALLS_FREELIST_SIZE) {
             call->next = pending->freelist;
             pending->freelist = call;
             pending->freelist_num++;
@@ -856,9 +856,9 @@ _make_pending_calls(struct _pending_calls *pending, int32_t *p_npending)
 {
     int res = 0;
     int32_t npending = -1;
-
     int32_t maxloop = pending->maxloop;
-    assert(maxloop > 0);
+
+    assert(maxloop == INT32_MAX || maxloop == 100);
     /* perform a bounded number of calls, in case of recursion */
     for (int i=0; i<maxloop; i++) {
         _Py_pending_call_func func = NULL;