Changeset 0720e049 for src/tests/sched-int-barge.c

Timestamp:

Aug 11, 2017, 10:33:37 AM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, 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, resolv-new, with_gc

Children:

54cd58b0

Parents:

3d4b23fa (diff), 59a75cb (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 plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

File:

• src/tests/sched-int-barge.c (modified) (5 diffs)

src/tests/sched-int-barge.c

@@ -5 +5 @@
 #include <thread>
 
+static const unsigned long N = 50_000ul;
+
+#ifndef PREEMPTION_RATE
+#define PREEMPTION_RATE 10_000ul
+#endif
+
+unsigned int default_preemption() {
+        return 0;
+}
 enum state_t { WAIT, SIGNAL, BARGE };
 
@@ -10 +19 @@
 
 monitor global_data_t {
-        bool done;
+        volatile bool done;
         int counter;
         state_t state;
@@ -51 +60 @@
                 c->do_wait2 = ((unsigned)rand48()) % (c->do_signal);
 
-                // if(c->do_wait1 == c->do_wait2) sout | "Same" | endl;
+                if(c->do_wait1 == c->do_wait2) sout | "Same" | endl;
         }
 
@@ -73 +82 @@
         }
 
-        if( c->counter >= 100_000 ) c->done = true;
+        if( c->counter >= N ) c->done = true;
         return !c->done;
 }
@@ -89 +98 @@
 }
 
+static thread_desc * volatile the_threads;
+
 int main(int argc, char* argv[]) {
-        rand48seed(0);
-        processor p;
-        {
-                Threads t[17];
-        }
+        rand48seed(0);
+        processor p;
+        {
+                Threads t[17];
+                the_threads = (thread_desc*)t;
+        }
 }