lib.uring: updated __io_uring_for_each_cqe & io_uring_for_each_cqe

- macro & function to return `count` of `cqe` populated.
YoSTEALTH · Jun 1, 2024 · 30a3a6b · 30a3a6b
1 parent 1f6714a
commit 30a3a6b
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 15 deletions.
diff --git a/src/liburing/__init__.py b/src/liburing/__init__.py
@@ -1,7 +1,7 @@
 from dynamic_import import importer
 
 
-__version__ = '2024.5.30'
+__version__ = '2024.6.1'
 
 
 importer(exclude_dir=['lib', 'include'])

diff --git a/src/liburing/lib/uring.pxd b/src/liburing/lib/uring.pxd
@@ -9,11 +9,16 @@ from .io_uring cimport *
 
 cdef extern from '../include/liburing.h' nogil:
     ''' // macro function
-        static inline void __io_uring_for_each_cqe(struct io_uring*     ring,
-                                                   unsigned int*        head,
+        static inline unsigned __io_uring_for_each_cqe(struct io_uring* ring,
                                                    struct io_uring_cqe* cqe)
         {
-            io_uring_for_each_cqe(ring, head[0], cqe);
+            unsigned head;
+            unsigned count = 0;
+
+            io_uring_for_each_cqe(ring, head, cqe){
+                count++;
+            }
+            return count;
         }
     '''
     # Library interface to `io_uring`
@@ -243,7 +248,7 @@ cdef extern from '../include/liburing.h' nogil:
     int __io_uring_cqe_index 'io_uring_cqe_index'(__io_uring* ring,
                                                   unsigned int ptr,
                                                   unsigned int mask)
-    void __io_uring_for_each_cqe(__io_uring* ring, unsigned int* head, __io_uring_cqe* cqe)
+    unsigned int __io_uring_for_each_cqe(__io_uring* ring, __io_uring_cqe* cqe)
 
     # Must be called after `io_uring_for_each_cqe()`
     void __io_uring_cq_advance 'io_uring_cq_advance'(__io_uring* ring,

diff --git a/src/liburing/queue.pxd b/src/liburing/queue.pxd
@@ -159,9 +159,8 @@ cpdef int io_uring_buf_ring_available(io_uring ring,
 
 cpdef io_uring_sqe io_uring_get_sqe(io_uring ring)
 
-cpdef unsigned int io_uring_for_each_cqe(io_uring ring,
-                                         io_uring_cqe cqe,
-                                         unsigned int head=?) nogil
+cpdef unsigned int io_uring_for_each_cqe(io_uring ring, io_uring_cqe cqe) noexcept nogil
+
 
 cpdef enum __queue_define__:
     LIBURING_UDATA_TIMEOUT = __LIBURING_UDATA_TIMEOUT

diff --git a/src/liburing/queue.pyx b/src/liburing/queue.pyx
@@ -449,9 +449,11 @@ cpdef inline io_uring_sqe io_uring_get_sqe(io_uring ring):
     sqe.ptr = __io_uring_get_sqe(&ring.ptr)
     return sqe
 
-
-cpdef inline unsigned int io_uring_for_each_cqe(io_uring ring,
-                                                io_uring_cqe cqe,
-                                                unsigned int head=0) nogil:
-    __io_uring_for_each_cqe(&ring.ptr, &head, cqe.ptr)
-    return head
+cpdef inline unsigned int io_uring_for_each_cqe(io_uring ring, io_uring_cqe cqe) noexcept nogil:
+    '''
+        Example
+            >>> for i in range(io_uring_for_each_cqe(ring, cqe)):
+            ...     cqe[i].res, cqe[i].user_data
+            123, 123
+    '''
+    return __io_uring_for_each_cqe(&ring.ptr, cqe.ptr)
diff --git a/test/queue/macro_test.py b/test/queue/macro_test.py
@@ -22,7 +22,7 @@ def test_io_uring_for_each_cqe(ring, cqe):
     sqe.user_data = 3
 
     liburing.io_uring_submit_and_wait_timeout(ring, cqe, 2)
-    assert liburing.io_uring_for_each_cqe(ring, cqe) == 3
+    assert liburing.io_uring_for_each_cqe(ring, cqe) == 2
     assert cqe.res == 0
     assert cqe.user_data == 2
     assert cqe[0].user_data == 2