Changeset af7acb9 for libcfa/src/concurrency/kernel.cfa

Timestamp:

May 8, 2020, 11:53:29 AM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

04bc1c0

Parents:

6ec07e5 (diff), e68d092 (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/kernel.cfa (modified) (4 diffs)

libcfa/src/concurrency/kernel.cfa

@@ -256 +256 @@
 }
 
-void ?{}(cluster & this, const char name[], Duration preemption_rate) with( this ) {
+void ?{}(cluster & this, const char name[], Duration preemption_rate, int io_flags) with( this ) {
         this.name = name;
         this.preemption_rate = preemption_rate;
@@ -270 +270 @@
         threads{ __get };
 
-        __kernel_io_startup( this, &this == mainCluster );
+        __kernel_io_startup( this, io_flags, &this == mainCluster );
 
         doregister(this);
@@ -993 +993 @@
 void ^?{}(semaphore & this) {}
 
-void P(semaphore & this) with( this ){
+bool P(semaphore & this) with( this ){
         lock( lock __cfaabi_dbg_ctx2 );
         count -= 1;
@@ -1003 +1003 @@
                 unlock( lock );
                 park( __cfaabi_dbg_ctx );
+                return true;
         }
         else {
             unlock( lock );
+            return false;
         }
 }