Changeset e7d6968 for libcfa/src/concurrency/io

Timestamp:

Oct 23, 2020, 9:08:09 PM (5 years ago)

Author:

Fangren Yu <f37yu@…>

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:

c532847

Parents:

37b7d95 (diff), 3aec25f (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

File:

• libcfa/src/concurrency/io/call.cfa.in (modified) (1 diff)

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