Changeset 510e6f9 for libcfa/src/concurrency/io

Timestamp:

Mar 11, 2022, 1:56:07 PM (4 years ago)

Author:

caparsons <caparson@…>

Branches:

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

Children:

623d1c8

Parents:

eb3bc52 (diff), 630c4bb (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:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

libcfa/src/concurrency/io

Files:

• setup.cfa (modified) (2 diffs)
• types.hfa (modified) (2 diffs)

libcfa/src/concurrency/io/setup.cfa

@@ -56 +56 @@
 
         #include "bitmanip.hfa"
+        #include "fstream.hfa"
         #include "kernel_private.hfa"
         #include "thread.hfa"
@@ -258 +259 @@
                 struct __sub_ring_t & sq = this.sq;
                 struct __cmp_ring_t & cq = this.cq;
+                {
+                        __u32 fhead = sq.free_ring.head;
+                        __u32 ftail = sq.free_ring.tail;
+
+                        __u32 total = *sq.num;
+                        __u32 avail = ftail - fhead;
+
+                        if(avail != total) abort | "Processor (" | (void*)this.proc | ") tearing down ring with" | (total - avail) | "entries allocated but not submitted, out of" | total;
+                }
 
                 // unmap the submit queue entries

libcfa/src/concurrency/io/types.hfa

@@ -23 +23 @@
 #include "bits/locks.hfa"
 #include "bits/queue.hfa"
+#include "iofwd.hfa"
 #include "kernel/fwd.hfa"
 
@@ -170 +171 @@
         // 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); }
-}