Changeset 640b3df for libcfa/src/concurrency/io

Timestamp:

Feb 21, 2023, 4:24:34 PM (3 years ago)

Author:

caparson <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

257a8f5, ce44c5f

Parents:

1180175 (diff), 9a533ba (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) (5 diffs)
• setup.cfa (modified) (1 diff)

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

@@ -31 +31 @@
 Prelude = """#define __cforall_thread__
 
+#include <sys/socket.h> // first include because of anonymous types __SOCKADDR_ARG, __CONST_SOCKADDR_ARG
+#include <unistd.h>
+#include <errno.h>
+#include <time.hfa>
+
 #include "bits/defs.hfa"
 #include "kernel.hfa"
@@ -43 +48 @@
         #include <assert.h>
         #include <stdint.h>
-        #include <errno.h>
         #include <linux/io_uring.h>
-
         #include "kernel/fwd.hfa"
 
@@ -82 +85 @@
 // I/O Forwards
 //=============================================================================================
-#include <time.hfa>
-
-// Some forward declarations
-#include <errno.h>
-#include <unistd.h>
 
 extern "C" {
-        #include <asm/types.h>
-        #include <sys/socket.h>
-        #include <sys/syscall.h>
-
 #if defined(CFA_HAVE_PREADV2)
         struct iovec;
@@ -118 +112 @@
         extern ssize_t send(int sockfd, const void *buf, size_t len, int flags);
         extern ssize_t recv(int sockfd, void *buf, size_t len, int flags);
-        extern int accept4(int sockfd, struct sockaddr *addr, socklen_t *addrlen, int flags);
-        extern int connect(int sockfd, const struct sockaddr *addr, socklen_t addrlen);
 
         extern int fallocate(int fd, int mode, off_t offset, off_t len);
@@ -292 +284 @@
         }),
         # CFA_HAVE_IORING_OP_ACCEPT
-        Call('ACCEPT', 'int accept4(int sockfd, struct sockaddr *addr, socklen_t *addrlen, int flags)', {
-                'fd': 'sockfd',
-                'addr': '(uintptr_t)addr',
+        Call('ACCEPT', 'int accept4(int sockfd, __SOCKADDR_ARG addr, socklen_t * restrict addrlen, int flags)', {
+                'fd': 'sockfd',
+                'addr': '(uintptr_t)&addr',
                 'addr2': '(uintptr_t)addrlen',
                 'accept_flags': 'flags'
         }),
         # CFA_HAVE_IORING_OP_CONNECT
-        Call('CONNECT', 'int connect(int sockfd, const struct sockaddr *addr, socklen_t addrlen)', {
-                'fd': 'sockfd',
-                'addr': '(uintptr_t)addr',
+        Call('CONNECT', 'int connect(int sockfd, __CONST_SOCKADDR_ARG addr, socklen_t addrlen)', {
+                'fd': 'sockfd',
+                'addr': '(uintptr_t)&addr',
                 'off': 'addrlen'
         }),

libcfa/src/concurrency/io/setup.cfa

@@ -15 +15 @@
 
 #define __cforall_thread__
-#define _GNU_SOURCE
 
 #if defined(__CFA_DEBUG__)