Changes in src/tests/sched-int-disjoint.c [303406a:83a071f9]

File:

• src/tests/sched-int-disjoint.c (modified) (7 diffs)

src/tests/sched-int-disjoint.c

@@ -4 +4 @@
 #include <thread>
 
-#include <time.h>
-
-static const unsigned long N = 10_000ul;
-
-#ifndef PREEMPTION_RATE
-#define PREEMPTION_RATE 10_000ul
+#ifndef N
+#define N 10_000
 #endif
-
-unsigned int default_preemption() {
-        return PREEMPTION_RATE;
-}
 
 enum state_t { WAIT, SIGNAL, BARGE };
@@ -22 +14 @@
 
 monitor global_data_t;
-void ?{}( global_data_t * this );
-void ^?{} ( global_data_t * this );
+void ?{}( global_data_t & this );
+void ^?{} ( global_data_t & this );
 
 monitor global_data_t {
@@ -34 +26 @@
 volatile bool all_done;
 
-void ?{}( global_data_t * this ) {
-        this->counter == 0;
-        this->state = BARGE;
+void ?{}( global_data_t & this ) {
+        this.counter == 0;
+        this.state = BARGE;
 }
 
-void ^?{} ( global_data_t * this ) {}
+void ^?{} ( global_data_t & this ) {}
 
 //------------------------------------------------------------------------------
 // Barging logic
-void barge( global_data_t * mutex d ) {
-        d->state = BARGE;
+void barge( global_data_t & mutex d ) {
+        d.state = BARGE;
 }
 
 thread Barger {};
 
-void main( Barger * this ) {
+void main( Barger & this ) {
         while( !all_done ) {
-                barge( &data );
+                barge( data );
                 yield();
         }
@@ -58 +50 @@
 //------------------------------------------------------------------------------
 // Waiting logic
-bool wait( global_t * mutex m, global_data_t * mutex d ) {
+bool wait( global_t & mutex m, global_data_t & mutex d ) {
         wait( &cond );
-        if( d->state != SIGNAL ) {
+        if( d.state != SIGNAL ) {
                 sout | "ERROR barging!" | endl;
         }
 
-        d->counter++;
+        d.counter++;
 
-        if( (d->counter % 1000) == 0 ) sout | d->counter | endl;
+        if( (d.counter % 1000) == 0 ) sout | d.counter | endl;
 
-        return d->counter < N;
+        return d.counter < N;
 }
 
 thread Waiter {};
 
-void main( Waiter * this ) {
-        while( wait( &mut, &data ) ) { yield(); }
+void main( Waiter & this ) {
+        while( wait( mut, data ) ) { yield(); }
 }
 
@@ -80 +72 @@
 //------------------------------------------------------------------------------
 // Signalling logic
-void signal( condition * cond, global_t * mutex a, global_data_t * mutex b ) {
-        b->state = SIGNAL;
+void signal( condition * cond, global_t & mutex a, global_data_t & mutex b ) {
+        b.state = SIGNAL;
         signal( cond );
 }
 
-void logic( global_t * mutex a ) {
-        signal( &cond, a, &data );
+void logic( global_t & mutex a ) {
+        signal( &cond, a, data );
 
         yield( (unsigned)rand48() % 10 );
@@ -99 +91 @@
 thread Signaller {};
 
-void main( Signaller * this ) {
+void main( Signaller & this ) {
         while( !all_done ) {
-                logic( &mut );
+                logic( mut );
                 yield();
         }
@@ -109 +101 @@
 // Main loop
 int main(int argc, char* argv[]) {
-        rand48seed( time( NULL ) );
         all_done = false;
         processor p;