Changeset 2ab67b9 for src/tests

Timestamp:

May 30, 2017, 7:49:45 AM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

f3fc631f

Parents:

8f61052c (diff), 4a368547 (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 plg2:software/cfa/cfa-cc

Location:

src/tests

Files:

• sched-int-block.c (modified) (4 diffs)
• sched-int-disjoint.c (modified) (1 diff)

src/tests/sched-int-block.c

@@ -10 +10 @@
 
 monitor global_data_t {
-        state_t state;
-        bool ran;
+        thread_desc * last_thread;
+        thread_desc * last_signaller;
 };
 
 void ?{} ( global_data_t * this ) {
-        this->state = BARGE;
+        this->last_thread = NULL;
+        this->last_signaller = NULL;
 }
 
@@ -28 +29 @@
 //------------------------------------------------------------------------------
 void wait_op( global_data_t * mutex a, global_data_t * mutex b, unsigned i ) {
-        wait( &cond );
-        a->ran = b->ran = true;
+        wait( &cond, (uintptr_t)this_thread() );
 
         yield( ((unsigned)rand48()) % 10 );
 
-        if(a->state != SIGNAL || b->state != SIGNAL) {
-                sout | "ERROR Barging detected" | a->state | b->state | endl;
+        if(a->last_thread != a->last_signaller || b->last_thread != b->last_signaller ) {
+                sout | "ERROR Barging detected, expected" | a->last_signaller | b->last_signaller | "got" | a->last_thread | b->last_thread | endl;
                 abort();
         }
 
-        a->state = b->state = WAITED;
+        a->last_thread = b->last_thread = this_thread();
 
         yield( ((unsigned)rand48()) % 10 );
@@ -54 +54 @@
         yield( ((unsigned)rand48()) % 10 );
 
-        a->ran = b->ran = false;
-        a->state = b->state = SIGNAL;
+        a->last_thread = b->last_thread = a->last_signaller = b->last_signaller = this_thread();
 
-        signal_block( &cond );
+        if( !is_empty( &cond ) ) {
 
-        yield( ((unsigned)rand48()) % 10 );
+                thread_desc * next = front( &cond );
 
-        assert(a->ran == b->ran);
-        if(a->ran)
-        {
-                if(a->state != WAITED || b->state != WAITED) {
-                        sout | "ERROR Barging detected" | a->state | b->state | endl;
+                if( ! signal_block( &cond ) ) {
+                        sout | "ERROR expected to be able to signal" | endl;
+                        abort();
+                }
+
+                yield( ((unsigned)rand48()) % 10 );
+
+                if(a->last_thread != next || b->last_thread != next) {
+                        sout | "ERROR Barging detected, expected" | next | "got" | a->last_thread | b->last_thread | endl;
                         abort();
                 }
@@ -81 +84 @@
 //------------------------------------------------------------------------------
 void barge_op( global_data_t * mutex a ) {
-        a->state = BARGE;
+        a->last_thread = this_thread();
 }
 

src/tests/sched-int-disjoint.c

@@ -78 +78 @@
         signal( &cond, a, &data );
 
-        int pauses = (unsigned)rand48() % 10;
-        for(int i = 0; i < pauses; i++) {
-                yield();
-        }
+        yield( (unsigned)rand48() % 10 );
 
         //This is technically a mutual exclusion violation but the mutex monitor protects us