Changeset f2e40a9f for src/tests/multi-monitor.c

Timestamp:

Mar 15, 2017, 9:43:15 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

27fed7f1, 738e304

Parents:

bf4ac09 (diff), 9b443c7f (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.

git-author:

Peter A. Buhr <pabuhr@…> (03/15/17 21:25:49)

git-committer:

Peter A. Buhr <pabuhr@…> (03/15/17 21:43:15)

Message:

Merge branch 'master' of plg2:software/cfa/cfa-cc

File:

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

src/tests/multi-monitor.c

@@ -2 +2 @@
 #include <kernel>
 #include <monitor>
-#include <threads>
+#include <thread>
 
 static int global12, global23, global13;
 
-static __monitor_t m1, m2, m3;
+static monitor_desc m1, m2, m3;
 
-void increment( /*mutex*/ __monitor_t * p1, /*mutex*/ __monitor_t * p2, int * value ) {
-        __monitor_t * mons[] = { p1, p2 };
+void increment( /*mutex*/ monitor_desc * p1, /*mutex*/ monitor_desc * p2, int * value ) {
+        monitor_desc * mons[] = { p1, p2 };
         monitor_guard_t g = { mons, 2 };
         *value += 1;
@@ -15 +15 @@
 
 struct MyThread { 
-        thread t; 
+        thread_desc t; 
         int target;
 };