Changes in / [4385e8b:b1ac7dd]

Location:

libcfa

Files:

• configure (modified) (1 diff)
• configure.ac (modified) (1 diff)
• prelude/defines.hfa.in (modified) (1 diff)
• src/Makefile.in (modified) (2 diffs)
• src/concurrency/io.cfa (modified) (3 diffs)

libcfa/configure

@@ -16962 +16962 @@
 done
 
-for ac_func in preadv2 pwritev2
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
 
 ac_config_files="$ac_config_files Makefile src/Makefile prelude/Makefile"

libcfa/configure.ac

@@ -119 +119 @@
 
 AC_CHECK_HEADERS([linux/io_uring.h])
-AC_CHECK_FUNCS([preadv2 pwritev2])
 
 AC_CONFIG_FILES([

libcfa/prelude/defines.hfa.in

@@ -16 +16 @@
 #undef HAVE_LINUX_IO_URING_H
 
-#undef HAVE_PREADV2
-#undef HAVE_PWRITEV2
-
 #undef __CFA_NO_STATISTICS__

libcfa/src/Makefile.in

@@ -241 +241 @@
         containers/vector.hfa bitmanip.hfa math.hfa gmp.hfa time_t.hfa \
         bits/align.hfa bits/containers.hfa bits/defs.hfa \
-        bits/debug.hfa bits/locks.hfa containers/list.hfa \
-        concurrency/coroutine.hfa concurrency/thread.hfa \
-        concurrency/kernel.hfa concurrency/monitor.hfa \
-        concurrency/mutex.hfa concurrency/invoke.h
+        bits/debug.hfa bits/locks.hfa concurrency/coroutine.hfa \
+        concurrency/thread.hfa concurrency/kernel.hfa \
+        concurrency/monitor.hfa concurrency/mutex.hfa \
+        concurrency/invoke.h
 HEADERS = $(nobase_cfa_include_HEADERS)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
@@ -463 +463 @@
 
 #----------------------------------------------------------------------------------------------------------------
-@BUILDLIB_TRUE@headers_nosrc = bitmanip.hfa math.hfa gmp.hfa time_t.hfa bits/align.hfa bits/containers.hfa bits/defs.hfa bits/debug.hfa bits/locks.hfa containers/list.hfa
+@BUILDLIB_TRUE@headers_nosrc = bitmanip.hfa math.hfa gmp.hfa time_t.hfa bits/align.hfa bits/containers.hfa bits/defs.hfa bits/debug.hfa bits/locks.hfa
 @BUILDLIB_FALSE@headers = 
 @BUILDLIB_TRUE@headers = fstream.hfa iostream.hfa iterator.hfa limits.hfa rational.hfa time.hfa stdlib.hfa common.hfa \

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);
@@ -758 +752 @@
 //-----------------------------------------------------------------------------
 // Asynchronous operations
-#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
+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
+}
 
 int cfa_fsync(int fd) {
@@ -1012 +1002 @@
                         return IS_DEFINED(IORING_OP_READV);
 
-                #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)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( /*func == (fptr_t)ync_file_range || */