Changeset e67a82d for libcfa/src/concurrency/io/types.hfa

Timestamp:

Aug 20, 2020, 11:48:15 PM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

d685cb0

Parents:

67ca73e (diff), 013b028 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

fix conflicts

File:

• libcfa/src/concurrency/io/types.hfa (modified) (5 diffs)

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"
+
+        #define LEADER_LOCK
+        struct __leaderlock_t {
+                struct $thread * volatile value;        // ($thread) next_leader | (bool:1) is_locked
+        };
+
+        static inline void ?{}( __leaderlock_t & this ) { this.value = 0p; }
 
         //-----------------------------------------------------------------------
@@ -23 +34 @@
       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;
+                __u32 prev_ready;
 
-                __spinlock_t lock;
-                __spinlock_t release_lock;
+                #if defined(LEADER_LOCK)
+                        __leaderlock_t submit_lock;
+                #else
+                        __spinlock_t submit_lock;
+                #endif
+                __spinlock_t  release_lock;
 
                 // A buffer of sqes (not the actual ring)
@@ -58 +74 @@
         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 +95 @@
                 struct __submition_data submit_q;
                 struct __completion_data completion_q;
-                uint32_t ring_flags;
+                __u32 ring_flags;
                 int fd;
                 bool eager_submits:1;
@@ -89 +105 @@
         // IO user data
         struct __io_user_data_t {
-                int32_t result;
-                $thread * thrd;
+                __s32 result;
+                oneshot sem;
         };