Changeset 1cdfa82 for src/libcfa/concurrency/kernel

Timestamp:

Apr 25, 2018, 4:55:53 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

42107b4

Parents:

2efe4b8 (diff), 9d5fb67 (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 remote-tracking branch 'origin/master' into with_gc

File:

• src/libcfa/concurrency/kernel (modified) (3 diffs)

src/libcfa/concurrency/kernel

@@ -10 +10 @@
 // Created On       : Tue Jan 17 12:27:26 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 22 09:58:39 2017
-// Update Count     : 2
+// Last Modified On : Tue Apr 10 14:46:49 2018
+// Update Count     : 10
 //
 
@@ -19 +19 @@
 
 #include "invoke.h"
-#include "bits/cfatime.h"
+#include "time_t.h"
 
 extern "C" {
@@ -49 +49 @@
 
         // Preemption rate on this cluster
-        __cfa_time_t preemption_rate;
+        Duration preemption_rate;
 };
 
-extern __cfa_time_t default_preemption();
+extern Duration default_preemption();
 
 void ?{} (cluster & this);