Changeset 930b504 for doc/papers/concurrency/examples/RWMonitorEXT.cfa

Timestamp:

Feb 26, 2020, 6:13:54 PM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

04e6f93, 5452673, dac55004

Parents:

aeb5d0d (diff), 7dc2e015 (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:

• doc/papers/concurrency/examples/RWMonitorEXT.cfa (moved) (moved from doc/papers/concurrency/examples/RWMonitor.cfa) (4 diffs)

doc/papers/concurrency/examples/RWMonitorEXT.cfa

@@ -7 +7 @@
         int rcnt, wcnt;                                                                         // number of readers/writer using resource
 };
+
+void ?{}( ReadersWriter & rw ) with(rw) { rcnt = wcnt = 0; }
 void EndRead( ReadersWriter & mutex rw ) with(rw) { rcnt -= 1; }
 void EndWrite( ReadersWriter & mutex rw ) with(rw) { wcnt = 0; }
 void StartRead( ReadersWriter & mutex rw ) with(rw) {
-        if ( wcnt > 0 ) waitfor( EndWrite, rw );
+        if ( wcnt > 0 ) waitfor( EndWrite : rw );
         rcnt += 1;
 }
 void StartWrite( ReadersWriter & mutex rw ) with(rw) {
-        if ( wcnt > 0 ) waitfor( EndWrite, rw );
-        else while ( rcnt > 0 ) waitfor( EndRead, rw );
+        if ( wcnt > 0 ) waitfor( EndWrite : rw );
+        else while ( rcnt > 0 ) waitfor( EndRead : rw );
         wcnt = 1;
 }
-void ?{}( ReadersWriter & rw ) with(rw) { rcnt = wcnt = 0; }
 int readers( ReadersWriter & rw ) { return rw.rcnt; }
+
 void Read( ReadersWriter & rw ) {
         StartRead( rw );
@@ -34 +36 @@
         EndWrite( rw );
 }
+
 thread Worker {
         ReadersWriter &rw;
@@ -47 +50 @@
         } // for
 }
+
 int main() {
         enum { MaxTask = 5 };
@@ -57 +61 @@
 } // main
 
-
 // Local Variables: //
 // tab-width: 4 //
-// compile-command: "cfa -O2 RWMonitor.cfa" //
+// compile-command: "cfa -O2 RWMonitorEXT.cfa" //
 // End: //