Changeset 3f850d7

Timestamp:

Aug 4, 2020, 5:10:04 PM (5 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:

53ee27e

Parents:

7288c00

Message:

Fixed pointer conversion in IO call

File:

• libcfa/src/concurrency/iocall.cfa (modified) (7 diffs)

libcfa/src/concurrency/iocall.cfa

@@ -252 +252 @@
 
                 (*sqe){ IORING_OP_ACCEPT, sockfd };
-                sqe->addr = addr;
-                sqe->addr2 = addrlen;
+                sqe->addr = (uint64_t)(uintptr_t)addr;
+                sqe->addr2 = (uint64_t)(uintptr_t)addrlen;
                 sqe->accept_flags = flags;
 
@@ -267 +267 @@
 
                 (*sqe){ IORING_OP_CONNECT, sockfd };
-                sqe->addr = (uint64_t)addr;
-                sqe->off = addrlen;
+                sqe->addr = (uint64_t)(uintptr_t)addr;
+                sqe->off  = (uint64_t)(uintptr_t)addrlen;
 
                 __submit_wait
@@ -280 +280 @@
                 __submit_prelude
 
+                #warning FALLOCATE documentation for linux 5.7 is incorrect, and doesn't handle mode
+
                 (*sqe){ IORING_OP_FALLOCATE, fd };
                 sqe->off = offset;
-                sqe->len = length;
-                sqe->mode = mode;
+                sqe->len = mode;
+                sqe->addr = len;
 
                 __submit_wait
@@ -297 +299 @@
                 (*sqe){ IORING_OP_FADVISE, fd };
                 sqe->off = (uint64_t)offset;
-                sqe->len = length;
+                sqe->len = len;
                 sqe->fadvise_advice = advice;
 
@@ -328 +330 @@
                 sqe->addr = (uint64_t)pathname;
                 sqe->open_flags = flags;
-                sqe->mode = mode;
+                sqe->len = mode;
 
                 __submit_wait
@@ -396 +398 @@
                 __submit_prelude
 
-                (*sqe){ IORING_OP_SPLICE, fd_out, 0p, len, off_out };
+                (*sqe){ IORING_OP_SPLICE, fd_out };
+                if( off_out ) {
+                        sqe->off = *off_out;
+                }
+                else {
+                        sqe->off = (uint64_t)-1;
+                }
+                sqe->len = len;
                 sqe->splice_fd_in  = fd_in;
-                sqe->splice_off_in = off_in;
+                if( off_in ) {
+                        sqe->splice_off_in = *off_in;
+                }
+                else {
+                        sqe->splice_off_in = (uint64_t)-1;
+                }
                 sqe->splice_flags  = flags;
 
@@ -411 +425 @@
                 __submit_prelude
 
-                (*sqe){ IORING_OP_SPLICE, fd_out, 0p, len, off_out };
+                (*sqe){ IORING_OP_SPLICE, fd_out };
+                if( off_out ) {
+                        sqe->off = *off_out;
+                }
+                else {
+                        sqe->off = (uint64_t)-1;
+                }
+                sqe->len = len;
                 sqe->splice_fd_in  = fd_in;
-                sqe->splice_off_in = off_in;
+                if( off_in ) {
+                        sqe->splice_off_in = *off_in;
+                }
+                else {
+                        sqe->splice_off_in = (uint64_t)-1;
+                }
                 sqe->splice_flags  = flags | out_flags;
                 sqe->flags = in_flags;