Changed event object names

Author: prithviraj-chaudhuri

Lib/concurrent/interpreters/_queues.py

@@ -172,7 +172,6 @@ def qsize(self):
 
     def put(self, obj, block=True, timeout=None, *,
             unbounditems=None,
-            _delay=10 / 1000,  # 10 milliseconds
             ):
         """Add the object to the queue.
 
@@ -226,7 +225,6 @@ def put(self, obj, block=True, timeout=None, *,
             except QueueFull:
                 if timeout is not None and time.time() >= end:
                     raise  # re-raise
-                # time.sleep(_delay)
             else:
                 break
 
@@ -237,9 +235,7 @@ def put_nowait(self, obj, *, unbounditems=None):
             unboundop, = _serialize_unbound(unbounditems)
         _queues.put(self._id, obj, unboundop)
 
-    def get(self, block=True, timeout=None, *,
-            _delay=10 / 1000,  # 10 milliseconds
-            ):
+    def get(self, block=True, timeout=None, *):
         """Return the next object from the queue.
 
         If "block" is true, this blocks while the queue is empty.
@@ -261,7 +257,6 @@ def get(self, block=True, timeout=None, *,
             except QueueEmpty:
                 if timeout is not None and time.time() >= end:
                     raise  # re-raise
-                # time.sleep(_delay)
             else:
                 break
         if unboundop is not None:

Modules/_interpqueuesmodule.c

@@ -533,8 +533,8 @@ typedef struct _queue {
         xidata_fallback_t fallback;
         int unboundop;
     } defaults;
-    PyEvent queue_space_available;
-    PyEvent queue_has_item;
+    PyEvent space_available;
+    PyEvent has_item;
 } _queue;
 
 static int
@@ -552,8 +552,8 @@ _queue_init(_queue *queue, Py_ssize_t maxsize, struct _queuedefaults defaults)
             .maxsize = maxsize,
         },
         .defaults = defaults,
-        .queue_space_available = (PyEvent){1},
-        .queue_has_item = (PyEvent){0}
+        .space_available = (PyEvent){1},
+        .has_item = (PyEvent){0}
     };
     return 0;
 }
@@ -647,7 +647,7 @@ _queue_add(_queue *queue, int64_t interpid, _PyXIData_t *data, int unboundop)
     }
     if (queue->items.count >= maxsize) {
         _queue_unlock(queue);
-        queue->queue_space_available = (PyEvent){0};
+        queue->space_available = (PyEvent){0};
         return ERR_QUEUE_FULL;
     }
 
@@ -667,7 +667,7 @@ _queue_add(_queue *queue, int64_t interpid, _PyXIData_t *data, int unboundop)
     queue->items.last = item;
 
     _queue_unlock(queue);
-    queue->queue_has_item = (PyEvent){1};
+    queue->has_item = (PyEvent){1};
     return 0;
 }
 
@@ -683,7 +683,7 @@ _queue_next(_queue *queue, _PyXIData_t **p_data, int *p_unboundop)
     _queueitem *item = queue->items.first;
     if (item == NULL) {
         _queue_unlock(queue);
-        queue->queue_has_item = (PyEvent){0};
+        queue->has_item = (PyEvent){0};
         return ERR_QUEUE_EMPTY;
     }
     queue->items.first = item->next;
@@ -1145,7 +1145,7 @@ queue_put(_queues *queues, int64_t qid, PyObject *obj, unboundop_t unboundop,
     assert(queue != NULL);
 
     // Wait for the queue to have space
-    PyEvent_Wait(&queue->queue_space_available);
+    PyEvent_Wait(&queue->space_available);
 
     // Convert the object to cross-interpreter data.
     _PyXIData_t *xidata = _PyXIData_New();
@@ -1194,7 +1194,7 @@ queue_get(_queues *queues, int64_t qid,
     assert(queue != NULL);
 
     // Wait for the queue to have some value
-    PyEvent_Wait(&queue->queue_has_item);
+    PyEvent_Wait(&queue->has_item);
 
     // Pop off the next item from the queue.
     _PyXIData_t *data = NULL;