Changeset e1801fc

Timestamp:

Jul 10, 2020, 4:18:36 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:

f5d4f62

Parents:

365e423

Message:

Added support for non-blocking sendfile

Location:

libcfa/src/concurrency

Files:

• iocall.cfa (modified) (2 diffs)
• iofwd.hfa (modified) (1 diff)

libcfa/src/concurrency/iocall.cfa

@@ -398 +398 @@
 }
 
+ssize_t cfa_sendfile(int out_fd, int in_fd, off_t *offset, size_t count) {
+        return cfa_splice(in_fd, offset, out_fd, 0p, count, 0);
+}
+
 //-----------------------------------------------------------------------------
 // Check if a function is asynchronous
@@ -499 +503 @@
 
                 if( /*func == (fptr_t)splice || */
-                        func == (fptr_t)cfa_splice )
+                        func == (fptr_t)cfa_splice ||
+                        func == (fptr_t)cfa_sendfile )
                         #define _CFA_IO_FEATURE_IORING_OP_SPLICE ,
                         return IS_DEFINED(IORING_OP_SPLICE);

libcfa/src/concurrency/iofwd.hfa

@@ -16 +16 @@
 #pragma once
 
-ssize_t cfa_preadv2(int fd, const struct iovec *iov, int iovcnt, off_t offset, int flags);
-ssize_t cfa_pwritev2(int fd, const struct iovec *iov, int iovcnt, off_t offset, int flags);
-int cfa_fsync(int fd);
-int cfa_sync_file_range(int fd, int64_t offset, int64_t nbytes, unsigned int flags);
-ssize_t cfa_sendmsg(int sockfd, const struct msghdr *msg, int flags);
-ssize_t cfa_recvmsg(int sockfd, struct msghdr *msg, int flags);
-ssize_t cfa_send(int sockfd, const void *buf, size_t len, int flags);
-ssize_t cfa_recv(int sockfd, void *buf, size_t len, int flags);
-int cfa_accept4(int sockfd, struct sockaddr *addr, socklen_t *addrlen, int flags);
-int cfa_connect(int sockfd, const struct sockaddr *addr, socklen_t addrlen);
-int cfa_fallocate(int fd, int mode, uint64_t offset, uint64_t len);
-int cfa_fadvise(int fd, uint64_t offset, uint64_t len, int advice);
-int cfa_madvise(void *addr, size_t length, int advice);
-int cfa_openat(int dirfd, const char *pathname, int flags, mode_t mode);
-int cfa_close(int fd);
-int cfa_statx(int dirfd, const char *pathname, int flags, unsigned int mask, struct statx *statxbuf);
-ssize_t cfa_read(int fd, void *buf, size_t count);
-ssize_t cfa_write(int fd, void *buf, size_t count)
+extern "C" {
+        #include <sys/types.h>
+}
+
+extern ssize_t cfa_preadv2(int fd, const struct iovec *iov, int iovcnt, off_t offset, int flags);
+extern ssize_t cfa_pwritev2(int fd, const struct iovec *iov, int iovcnt, off_t offset, int flags);
+extern int cfa_fsync(int fd);
+extern int cfa_sync_file_range(int fd, int64_t offset, int64_t nbytes, unsigned int flags);
+extern ssize_t cfa_sendmsg(int sockfd, const struct msghdr *msg, int flags);
+extern ssize_t cfa_recvmsg(int sockfd, struct msghdr *msg, int flags);
+extern ssize_t cfa_send(int sockfd, const void *buf, size_t len, int flags);
+extern ssize_t cfa_recv(int sockfd, void *buf, size_t len, int flags);
+extern int cfa_accept4(int sockfd, struct sockaddr *addr, socklen_t *addrlen, int flags);
+extern int cfa_connect(int sockfd, const struct sockaddr *addr, socklen_t addrlen);
+extern int cfa_fallocate(int fd, int mode, uint64_t offset, uint64_t len);
+extern int cfa_fadvise(int fd, uint64_t offset, uint64_t len, int advice);
+extern int cfa_madvise(void *addr, size_t length, int advice);
+extern int cfa_openat(int dirfd, const char *pathname, int flags, mode_t mode);
+extern int cfa_close(int fd);
+extern int cfa_statx(int dirfd, const char *pathname, int flags, unsigned int mask, struct statx *statxbuf);
+extern ssize_t cfa_read(int fd, void *buf, size_t count);
+extern ssize_t cfa_write(int fd, void *buf, size_t count);
+extern ssize_t cfa_splice(int fd_in, loff_t *off_in, int fd_out, loff_t *off_out, size_t len, unsigned int flags);
+extern ssize_t cfa_tee(int fd_in, int fd_out, size_t len, unsigned int flags);
+extern ssize_t cfa_sendfile(int out_fd, int in_fd, off_t *offset, size_t count);
 
 //-----------------------------------------------------------------------------