Changes in src/tests/sched-int-barge.c [4cedd9f:83a071f9]

File:

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

src/tests/sched-int-barge.c

@@ -1 @@
-//----------------------------------------------------------------------------------------
-//----------------------------------------------------------------------------------------
-//
-//              DEPRECATED TEST
-//
-//----------------------------------------------------------------------------------------
-//----------------------------------------------------------------------------------------
-
 #include <fstream>
 #include <kernel>
@@ -13 +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 };
 
@@ -27 +10 @@
 
 monitor global_data_t {
-        volatile bool done;
+        bool done;
         int counter;
         state_t state;
@@ -64 +47 @@
 
         if( action == 0 ) {
-                c.do_signal = max( rand48(10), 1);
-                c.do_wait1 = rand48(c.do_signal);
-                c.do_wait2 = rand48(c.do_signal);
+                c.do_signal = max( ((unsigned)rand48()) % 10, 1);
+                c.do_wait1 = ((unsigned)rand48()) % (c.do_signal);
+                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;
         }
 
         if( action == c.do_wait1 || action == c.do_wait2 ) {
                 c.state = WAIT;
-                wait( cond );
+                wait( &cond );
 
                 if(c.state != SIGNAL) {
@@ -83 +66 @@
                 c.state = SIGNAL;
 
-                signal( cond );
-                signal( cond );
+                signal( &cond );
+                signal( &cond );
         }
         else {
@@ -90 +73 @@
         }
 
-        if( c.counter >= N ) c.done = true;
+        if( c.counter >= 100_000 ) c.done = true;
         return !c.done;
 }
@@ -106 +89 @@
 }
 
-static thread_desc * volatile the_threads;
-
 int main(int argc, char* argv[]) {
         rand48seed(0);
@@ -113 +94 @@
         {
                 Threads t[17];
-                the_threads = (thread_desc*)t;
         }
 }