Changeset 762fbc1 for libcfa/src/concurrency

Timestamp:

Aug 15, 2020, 12:20:44 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

36de20d

Parents:

7f51b9d (diff), 5715d43 (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 into master

Location:

libcfa/src/concurrency

Files:

• coroutine.cfa (modified) (1 diff)
• invoke.c (modified) (2 diffs)
• invoke.h (modified) (1 diff)
• io.cfa (modified) (2 diffs)
• io/setup.cfa (modified) (1 diff)
• iocall.cfa (modified) (3 diffs)

libcfa/src/concurrency/coroutine.cfa

@@ -215 +215 @@
                 return cor;
         }
+
+        struct $coroutine * __cfactx_cor_active(void) {
+                return active_coroutine();
+        }
 }
 

libcfa/src/concurrency/invoke.c

@@ -29 +29 @@
 // Called from the kernel when starting a coroutine or task so must switch back to user mode.
 
+extern struct $coroutine * __cfactx_cor_active(void);
 extern struct $coroutine * __cfactx_cor_finish(void);
 extern void __cfactx_cor_leave ( struct $coroutine * );
@@ -35 +36 @@
 extern void disable_interrupts() OPTIONAL_THREAD;
 extern void enable_interrupts( __cfaabi_dbg_ctx_param );
+
+struct exception_context_t * this_exception_context() {
+        return &__get_stack( __cfactx_cor_active() )->exception_context;
+}
 
 void __cfactx_invoke_coroutine(

libcfa/src/concurrency/invoke.h

@@ -98 +98 @@
         }
 
+        struct exception_context_t * this_exception_context();
+
         // struct which calls the monitor is accepting
         struct __waitfor_mask_t {

libcfa/src/concurrency/io.cfa

@@ -359 +359 @@
 
                         // We got the lock
+                        // Collect the submissions
                         unsigned to_submit = __collect_submitions( ring );
+
+                        // Actually submit
                         int ret = __io_uring_enter( ring, to_submit, false );
-                        if( ret < 0 ) {
-                                unlock(ring.submit_q.lock);
-                                return;
-                        }
-
-                        /* paranoid */ verify( ret > 0 || to_submit == 0 || (ring.ring_flags & IORING_SETUP_SQPOLL) );
+
+                        unlock(ring.submit_q.lock);
+                        if( ret < 0 ) return;
 
                         // Release the consumed SQEs
@@ -372 +372 @@
 
                         // update statistics
-                        __STATS__( true,
+                        __STATS__( false,
                                 io.submit_q.submit_avg.rdy += to_submit;
                                 io.submit_q.submit_avg.csm += ret;
                                 io.submit_q.submit_avg.cnt += 1;
                         )
-
-                        unlock(ring.submit_q.lock);
                 }
                 else {

libcfa/src/concurrency/io/setup.cfa

@@ -298 +298 @@
                 if( params_in.poll_complete ) params.flags |= IORING_SETUP_IOPOLL;
 
-                uint32_t nentries = params_in.num_entries;
+                uint32_t nentries = params_in.num_entries != 0 ? params_in.num_entries : 256;
+                if( !is_pow2(nentries) ) {
+                        abort("ERROR: I/O setup 'num_entries' must be a power of 2\n");
+                }
+                if( params_in.poller_submits && params_in.eager_submits ) {
+                        abort("ERROR: I/O setup 'poller_submits' and 'eager_submits' cannot be used together\n");
+                }
 
                 int fd = syscall(__NR_io_uring_setup, nentries, &params );

libcfa/src/concurrency/iocall.cfa

@@ -101 +101 @@
         #endif
 
-
         #define __submit_prelude \
                 if( 0 != (submit_flags & LINK_FLAGS) ) { errno = ENOTSUP; return -1; } \
@@ -110 +109 @@
                 struct io_uring_sqe * sqe; \
                 uint32_t idx; \
+                uint8_t sflags = REGULAR_FLAGS & submit_flags; \
                 [sqe, idx] = __submit_alloc( ring, (uint64_t)(uintptr_t)&data ); \
-                sqe->flags = REGULAR_FLAGS & submit_flags;
+                sqe->flags = sflags;
 
         #define __submit_wait \
@@ -186 +186 @@
                         __submit_prelude
 
-                        (*sqe){ IORING_OP_READV, fd, iov, iovcnt, offset };
+                        sqe->opcode = IORING_OP_READV;
+                        sqe->ioprio = 0;
+                        sqe->fd = fd;
+                        sqe->off = offset;
+                        sqe->addr = (uint64_t)(uintptr_t)iov;
+                        sqe->len = iovcnt;
+                        sqe->rw_flags = 0;
+                        sqe->__pad2[0] = sqe->__pad2[1] = sqe->__pad2[2] = 0;
 
                         __submit_wait