Changeset 90152a4 for tests/concurrent/waitfor/simple.c

Timestamp:

Aug 27, 2018, 4:40:34 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

b7c89aa

Parents:

f9feab8 (diff), 305581d (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 cleanup-dtors

File:

• tests/concurrent/waitfor/simple.c (moved) (moved from src/tests/concurrent/waitfor/simple.c ) (3 diffs)

tests/concurrent/waitfor/simple.c

@@ -1 @@
-#include <fstream>
-#include <kernel>
-#include <monitor>
-#include <stdlib>
-#include <thread>
+#include <fstream.hfa>
+#include <kernel.hfa>
+#include <monitor.hfa>
+#include <stdlib.hfa>
+#include <thread.hfa>
 
 #include <time.h>
@@ -10 +10 @@
 
 #ifndef PREEMPTION_RATE
-#define PREEMPTION_RATE 10_000ul
+#define PREEMPTION_RATE 10`ms
 #endif
 
-unsigned int default_preemption() {
+Duration default_preemption() {
         return PREEMPTION_RATE;
 }
@@ -74 +74 @@
 int main(int argc, char* argv[]) {
         done = false;
-        random_seed( time( NULL ) );
+        srandom( time( NULL ) );
         printf("%p\n", &globalA);
         sout | "Starting" | endl;