Changes in src/tests/monitor.c [cb0e6de:348006f]

File:

• src/tests/monitor.c (modified) (1 diff)

src/tests/monitor.c

@@ -13 +13 @@
 }
 
-monitor_desc * get_monitor( global_t * this ) {
-        return &this->m;
+static global_t global;
+
+void increment( /*mutex*/ global_t * this ) {
+        monitor_desc * mon = &this->m;
+        monitor_guard_t g1 = { &mon };
+        {
+                monitor_guard_t g2 = { &mon };
+                {
+                        monitor_guard_t g3 = { &mon };
+                        this->value += 1;
+                }
+        }
 }
 
-static global_t global;
-
-void increment3( global_t * mutex this ) {
-        this->value += 1;
-}
-
-void increment2( global_t * mutex this ) {
-        increment3( this );
-}
-
-void increment( global_t * mutex this ) {
-        increment2( this );
-}
-
-struct MyThread { thread_desc __thrd; };
+struct MyThread { thread_desc t; };
 
 DECL_THREAD(MyThread);
 
 void ?{}( MyThread * this ) {}
-void ^?{}( MyThread * mutex this ) {}
 
 void main( MyThread* this ) {
-        for(int i = 0; i < 1_000_000; i++) {
+        for(int i = 0; i < 1000000; i++) {
                 increment( &global );
         }