Changeset 78da4ab for libcfa/src/concurrency/io/call.cfa.in

Timestamp:

Feb 19, 2021, 1:47:09 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

4f762d3

Parents:

b44959f

Message:

New implementation of io based on instance burrowing.
Trying to avoid the unbounded growth of the previous flat combining approach.

File:

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

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

@@ -54 +54 @@
                         | IOSQE_IO_DRAIN
                 #endif
+                #if defined(CFA_HAVE_IOSQE_IO_LINK)
+                        | IOSQE_IO_LINK
+                #endif
+                #if defined(CFA_HAVE_IOSQE_IO_HARDLINK)
+                        | IOSQE_IO_HARDLINK
+                #endif
                 #if defined(CFA_HAVE_IOSQE_ASYNC)
                         | IOSQE_ASYNC
                 #endif
-        ;
-
-        static const __u32 LINK_FLAGS = 0
-                #if defined(CFA_HAVE_IOSQE_IO_LINK)
-                        | IOSQE_IO_LINK
-                #endif
-                #if defined(CFA_HAVE_IOSQE_IO_HARDLINK)
-                        | IOSQE_IO_HARDLINK
+                #if defined(CFA_HAVE_IOSQE_BUFFER_SELECTED)
+                        | IOSQE_BUFFER_SELECTED
                 #endif
         ;
@@ -74 +74 @@
         ;
 
-        extern [* volatile 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)));
-
-        static inline io_context * __get_io_context( void ) {
-                cluster * cltr = active_cluster();
-
-                /* paranoid */ verifyf( cltr, "No active cluster for io operation\\n");
-                assertf( cltr->io.cnt > 0, "Cluster %p has no default io contexts and no context was specified\\n", cltr );
-
-                /* paranoid */ verifyf( cltr->io.ctxs, "default io contexts for cluster %p are missing\\n", cltr);
-                return &cltr->io.ctxs[ thread_rand() % cltr->io.cnt ];
-        }
+        extern struct $io_context * cfa_io_allocate(struct io_uring_sqe * out_sqes[], __u32 out_idxs[], __u32 want)  __attribute__((nonnull (1,2)));
+        extern void cfa_io_submit( struct $io_context * in_ctx, __u32 in_idxs[], __u32 have ) __attribute__((nonnull (1,2)));
 #endif
 
@@ -195 +185 @@
                 return ', '.join(args_a)
 
-AsyncTemplate = """inline void async_{name}(io_future_t & future, {params}, int submit_flags, io_cancellation * cancellation, io_context * context) {{
+AsyncTemplate = """inline void async_{name}(io_future_t & future, {params}, int submit_flags) {{
         #if !defined(CFA_HAVE_LINUX_IO_URING_H) || !defined(CFA_HAVE_IORING_OP_{op})
                 ssize_t res = {name}({args});
@@ -205 +195 @@
                 }}
         #else
-                // we don't support LINK yet
-                if( 0 != (submit_flags & LINK_FLAGS) ) {{
-                        errno = ENOTSUP; return -1;
-                }}
-
-                if( !context ) {{
-                        context = __get_io_context();
-                }}
-                if(cancellation) {{
-                        cancellation->target = (__u64)(uintptr_t)&future;
-                }}
-
                 __u8 sflags = REGULAR_FLAGS & submit_flags;
-                struct __io_data & ring = *context->thrd.ring;
-
                 __u32 idx;
                 struct io_uring_sqe * sqe;
-                [(volatile struct io_uring_sqe *) sqe, idx] = __submit_alloc( ring, (__u64)(uintptr_t)&future );
+                struct $io_context * ctx = cfa_io_allocate( &sqe, &idx, 1 );
 
                 sqe->opcode = IORING_OP_{op};
+                sqe->user_data = (__u64)(uintptr_t)&future;
                 sqe->flags = sflags;
                 sqe->ioprio = 0;
@@ -239 +216 @@
 
                 verify( sqe->user_data == (__u64)(uintptr_t)&future );
-                __submit( context, idx );
+                cfa_io_submit( ctx, &idx, 1 );
         #endif
 }}"""
 
-SyncTemplate = """{ret} cfa_{name}({params}, int submit_flags, Duration timeout, io_cancellation * cancellation, io_context * context) {{
-        if( timeout >= 0 ) {{
-                errno = ENOTSUP;
-                return -1;
-        }}
+SyncTemplate = """{ret} cfa_{name}({params}, int submit_flags) {{
         io_future_t future;
 
-        async_{name}( future, {args}, submit_flags, cancellation, context );
+        async_{name}( future, {args}, submit_flags );
 
         wait( future );
@@ -415 +388 @@
         if c.define:
                 print("""#if defined({define})
-        {ret} cfa_{name}({params}, int submit_flags, Duration timeout, io_cancellation * cancellation, io_context * context);
+        {ret} cfa_{name}({params}, int submit_flags);
 #endif""".format(define=c.define,ret=c.ret, name=c.name, params=c.params))
         else:
-                print("{ret} cfa_{name}({params}, int submit_flags, Duration timeout, io_cancellation * cancellation, io_context * context);"
+                print("{ret} cfa_{name}({params}, int submit_flags);"
                 .format(ret=c.ret, name=c.name, params=c.params))
 
@@ -426 +399 @@
         if c.define:
                 print("""#if defined({define})
-        void async_{name}(io_future_t & future, {params}, int submit_flags, io_cancellation * cancellation, io_context * context);
+        void async_{name}(io_future_t & future, {params}, int submit_flags);
 #endif""".format(define=c.define,name=c.name, params=c.params))
         else:
-                print("void async_{name}(io_future_t & future, {params}, int submit_flags, io_cancellation * cancellation, io_context * context);"
+                print("void async_{name}(io_future_t & future, {params}, int submit_flags);"
                 .format(name=c.name, params=c.params))
 print("\n")
@@ -474 +447 @@
 
 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