Changes in / [5e5dbc2:8a5bdf0]

Location:

src

Files:

• ResolvExpr/Resolver.cc (modified) (1 diff)
• benchmark/bench.h (modified) (2 diffs)
• benchmark/ctxswitch/cfa_cor.c (modified) (1 diff)
• libcfa/concurrency/thread (modified) (1 diff)

src/ResolvExpr/Resolver.cc

@@ -583 +583 @@
                                                                         ss << "' to '";
                                                                         arg.expr->get_result()->print( ss );
+                                                                        ss << "' with env '";
+                                                                        resultEnv.print(ss);
                                                                         ss << "'\n";
                                                                         SemanticError( function, ss.str() );

src/benchmark/bench.h

@@ -6 +6 @@
         #include <stdlib.h>
         #include <unistd.h>                                     // sysconf
-        #include <sys/times.h>                                  // times
-        #include <time.h>
 #if defined(__cforall)
 }
-//#include <bits/cfatime.h>
+#include <time>
 #endif
 
 
-static inline unsigned long long int Time() {
+static inline unsigned long long int bench_time() {
     struct timespec ts;
     clock_gettime(
@@ -41 +39 @@
         }                                               \
         long long int StartTime, EndTime;       \
-        StartTime = Time();                     \
+        StartTime = bench_time();                       \
         statement;                                      \
-        EndTime = Time();                               \
+        EndTime = bench_time();                         \
         unsigned long long int output =         \
         ( EndTime - StartTime ) / n;
 
-__cfa_time_t default_preemption() {
+Duration default_preemption() {
         return 0;
 }

src/benchmark/ctxswitch/cfa_cor.c

@@ -1 +1 @@
 #include <stdio.h>
+#include <kernel>
 #include <thread>
 

src/libcfa/concurrency/thread

@@ -20 +20 @@
 
 #include "coroutine"
+#include "kernel"
 #include "monitor"