Changes in src/tests/sched-int-block.c [ccd349d:736fe25]

File:

• src/tests/sched-int-block.c (modified) (4 diffs)

src/tests/sched-int-block.c

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