Changeset 223a633 for libcfa/src/concurrency/io.cfa

Timestamp:

Oct 15, 2020, 3:41:38 PM (5 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:

b9537e6

Parents:

33c3ded (diff), 0b18db7 (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

File:

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

libcfa/src/concurrency/io.cfa

@@ -69 +69 @@
                 if( block ) {
                         enable_interrupts( __cfaabi_dbg_ctx );
-                        park( __cfaabi_dbg_ctx );
+                        park();
                         disable_interrupts();
                 }
@@ -97 +97 @@
 
                 if(nextt) {
-                        unpark( nextt __cfaabi_dbg_ctx2 );
+                        unpark( nextt );
                         enable_interrupts( __cfaabi_dbg_ctx );
                         return true;
@@ -134 +134 @@
                 int ret = 0;
                 if( need_sys_to_submit || need_sys_to_complete ) {
-                        ret = syscall( __NR_io_uring_enter, ring.fd, to_submit, 0, flags, 0p, _NSIG / 8);
+                        ret = syscall( __NR_io_uring_enter, ring.fd, to_submit, 0, flags, (sigset_t *)0p, _NSIG / 8);
                         if( ret < 0 ) {
                                 switch((int)errno) {