Changeset c76bd34 for libcfa/src/concurrency/io

Timestamp:

Oct 7, 2020, 4:31:43 PM (5 years ago)

Author:

Colby Alexander Parsons <caparsons@…>

Branches:

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

Children:

848439f

Parents:

ae2c27a (diff), 597c5d18 (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 into master

Location:

libcfa/src/concurrency/io

Files:

• call.cfa.in (added)
• setup.cfa (modified) (4 diffs)
• types.hfa (modified) (3 diffs)

libcfa/src/concurrency/io/setup.cfa

@@ -147 +147 @@
         static void * iopoll_loop( __attribute__((unused)) void * args ) {
                 __processor_id_t id;
+                id.full_proc = false;
                 id.id = doregister(&id);
                 __cfaabi_dbg_print_safe( "Kernel : IO poller thread starting\n" );
@@ -246 +247 @@
                                         thrd.link.next = 0p;
                                         thrd.link.prev = 0p;
-                                        __cfaabi_dbg_debug_do( thrd.unpark_stale = true );
 
                                         // Fixup the thread state
@@ -266 +266 @@
 
                                 // unpark the fast io_poller
-                                unpark( &thrd __cfaabi_dbg_ctx2 );
+                                unpark( &thrd );
                         }
                         else {
@@ -275 +275 @@
                         }
                 } else {
-                        unpark( &thrd __cfaabi_dbg_ctx2 );
+                        unpark( &thrd );
                 }
 

libcfa/src/concurrency/io/types.hfa

@@ -16 +16 @@
 #pragma once
 
+extern "C" {
+        #include <linux/types.h>
+}
+
+#include "bits/locks.hfa"
+
 #if defined(CFA_HAVE_LINUX_IO_URING_H)
-        extern "C" {
-                #include <linux/types.h>
-        }
-
-      #include "bits/locks.hfa"
-
         #define LEADER_LOCK
         struct __leaderlock_t {
@@ -101 +101 @@
         };
 
-
-        //-----------------------------------------------------------------------
-        // IO user data
-        struct __io_user_data_t {
-                __s32 result;
-                oneshot sem;
-        };
-
         //-----------------------------------------------------------------------
         // Misc
@@ -143 +135 @@
         void __ioctx_prepare_block($io_ctx_thread & ctx, struct epoll_event & ev);
 #endif
+
+//-----------------------------------------------------------------------
+// IO user data
+struct io_future_t {
+        future_t self;
+        __s32 result;
+};
+
+static inline {
+        bool fulfil( io_future_t & this, __s32 result ) {
+                this.result = result;
+                return fulfil(this.self);
+        }
+
+        // Wait for the future to be fulfilled
+        bool wait( io_future_t & this ) {
+                return wait(this.self);
+        }
+}