Changeset 223a633 for libcfa/src/concurrency/io

Timestamp:

Oct 15, 2020, 3:41:38 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

b9537e6

Parents:

33c3ded (diff), 0b18db7 (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:

• call.cfa.in (modified) (2 diffs)
• setup.cfa (modified) (4 diffs)

libcfa/src/concurrency/io/call.cfa.in

@@ -47 +47 @@
         #include "kernel/fwd.hfa"
 
-        #if defined(CFA_HAVE_IOSQE_FIXED_FILE) && defined(CFA_HAVE_IOSQE_IO_DRAIN) && defined(CFA_HAVE_IOSQE_ASYNC)
-                #define REGULAR_FLAGS (IOSQE_FIXED_FILE | IOSQE_IO_DRAIN | IOSQE_ASYNC)
-        #elif defined(CFA_HAVE_IOSQE_FIXED_FILE) && defined(CFA_HAVE_IOSQE_ASYNC)
-                #define REGULAR_FLAGS (IOSQE_FIXED_FILE | IOSQE_ASYNC)
-        #elif defined(CFA_HAVE_IOSQE_FIXED_FILE) && defined(CFA_HAVE_IOSQE_IO_DRAIN)
-                #define REGULAR_FLAGS (IOSQE_FIXED_FILE | IOSQE_IO_DRAIN)
-        #elif defined(CFA_HAVE_IOSQE_IO_DRAIN) && defined(CFA_HAVE_IOSQE_ASYNC)
-                #define REGULAR_FLAGS (IOSQE_IO_DRAIN | IOSQE_ASYNC)
-        #elif defined(CFA_HAVE_IOSQE_FIXED_FILE)
-                #define REGULAR_FLAGS (IOSQE_FIXED_FILE)
-        #elif defined(CFA_HAVE_IOSQE_IO_DRAIN)
-                #define REGULAR_FLAGS (IOSQE_IO_DRAIN)
-        #elif defined(CFA_HAVE_IOSQE_ASYNC)
-                #define REGULAR_FLAGS (IOSQE_ASYNC)
-        #else
-                #define REGULAR_FLAGS (0)
-        #endif
-
-        #if defined(CFA_HAVE_IOSQE_IO_LINK) && defined(CFA_HAVE_IOSQE_IO_HARDLINK)
-                #define LINK_FLAGS (IOSQE_IO_LINK | IOSQE_IO_HARDLINK)
-        #elif defined(CFA_HAVE_IOSQE_IO_LINK)
-                #define LINK_FLAGS (IOSQE_IO_LINK)
-        #elif defined(CFA_HAVE_IOSQE_IO_HARDLINK)
-                #define LINK_FLAGS (IOSQE_IO_HARDLINK)
-        #else
-                #define LINK_FLAGS (0)
-        #endif
-
-        #if defined(CFA_HAVE_SPLICE_F_FD_IN_FIXED)
-                #define SPLICE_FLAGS (SPLICE_F_FD_IN_FIXED)
-        #else
-                #define SPLICE_FLAGS (0)
-        #endif
+        static const __u8 REGULAR_FLAGS = 0
+                #if defined(CFA_HAVE_IOSQE_FIXED_FILE)
+                        | IOSQE_FIXED_FILE
+                #endif
+                #if defined(CFA_HAVE_IOSQE_IO_DRAIN)
+                        | IOSQE_IO_DRAIN
+                #endif
+                #if defined(CFA_HAVE_IOSQE_ASYNC)
+                        | IOSQE_ASYNC
+                #endif
+        ;
+
+        static const __u32 LINK_FLAGS = 0
+                #if defined(CFA_HAVE_IOSQE_IO_LINK)
+                        | IOSQE_IO_LINK
+                #endif
+                #if defined(CFA_HAVE_IOSQE_IO_HARDLINK)
+                        | IOSQE_IO_HARDLINK
+                #endif
+        ;
+
+        static const __u32 SPLICE_FLAGS = 0
+                #if defined(CFA_HAVE_SPLICE_F_FD_IN_FIXED)
+                        | SPLICE_F_FD_IN_FIXED
+                #endif
+        ;
 
         extern [* struct io_uring_sqe, __u32] __submit_alloc( struct __io_data & ring, __u64 data );
@@ -347 +340 @@
         # CFA_HAVE_IORING_OP_MADVISE
         Call('MADVISE', 'int madvise(void *addr, size_t length, int advice)', {
-                'addr': 'addr',
+                'addr': '(__u64)addr',
                 'len': 'length',
                 'fadvise_advice': 'advice'

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 );
                 }