Changeset 2d8f7b0 for libcfa/src/concurrency/kernel.hfa

Timestamp:

Apr 14, 2020, 11:53:25 AM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

34d0a28

Parents:

7df014f

Message:

Implemented basic non-blocking io

File:

• libcfa/src/concurrency/kernel.hfa (modified) (2 diffs)

libcfa/src/concurrency/kernel.hfa

@@ -115 +115 @@
 #if defined(HAVE_LINUX_IO_URING_H)
 struct io_uring_sq {
-        uint32_t * head;
-        uint32_t * tail;
-        uint32_t * mask;
-        uint32_t * entries;
-        uint32_t * flags;
-        uint32_t * dropped;
-        uint32_t * array;
-        struct io_uring_sqe * sqes;
-
-        uint32_t sqe_head;
-        uint32_t sqe_tail;
-
-        size_t ring_sz;
-        void * ring_ptr;
-};
-
-struct io_uring_cq {
+        // Head and tail of the ring (associated with array)
         volatile uint32_t * head;
         volatile uint32_t * tail;
-        uint32_t * mask;
-        struct io_uring_cqe * entries;
+
+        // The actual kernel ring which uses head/tail
+        // indexes into the sqes arrays
+        uint32_t * array;
+
+        // number of entries and mask to go with it
+        const uint32_t * num;
+        const uint32_t * mask;
+
+        // Submission flags (Not sure what for)
+        uint32_t * flags;
+
+        // number of sqes not submitted (whatever that means)
+        uint32_t * dropped;
+
+        // Like head/tail but not seen by the kernel
+        volatile uint32_t alloc;
+
+        __spinlock_t lock;
+
+        // A buffer of sqes (not the actual ring)
+        struct io_uring_sqe * sqes;
+
+        // The location and size of the mmaped area
+        void * ring_ptr;
+        size_t ring_sz;
+};
+
+struct io_uring_cq {
+        // Head and tail of the ring
+        volatile uint32_t * head;
+        volatile uint32_t * tail;
+
+        // number of entries and mask to go with it
+        const uint32_t * mask;
+        const uint32_t * num;
+
+        // number of cqes not submitted (whatever that means)
         uint32_t * overflow;
+
+        // the kernel ring
         struct io_uring_cqe * cqes;
 
+        // The location and size of the mmaped area
+        void * ring_ptr;
         size_t ring_sz;
-        void * ring_ptr;
 };
 
@@ -151 +174 @@
         void * stack;
         volatile bool done;
+        semaphore submit;
 };
 #endif