Changes in src/tests/multi-monitor.c [bcda04c:83a071f9]

File:

• src/tests/multi-monitor.c (modified) (2 diffs)

src/tests/multi-monitor.c

@@ -10 +10 @@
 static monitor_t m1, m2, m3;
 
-void increment( monitor_t * mutex p1, monitor_t * mutex p2, int * value ) {
-        *value += 1;
+void increment( monitor_t & mutex p1, monitor_t & mutex p2, int & value ) {
+        value += 1;
 }
 
-struct MyThread { 
-        thread_desc __thrd; 
+thread MyThread {
         int target;
 };
 
-DECL_THREAD(MyThread);
-
-void ?{}( MyThread * this, int target ) {
-        this->target = target;
+void ?{}( MyThread & this, int target ) {
+        this.target = target;
 }
 
-void ^?{}( MyThread * mutex this ) {}
+void ^?{}( MyThread & mutex this ) {}
 
-void main( MyThread* this ) {
+void main( MyThread & this ) {
         for(int i = 0; i < 1000000; i++) {
-                choose(this->target) {
-                        case 0: increment( &m1, &m2, &global12 );
-                        case 1: increment( &m2, &m3, &global23 );
-                        case 2: increment( &m1, &m3, &global13 );
+                choose(this.target) {
+                        case 0: increment( m1, m2, global12 );
+                        case 1: increment( m2, m3, global23 );
+                        case 2: increment( m1, m3, global13 );
                 }
         }
+}
+
+forall(dtype T | sized(T) | { void ^?{}(T & mutex); })
+void delete_mutex(T * x) {
+        ^(*x){};
+        free(x);
 }
 
@@ -40 +43 @@
         processor p;
         {
-                scoped(MyThread) * f[6];
+                MyThread * f[6];
                 for(int i = 0; i < 6; i++) {
-                        f[i] = ((scoped(MyThread) *)malloc()){ i % 3 };
+                        f[i] = new(i % 3);
                 }
 
                 for(int i = 0; i < 6; i++) {
-                        delete( f[i] );
+                        delete_mutex( f[i] );
                 }
         }