Changes in src/tests/sched-ext-dtor.c [ca278c1:b8116cd]

File:

• src/tests/sched-ext-dtor.c (modified) (2 diffs)

src/tests/sched-ext-dtor.c

@@ -14 +14 @@
 static const unsigned long N = 5_000ul;
 
-enum state_t {
-        CTOR,
-        MAIN,
-        AFTER,
-        END,
-        DTOR
-};
-
-thread dummy_t {
-        state_t state;
-};
-
-static inline void set_state( dummy_t & this, state_t state) {
-        switch(state) {
-                case CTOR  : break;
-                case MAIN  : if( this.state != CTOR  ) { serr | "ERROR Expected state to be CTOR"  | endl; abort(); } this.state = state; break;
-                case AFTER : if( this.state != MAIN  ) { serr | "ERROR Expected state to be MAIN"  | endl; abort(); } this.state = state; break;
-                case END   : if( this.state != AFTER ) { serr | "ERROR Expected state to be AFTER" | endl; abort(); } this.state = state; break;
-                case DTOR  : if( this.state != END   ) { serr | "ERROR Expected state to be END"   | endl; abort(); } this.state = state; break;
-        }
-}
+thread dummy_t {};
 
 void ^?{}( dummy_t & mutex this ) {
-        set_state( this, DTOR );
-}
-
-void ?{}( dummy_t & this ) {
-        this.state = CTOR;
+        sout | "Dtor" | endl;
 }
 
 void main( dummy_t & this ) {
         yield(((unsigned)rand48()) % 10);
-        set_state( this, MAIN );
+        sout | "Main";
         waitfor( ^?{}, this ) {
-                set_state( this, AFTER );
+                sout | "After waitfor";
         }
-        set_state( this, END );
+        sout | "Ending Main";
 }
 
@@ -57 +33 @@
         processor p;
         for( int i = 0; i < N; i++ ){
-                dummy_t dummy[4];
+                dummy_t dummy;
                 yield( ((unsigned)rand48()) % 100 );
         }