Changeset 168c007 for src/tests/monitor.c

Timestamp:

Mar 21, 2017, 12:50:27 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

da6d4566, f5392c1

Parents:

94a8123 (diff), e04b636 (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:/u/cforall/software/cfa/cfa-cc

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;
-                }
-        }
+void increment3( global_t * mutex this ) {
+        this->value += 1;
 }
 
-struct MyThread { thread_desc t; };
+void increment2( global_t * mutex this ) {
+        increment3( this );
+}
+
+void increment( global_t * mutex this ) {
+        increment2( this );
+}
+
+struct MyThread { thread_desc __thrd; };
 
 DECL_THREAD(MyThread);