Changeset 8e4aa05 for libcfa/src/fstream.cfa

Timestamp:

Mar 4, 2021, 7:40:25 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

77d601f

Parents:

342af53 (diff), a5040fe (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:

• libcfa/src/fstream.cfa (modified) (9 diffs)

libcfa/src/fstream.cfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jun 19 16:24:54 2020
-// Update Count     : 384
+// Last Modified On : Mon Mar  1 21:12:15 2021
+// Update Count     : 424
 //
 
@@ -25 +25 @@
 #include <errno.h>                                                                              // errno
 
-
 // *********************************** ofstream ***********************************
 
@@ -38 +37 @@
         os.$prt = false;
         os.$sawNL = false;
+        os.$acquired = false;
         $sepSetCur( os, sepGet( os ) );
         sepSet( os, " " );
@@ -109 +109 @@
         if ( &os == &exit ) exit( EXIT_FAILURE );
         if ( &os == &abort ) abort();
+        if ( os.$acquired ) { os.$acquired = false; release( os ); }
 } // ends
 
@@ -171 +172 @@
 } // fmt
 
+inline void acquire( ofstream & os ) {
+        lock( os.$lock );
+        if ( ! os.$acquired ) os.$acquired = true;
+        else unlock( os.$lock );
+} // acquire
+
+inline void release( ofstream & os ) {
+        unlock( os.$lock );
+} // release
+
+void ?{}( osacquire & acq, ofstream & os ) { &acq.os = &os; lock( os.$lock ); }
+void ^?{}( osacquire & acq ) { release( acq.os ); }
+
 static ofstream soutFile = { (FILE *)stdout };
 ofstream & sout = soutFile, & stdout = soutFile;
@@ -176 +190 @@
 ofstream & serr = serrFile, & stderr = serrFile;
 
+static ofstream lsoutFile = { (FILE *)stdout };
+ofstream & lsout = lsoutFile;
+
 static ofstream exitFile = { (FILE *)stdout };
 ofstream & exit = exitFile;
@@ -189 +206 @@
         is.$file = file;
         is.$nlOnOff = false;
+        is.$acquired = false;
 } // ?{}
 
@@ -213 +231 @@
         return is.$file == 0p || ferror( (FILE *)(is.$file) );
 } // fail
+
+void ends( ifstream & is ) {
+        if ( is.$acquired ) { is.$acquired = false; release( is ); }
+} // ends
 
 int eof( ifstream & is ) {
@@ -279 +301 @@
 } // fmt
 
+inline void acquire( ifstream & is ) {
+        lock( is.$lock );
+        if ( ! is.$acquired ) is.$acquired = true;
+        else unlock( is.$lock );
+} // acquire
+
+inline void release( ifstream & is ) {
+        unlock( is.$lock );
+} // release
+
+void ?{}( isacquire & acq, ifstream & is ) { &acq.is = &is; lock( is.$lock ); }
+void ^?{}( isacquire & acq ) { release( acq.is ); }
+
 static ifstream sinFile = { (FILE *)stdin };
 ifstream & sin = sinFile, & stdin = sinFile;