Changeset 4998155 for libcfa/src/concurrency/io

Timestamp:

Aug 14, 2020, 12:33:26 PM (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:

7fdae38

Parents:

b353a49

Message:

I/O now uses onshot semaphore instead of raw park/unpark.
I/O now uses linux/types.h types instead of stdint.h types

Location:

libcfa/src/concurrency/io

Files:

• setup.cfa (modified) (4 diffs)
• types.hfa (modified) (5 diffs)

libcfa/src/concurrency/io/setup.cfa

@@ -298 +298 @@
                 if( params_in.poll_complete ) params.flags |= IORING_SETUP_IOPOLL;
 
-                uint32_t nentries = params_in.num_entries != 0 ? params_in.num_entries : 256;
+                __u32 nentries = params_in.num_entries != 0 ? params_in.num_entries : 256;
                 if( !is_pow2(nentries) ) {
                         abort("ERROR: I/O setup 'num_entries' must be a power of 2\n");
@@ -362 +362 @@
                 // Get the pointers from the kernel to fill the structure
                 // submit queue
-                sq.head    = (volatile uint32_t *)(((intptr_t)sq.ring_ptr) + params.sq_off.head);
-                sq.tail    = (volatile uint32_t *)(((intptr_t)sq.ring_ptr) + params.sq_off.tail);
-                sq.mask    = (   const uint32_t *)(((intptr_t)sq.ring_ptr) + params.sq_off.ring_mask);
-                sq.num     = (   const uint32_t *)(((intptr_t)sq.ring_ptr) + params.sq_off.ring_entries);
-                sq.flags   = (         uint32_t *)(((intptr_t)sq.ring_ptr) + params.sq_off.flags);
-                sq.dropped = (         uint32_t *)(((intptr_t)sq.ring_ptr) + params.sq_off.dropped);
-                sq.array   = (         uint32_t *)(((intptr_t)sq.ring_ptr) + params.sq_off.array);
+                sq.head    = (volatile __u32 *)(((intptr_t)sq.ring_ptr) + params.sq_off.head);
+                sq.tail    = (volatile __u32 *)(((intptr_t)sq.ring_ptr) + params.sq_off.tail);
+                sq.mask    = (   const __u32 *)(((intptr_t)sq.ring_ptr) + params.sq_off.ring_mask);
+                sq.num     = (   const __u32 *)(((intptr_t)sq.ring_ptr) + params.sq_off.ring_entries);
+                sq.flags   = (         __u32 *)(((intptr_t)sq.ring_ptr) + params.sq_off.flags);
+                sq.dropped = (         __u32 *)(((intptr_t)sq.ring_ptr) + params.sq_off.dropped);
+                sq.array   = (         __u32 *)(((intptr_t)sq.ring_ptr) + params.sq_off.array);
                 sq.prev_head = *sq.head;
 
                 {
-                        const uint32_t num = *sq.num;
+                        const __u32 num = *sq.num;
                         for( i; num ) {
                                 sq.sqes[i].user_data = 0ul64;
@@ -395 +395 @@
 
                 // completion queue
-                cq.head     = (volatile uint32_t *)(((intptr_t)cq.ring_ptr) + params.cq_off.head);
-                cq.tail     = (volatile uint32_t *)(((intptr_t)cq.ring_ptr) + params.cq_off.tail);
-                cq.mask     = (   const uint32_t *)(((intptr_t)cq.ring_ptr) + params.cq_off.ring_mask);
-                cq.num      = (   const uint32_t *)(((intptr_t)cq.ring_ptr) + params.cq_off.ring_entries);
-                cq.overflow = (         uint32_t *)(((intptr_t)cq.ring_ptr) + params.cq_off.overflow);
-                cq.cqes   = (struct io_uring_cqe *)(((intptr_t)cq.ring_ptr) + params.cq_off.cqes);
+                cq.head      = (volatile __u32 *)(((intptr_t)cq.ring_ptr) + params.cq_off.head);
+                cq.tail      = (volatile __u32 *)(((intptr_t)cq.ring_ptr) + params.cq_off.tail);
+                cq.mask      = (   const __u32 *)(((intptr_t)cq.ring_ptr) + params.cq_off.ring_mask);
+                cq.num       = (   const __u32 *)(((intptr_t)cq.ring_ptr) + params.cq_off.ring_entries);
+                cq.overflow  = (         __u32 *)(((intptr_t)cq.ring_ptr) + params.cq_off.overflow);
+                cq.cqes = (struct io_uring_cqe *)(((intptr_t)cq.ring_ptr) + params.cq_off.cqes);
 
                 // some paranoid checks
@@ -448 +448 @@
         void __ioctx_register($io_ctx_thread & ctx, struct epoll_event & ev) {
                 ev.events = EPOLLIN | EPOLLONESHOT;
-                ev.data.u64 = (uint64_t)&ctx;
+                ev.data.u64 = (__u64)&ctx;
                 int ret = epoll_ctl(iopoll.epollfd, EPOLL_CTL_ADD, ctx.ring->fd, &ev);
                 if (ret < 0) {

libcfa/src/concurrency/io/types.hfa

@@ -17 +17 @@
 
 #if defined(CFA_HAVE_LINUX_IO_URING_H)
+        extern "C" {
+                #include <linux/types.h>
+        }
+
       #include "bits/locks.hfa"
 
@@ -23 +27 @@
       struct __submition_data {
                 // Head and tail of the ring (associated with array)
-                volatile uint32_t * head;
-                volatile uint32_t * tail;
-                volatile uint32_t prev_head;
+                volatile __u32 * head;
+                volatile __u32 * tail;
+                volatile __u32 prev_head;
 
                 // The actual kernel ring which uses head/tail
                 // indexes into the sqes arrays
-                uint32_t * array;
+                __u32 * array;
 
                 // number of entries and mask to go with it
-                const uint32_t * num;
-                const uint32_t * mask;
+                const __u32 * num;
+                const __u32 * mask;
 
                 // Submission flags (Not sure what for)
-                uint32_t * flags;
+                __u32 * flags;
 
                 // number of sqes not submitted (whatever that means)
-                uint32_t * dropped;
+                __u32 * dropped;
 
                 // Like head/tail but not seen by the kernel
-                volatile uint32_t * ready;
-                uint32_t ready_cnt;
+                volatile __u32 * ready;
+                __u32 ready_cnt;
 
                 __spinlock_t lock;
@@ -58 +62 @@
         struct __completion_data {
                 // Head and tail of the ring
-                volatile uint32_t * head;
-                volatile uint32_t * tail;
+                volatile __u32 * head;
+                volatile __u32 * tail;
 
                 // number of entries and mask to go with it
-                const uint32_t * mask;
-                const uint32_t * num;
+                const __u32 * mask;
+                const __u32 * num;
 
                 // number of cqes not submitted (whatever that means)
-                uint32_t * overflow;
+                __u32 * overflow;
 
                 // the kernel ring
@@ -79 +83 @@
                 struct __submition_data submit_q;
                 struct __completion_data completion_q;
-                uint32_t ring_flags;
+                __u32 ring_flags;
                 int fd;
                 bool eager_submits:1;
@@ -89 +93 @@
         // IO user data
         struct __io_user_data_t {
-                int32_t result;
-                $thread * thrd;
+                __s32 result;
+                oneshot sem;
         };