Changeset 0aaac0e for src/tests/sched-ext-dtor.c

Timestamp:

Oct 12, 2017, 3:15:32 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:

b6b3c42, fb31cb8

Parents:

3364962 (diff), b10c621c (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 plg.uwaterloo.ca:software/cfa/cfa-cc

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;
 
-thread dummy_t {};
+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;
+        }
+}
 
 void ^?{}( dummy_t & mutex this ) {
-        sout | "Dtor" | endl;
+        set_state( this, DTOR );
+}
+
+void ?{}( dummy_t & this ) {
+        this.state = CTOR;
 }
 
 void main( dummy_t & this ) {
         yield(((unsigned)rand48()) % 10);
-        sout | "Main";
+        set_state( this, MAIN );
         waitfor( ^?{}, this ) {
-                sout | "After waitfor";
+                set_state( this, AFTER );
         }
-        sout | "Ending Main";
+        set_state( this, END );
 }
 
@@ -33 +57 @@
         processor p;
         for( int i = 0; i < N; i++ ){
-                dummy_t dummy;
+                dummy_t dummy[4];
                 yield( ((unsigned)rand48()) % 100 );
         }