Changeset a933dcf4 for src/tests/sched-int-multi.c

Timestamp:

May 2, 2017, 2:42:14 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:

b510ac2

Parents:

5783e94

Message:

• updated internal scheduler test for multi monitors
• fixed branding for monitors

File:

• src/tests/sched-int-multi.c (modified) (1 diff)

src/tests/sched-int-multi.c

@@ -4 +4 @@
 #include <thread>
 
+enum state_t { WAIT, SIGNAL, BARGE };
+
 monitor global_t {};
 
+monitor global_data_t {
+        bool done;
+        int counter;
+        state_t state;
+};
+
+void ?{} ( global_data_t * this ) {
+        this->done = false;
+        this->counter = 0;
+        this->state = BARGE;
+}
+
+void ^?{} ( global_data_t * this ) {}
+
+global_t globalA;
 global_t globalB;
-global_t globalA;
+global_data_t globalC;
 
 condition cond;
 
-thread Signalee {};
-thread Signaler {};
+thread Threads {};
 
-void signalee_action( global_t * mutex a, global_t * mutex b ) {
-        sout | "Waiting All" | endl;
-        wait( &cond );
-        sout | "Done waiting" | endl;
+bool logicC( global_t * mutex a, global_t * mutex b, global_data_t * mutex c ) {
+        c->counter++;
+
+        int action = c->counter % 10;
+
+        if( action == 1 || action == 3 ) {
+                if(c->state != BARGE) {
+                        sout | "ERROR Mutual exclusion is inconsistent for wait" | endl;
+                        abort();
+                }
+
+                c->state = WAIT;
+                wait( &cond );
+
+                if(c->state != SIGNAL) {
+                        sout | "ERROR Barging detected" | endl;
+                        abort();
+                }
+        }
+        else if( action == 6 ) {
+                if(c->state != BARGE) {
+                        sout | "ERROR Mutual exclusion is inconsistent for signal" | endl;
+                        abort();
+                }
+
+                c->state = SIGNAL;
+
+                signal( &cond );
+                signal( &cond );
+        }
+        else {
+                c->state = BARGE;
+        }
+
+        if( (c->counter % 1000) == 0 ) sout | c->counter | endl;
+        if( c->counter == 100_000 ) c->done = true;
+        return !c->done;
 }
 
-void main( Signalee* this ) {
-        signalee_action( &globalA, &globalB );
+bool logicB( global_t * mutex a, global_t * mutex b ) {
+        return logicC(a, b, &globalC);
 }
 
-void signaler_action_inner( global_t * mutex a, global_t * mutex b ) {
-        sout | "Entering A & B" | endl;
-        sout | "Signal" | endl;
-        signal( &cond );
-        sout | "Leaving  A & B" | endl;
+bool logicA( global_t * mutex a ) {
+        return logicB(a, &globalB);
 }
 
-void signaler_action( global_t * mutex a, global_t * b ) {
-        sout | "Entering A" | endl;
-        signaler_action_inner( a, b );
-        sout | "Leaving  A" | endl;
-}
-
-void main( Signaler* this ) {
-        for(int i = 0; i < 10_000; i++) {
-                asm volatile ("" : : : "memory");
-        }
-
-        signaler_action( &globalA, &globalB );
+void main( Threads* this ) {
+        while( logicA(&globalA) ) { yield(); };
 }
 
 int main(int argc, char* argv[]) {
-        processor p;
+        processor p[3];
         {
-                Signalee a;
-                Signaler b;
+                Threads t[20];
         }
 }