Changeset 03bd407 for src/tests/preempt_longrun/yield.c

Timestamp:

May 24, 2018, 10:46:09 AM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, with_gc

Children:

1dc58fd

Parents:

6f9bc09 (diff), b9da9585 (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 plg2:software/cfa/cfa-cc

File:

• src/tests/preempt_longrun/yield.c (modified) (2 diffs)

src/tests/preempt_longrun/yield.c

@@ -1 +1 @@
 #include <kernel>
 #include <thread>
+#include <time>
+
+#ifndef PREEMPTION_RATE
+#error PREEMPTION_RATE not defined in makefile
+#endif
+
+Duration default_preemption() {
+        return PREEMPTION_RATE;
+}
 
 #ifdef LONG_TEST
@@ -7 +16 @@
 static const unsigned long N = 325_000ul;
 #endif
-
-#ifndef PREEMPTION_RATE
-#define PREEMPTION_RATE 10`ms
-#endif
-
-Duration default_preemption() {
-        return PREEMPTION_RATE;
-}
 
 thread worker_t {};