Changeset 92538ab for libcfa/src/concurrency/io/types.hfa

Timestamp:

Apr 10, 2022, 2:53:18 PM (4 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

d8e2a09

Parents:

4559b34 (diff), 6256891 (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:

Resolve conflict

File:

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

libcfa/src/concurrency/io/types.hfa

@@ -23 +23 @@
 #include "bits/locks.hfa"
 #include "bits/queue.hfa"
+#include "iofwd.hfa"
 #include "kernel/fwd.hfa"
+#include "limits.hfa"
 
 #if defined(CFA_HAVE_LINUX_IO_URING_H)
@@ -77 +79 @@
 
         struct __cmp_ring_t {
+                volatile bool lock;
+
+                unsigned id;
+
+                unsigned long long ts;
+
                 // Head and tail of the ring
                 volatile __u32 * head;
@@ -128 +136 @@
         };
 
+        static inline unsigned long long ts($io_context *& this) {
+                const __u32 head = *this->cq.head;
+                const __u32 tail = *this->cq.tail;
+
+                if(head == tail) return MAX;
+
+                return this->cq.ts;
+        }
+
         struct __pending_alloc {
                 inline __outstanding_io;
@@ -170 +187 @@
         // void __ioctx_prepare_block($io_context & ctx);
 #endif
-
-//-----------------------------------------------------------------------
-// IO user data
-struct io_future_t {
-        future_t self;
-        __s32 result;
-};
-
-static inline {
-        thread$ * fulfil( io_future_t & this, __s32 result, bool do_unpark = true ) {
-                this.result = result;
-                return fulfil(this.self, do_unpark);
-        }
-
-        // Wait for the future to be fulfilled
-        bool wait     ( io_future_t & this ) { return wait     (this.self); }
-        void reset    ( io_future_t & this ) { return reset    (this.self); }
-        bool available( io_future_t & this ) { return available(this.self); }
-}