Changes in libcfa/src/concurrency/io/call.cfa.in [ec19b21:fe9468e2]

File:

• libcfa/src/concurrency/io/call.cfa.in (modified) (4 diffs)

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

@@ -74 +74 @@
         ;
 
-        extern [* volatile struct io_uring_sqe, __u32] __submit_alloc( struct __io_data & ring, __u64 data );
+        extern [* struct io_uring_sqe, __u32] __submit_alloc( struct __io_data & ring, __u64 data );
         extern void __submit( struct io_context * ctx, __u32 idx ) __attribute__((nonnull (1)));
 
@@ -222 +222 @@
                 __u32 idx;
                 struct io_uring_sqe * sqe;
-                [(volatile struct io_uring_sqe *) sqe, idx] = __submit_alloc( ring, (__u64)(uintptr_t)&future );
-
+                [sqe, idx] = __submit_alloc( ring, (__u64)(uintptr_t)&future );
+
+                sqe->__pad2[0] = sqe->__pad2[1] = sqe->__pad2[2] = 0;
                 sqe->opcode = IORING_OP_{op};
-                sqe->flags = sflags;
-                sqe->ioprio = 0;
-                sqe->fd = 0;
-                sqe->off = 0;
-                sqe->addr = 0;
-                sqe->len = 0;
-                sqe->fsync_flags = 0;
-                sqe->__pad2[0] = 0;
-                sqe->__pad2[1] = 0;
-                sqe->__pad2[2] = 0;{body}
-
-                asm volatile("": : :"memory");
+                sqe->flags = sflags;{body}
 
                 verify( sqe->user_data == (__u64)(uintptr_t)&future );
@@ -322 +312 @@
         }),
         # CFA_HAVE_IORING_OP_ACCEPT
-        Call('ACCEPT', 'int accept4(int sockfd, struct sockaddr *addr, socklen_t *addrlen, int flags)', {
-                'fd': 'sockfd',
-                'addr': '(__u64)addr',
-                'addr2': '(__u64)addrlen',
+        Call('ACCEPT4', 'int accept4(int sockfd, struct sockaddr *addr, socklen_t *addrlen, int flags)', {
+                'fd': 'sockfd',
+                'addr': 'addr',
+                'addr2': 'addrlen',
                 'accept_flags': 'flags'
         }),
@@ -474 +464 @@
 
 print("""
-//-----------------------------------------------------------------------------
-bool cancel(io_cancellation & this) {
-        #if !defined(CFA_HAVE_LINUX_IO_URING_H) || !defined(CFA_HAVE_IORING_OP_ASYNC_CANCEL)
-                return false;
-        #else
-                io_future_t future;
-
-                io_context * context = __get_io_context();
-
-                __u8 sflags = 0;
-                struct __io_data & ring = *context->thrd.ring;
-
-                __u32 idx;
-                volatile struct io_uring_sqe * sqe;
-                [sqe, idx] = __submit_alloc( ring, (__u64)(uintptr_t)&future );
-
-                sqe->__pad2[0] = sqe->__pad2[1] = sqe->__pad2[2] = 0;
-                sqe->opcode = IORING_OP_ASYNC_CANCEL;
-                sqe->flags = sflags;
-                sqe->addr = this.target;
-
-                verify( sqe->user_data == (__u64)(uintptr_t)&future );
-                __submit( context, idx );
-
-                wait(future);
-
-                if( future.result == 0 ) return true; // Entry found
-                if( future.result == -EALREADY) return true; // Entry found but in progress
-                if( future.result == -ENOENT ) return false; // Entry not found
-                return false;
-        #endif
-}
-
 //-----------------------------------------------------------------------------
 // Check if a function is has asynchronous