Changes in libcfa/src/concurrency/kernel.hfa [71c8b7e:f6660520]

File:

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

libcfa/src/concurrency/kernel.hfa

@@ -38 +38 @@
 void  ?{}(semaphore & this, int count = 1);
 void ^?{}(semaphore & this);
-bool   P (semaphore & this);
+void   P (semaphore & this);
 bool   V (semaphore & this);
 bool   V (semaphore & this, unsigned count);
@@ -114 +114 @@
 //-----------------------------------------------------------------------------
 // I/O
-struct __io_data;
-
-#define CFA_CLUSTER_IO_POLLER_USER_THREAD 1 << 0
-// #define CFA_CLUSTER_IO_POLLER_KERNEL_SIDE 1 << 1
+#if defined(HAVE_LINUX_IO_URING_H)
+struct io_uring_sq {
+        // Head and tail of the ring (associated with array)
+        volatile uint32_t * head;
+        volatile uint32_t * tail;
+
+        // 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;
+        volatile uint32_t ready;
+
+        __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;
+
+        // Statistics
+        #if !defined(__CFA_NO_STATISTICS__)
+                struct {
+                        struct {
+                                unsigned long long int val;
+                                unsigned long long int cnt;
+                        } submit_avg;
+                } stats;
+        #endif
+};
+
+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;
+
+        // Statistics
+        #if !defined(__CFA_NO_STATISTICS__)
+                struct {
+                        struct {
+                                unsigned long long int val;
+                                unsigned long long int cnt;
+                        } completed_avg;
+                } stats;
+        #endif
+};
+
+#if defined(__CFA_IO_POLLING_USER__)
+        struct __io_poller_fast {
+                struct io_ring * ring;
+                $thread thrd;
+        };
+#endif
+
+struct io_ring {
+        struct io_uring_sq submit_q;
+        struct io_uring_cq completion_q;
+        uint32_t flags;
+        int fd;
+        semaphore submit;
+        volatile bool done;
+        struct {
+                struct {
+                        void * stack;
+                        pthread_t kthrd;
+                } slow;
+                #if defined(__CFA_IO_POLLING_USER__)
+                        __io_poller_fast fast;
+                        __bin_sem_t sem;
+                #endif
+        } poller;
+};
+#endif
 
 //-----------------------------------------------------------------------------
@@ -151 +247 @@
         } node;
 
-        struct __io_data * io;
+        #if defined(HAVE_LINUX_IO_URING_H)
+                struct io_ring io;
+        #endif
 
         #if !defined(__CFA_NO_STATISTICS__)
@@ -159 +257 @@
 extern Duration default_preemption();
 
-void ?{} (cluster & this, const char name[], Duration preemption_rate, int flags);
+void ?{} (cluster & this, const char name[], Duration preemption_rate);
 void ^?{}(cluster & this);
 
-static inline void ?{} (cluster & this)                                      { this{"Anonymous Cluster", default_preemption(), 0}; }
-static inline void ?{} (cluster & this, Duration preemption_rate)            { this{"Anonymous Cluster", preemption_rate, 0}; }
-static inline void ?{} (cluster & this, const char name[])                   { this{name, default_preemption(), 0}; }
-static inline void ?{} (cluster & this, int flags)                           { this{"Anonymous Cluster", default_preemption(), flags}; }
-static inline void ?{} (cluster & this, Duration preemption_rate, int flags) { this{"Anonymous Cluster", preemption_rate, flags}; }
-static inline void ?{} (cluster & this, const char name[], int flags)        { this{name, default_preemption(), flags}; }
+static inline void ?{} (cluster & this)                           { this{"Anonymous Cluster", default_preemption()}; }
+static inline void ?{} (cluster & this, Duration preemption_rate) { this{"Anonymous Cluster", preemption_rate}; }
+static inline void ?{} (cluster & this, const char name[])        { this{name, default_preemption()}; }
 
 static inline [cluster *&, cluster *& ] __get( cluster & this ) __attribute__((const)) { return this.node.[next, prev]; }