Changeset 1ed841f

Timestamp:

May 3, 2017, 3:15:05 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

b13fc10

Parents:

c469f43

Message:

Added extra randomness to the barging test

File:

• src/tests/sched-int-multi.c (modified) (6 diffs)

src/tests/sched-int-multi.c

@@ -2 +2 @@
 #include <kernel>
 #include <monitor>
+#include <stdlib>
 #include <thread>
 
@@ -12 +13 @@
         int counter;
         state_t state;
+
+        unsigned short do_signal;
+        unsigned short do_wait2;
+        unsigned short do_wait1;
 };
 
@@ -18 +23 @@
         this->counter = 0;
         this->state = BARGE;
+
+        this->do_signal = 6;
+        this->do_wait1  = 1;
+        this->do_wait2  = 3;
 }
 
@@ -33 +42 @@
         c->counter++;
 
+        if( (c->counter % 1000) == 0 ) sout | c->counter | endl;
+
         int action = c->counter % 10;
 
-        if( action == 1 || action == 3 ) {
-                if(c->state != BARGE) {
-                        sout | "ERROR Mutual exclusion is inconsistent for wait" | endl;
-                        abort();
-                }
+        if( action == 0 ) {
+                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( action == c->do_wait1 || action == c->do_wait2 ) {
                 c->state = WAIT;
                 wait( &cond );
 
                 if(c->state != SIGNAL) {
-                        sout | "ERROR Barging detected" | endl;
+                        sout | "ERROR Barging detected" | c->counter | endl;
                         abort();
                 }
         }
-        else if( action == 6 ) {
-                if(c->state != BARGE) {
-                        sout | "ERROR Mutual exclusion is inconsistent for signal" | endl;
-                        abort();
-                }
-
+        else if( action == c->do_signal ) {
                 c->state = SIGNAL;
 
@@ -64 +73 @@
         }
 
-        if( (c->counter % 1000) == 0 ) sout | c->counter | endl;
-        if( c->counter == 100_000 ) c->done = true;
+        if( c->counter >= 100_000 ) c->done = true;
         return !c->done;
 }
@@ -82 +90 @@
 
 int main(int argc, char* argv[]) {
-        processor p[3];
+        rand48seed(0);
+        processor p;
         {
-                Threads t[20];
+                Threads t[17];
         }
 }