Changeset 762fbc1 for libcfa/src/concurrency/io.cfa

Timestamp:

Aug 15, 2020, 12:20:44 PM (4 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

File:

• libcfa/src/concurrency/io.cfa (modified) (2 diffs)

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 {