Changeset 4385e8b for libcfa/src/concurrency

Timestamp:

May 5, 2020, 4:58:23 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

cbabfd4

Parents:

b1ac7dd (diff), 08a994e (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

File:

• libcfa/src/concurrency/io.cfa (modified) (3 diffs)

libcfa/src/concurrency/io.cfa

@@ -724 +724 @@
         #include <sys/socket.h>
         #include <sys/syscall.h>
+
+#if defined(HAVE_PREADV2)
         struct iovec;
         extern ssize_t preadv2 (int fd, const struct iovec *iov, int iovcnt, off_t offset, int flags);
+#endif
+#if defined(HAVE_PWRITEV2)
+        struct iovec;
         extern ssize_t pwritev2(int fd, const struct iovec *iov, int iovcnt, off_t offset, int flags);
+#endif
 
         extern int fsync(int fd);
@@ -752 +758 @@
 //-----------------------------------------------------------------------------
 // Asynchronous operations
-ssize_t cfa_preadv2(int fd, const struct iovec *iov, int iovcnt, off_t offset, int flags) {
-        #if !defined(HAVE_LINUX_IO_URING_H) || !defined(IORING_OP_READV)
-                return preadv2(fd, iov, iovcnt, offset, flags);
-        #else
-                __submit_prelude
-
-                (*sqe){ IORING_OP_READV, fd, iov, iovcnt, offset };
-
-                __submit_wait
-        #endif
-}
-
-ssize_t cfa_pwritev2(int fd, const struct iovec *iov, int iovcnt, off_t offset, int flags) {
-        #if !defined(HAVE_LINUX_IO_URING_H) || !defined(IORING_OP_WRITEV)
-                return pwritev2(fd, iov, iovcnt, offset, flags);
-        #else
-                __submit_prelude
-
-                (*sqe){ IORING_OP_WRITEV, fd, iov, iovcnt, offset };
-
-                __submit_wait
-        #endif
-}
+#if defined(HAVE_PREADV2)
+        ssize_t cfa_preadv2(int fd, const struct iovec *iov, int iovcnt, off_t offset, int flags) {
+                #if !defined(HAVE_LINUX_IO_URING_H) || !defined(IORING_OP_READV)
+                        return preadv2(fd, iov, iovcnt, offset, flags);
+                #else
+                        __submit_prelude
+
+                        (*sqe){ IORING_OP_READV, fd, iov, iovcnt, offset };
+
+                        __submit_wait
+                #endif
+        }
+#endif
+
+#if defined(HAVE_PWRITEV2)
+        ssize_t cfa_pwritev2(int fd, const struct iovec *iov, int iovcnt, off_t offset, int flags) {
+                #if !defined(HAVE_LINUX_IO_URING_H) || !defined(IORING_OP_WRITEV)
+                        return pwritev2(fd, iov, iovcnt, offset, flags);
+                #else
+                        __submit_prelude
+
+                        (*sqe){ IORING_OP_WRITEV, fd, iov, iovcnt, offset };
+
+                        __submit_wait
+                #endif
+        }
+#endif
 
 int cfa_fsync(int fd) {
@@ -1002 +1012 @@
                         return IS_DEFINED(IORING_OP_READV);
 
-                if( /*func == (fptr_t)pwritev2 || */
-                        func == (fptr_t)cfa_pwritev2 )
-                        #define _CFA_IO_FEATURE_IORING_OP_WRITEV ,
-                        return IS_DEFINED(IORING_OP_WRITEV);
-
-                if( /*func == (fptr_t)fsync || */
-                        func == (fptr_t)cfa_fsync )
-                        #define _CFA_IO_FEATURE_IORING_OP_FSYNC ,
-                        return IS_DEFINED(IORING_OP_FSYNC);
+                #if defined(HAVE_PREADV2)
+                        if( /*func == (fptr_t)pwritev2 || */
+                                func == (fptr_t)cfa_pwritev2 )
+                                #define _CFA_IO_FEATURE_IORING_OP_WRITEV ,
+                                return IS_DEFINED(IORING_OP_WRITEV);
+                #endif
+
+                #if defined(HAVE_PWRITEV2)
+                        if( /*func == (fptr_t)fsync || */
+                                func == (fptr_t)cfa_fsync )
+                                #define _CFA_IO_FEATURE_IORING_OP_FSYNC ,
+                                return IS_DEFINED(IORING_OP_FSYNC);
+                #endif
 
                 if( /*func == (fptr_t)ync_file_range || */