Changeset 8b58bae for libcfa/src/concurrency

Timestamp:

Jun 24, 2020, 5:00:59 PM (5 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:

c953163

Parents:

9791ab5 (diff), 7f9968ad (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' into relaxed_ready

Location:

libcfa/src/concurrency

Files:

• alarm.cfa (modified) (2 diffs)
• preemption.cfa (modified) (3 diffs)

libcfa/src/concurrency/alarm.cfa

@@ -10 +10 @@
 // Created On       : Fri Jun 2 11:31:25 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jan  5 08:41:36 2020
-// Update Count     : 69
+// Last Modified On : Wed Jun 17 16:11:35 2020
+// Update Count     : 75
 //
 
 #define __cforall_thread__
 
-extern "C" {
 #include <errno.h>
 #include <stdio.h>
+#include <unistd.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/time.h>
-}
 
 #include "alarm.hfa"
@@ -55 +53 @@
 }
 
-void ?{}( alarm_node_t & this, processor   * proc, Time alarm, Duration period ) with( this ) {
+void ?{}( alarm_node_t & this, processor * proc, Time alarm, Duration period ) with( this ) {
         this.proc = proc;
         this.alarm = alarm;

libcfa/src/concurrency/preemption.cfa

@@ -10 +10 @@
 // Created On       : Mon Jun 5 14:20:42 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Dec  5 16:34:05 2019
-// Update Count     : 43
+// Last Modified On : Wed Jun 17 11:36:25 2020
+// Update Count     : 46
 //
 
@@ -19 +19 @@
 #include <assert.h>
 
-extern "C" {
 #include <errno.h>
 #include <stdio.h>
@@ -25 +24 @@
 #include <unistd.h>
 #include <limits.h>                                                                             // PTHREAD_STACK_MIN
-}
 
 #include "bits/signal.hfa"