Changeset 762fbc1 for libcfa/src/concurrency/io

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, stuck-waitfor-destruct

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/setup.cfa (modified) (1 diff)

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 );