Changeset 8dcb832 for libcfa/src/fstream.cfa

Timestamp:

Oct 6, 2021, 8:37:21 PM (20 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

237df76

Parents:

e16eb460

Message:

remove mutual-exclusion acquire for streams, add EINTR restarts for C stream functions

File:

• libcfa/src/fstream.cfa (modified) (13 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 Oct  1 08:10:21 2021
-// Update Count     : 473
+// Last Modified On : Wed Oct  6 18:39:13 2021
+// Update Count     : 508
 //
 
@@ -36 +36 @@
         prt$ = false;
         sawNL$ = false;
-        acquired$ = false;
         sepSetCur$( os, sepGet( os ) );
         sepSet( os, " " );
@@ -101 +100 @@
         if ( &os == &exit ) exit( EXIT_FAILURE );
         if ( &os == &abort ) abort();
-        if ( os.acquired$ ) { os.acquired$ = false; unlock( os ); }
 } // ends
 
@@ -109 +107 @@
 
 void open( ofstream & os, const char name[], const char mode[] ) {
-        FILE * file = fopen( name, mode );
+        FILE * file;
+    for ( cnt; 10 ) {
+                errno = 0;
+                file = fopen( name, mode );
+          if ( file != 0p || errno != EINTR ) break;            // timer interrupt ?
+          if ( cnt == 9 ) abort( "ofstream open EINTR spinning exceeded" );
+    } // for
         if ( file == 0p ) {
                 throw (Open_Failure){ os };
@@ -123 +127 @@
   if ( (FILE *)(file$) == (FILE *)stdout || (FILE *)(file$) == (FILE *)stderr ) return;
 
-        if ( fclose( (FILE *)(file$) ) == EOF ) {
+        int ret;
+    for ( cnt; 10 ) {
+                errno = 0;
+                ret = fclose( (FILE *)(file$) );
+          if ( ret != EOF || errno != EINTR ) break;            // timer interrupt ?
+          if ( cnt == 9 ) abort( "ofstream open EINTR spinning exceeded" );
+    } // for
+        if ( ret == EOF ) {
                 throw (Close_Failure){ os };
                 // abort | IO_MSG "close output" | nl | strerror( errno );
@@ -146 +157 @@
         va_list args;
         va_start( args, format );
-        int len = vfprintf( (FILE *)(os.file$), format, args );
+                
+        int len;
+    for ( cnt; 10 ) {
+                errno = 0;
+                len = vfprintf( (FILE *)(os.file$), format, args );
+          if ( len != EOF || errno != EINTR ) break;            // timer interrupt ?
+          if ( cnt == 9 ) abort( "ofstream fmt EINTR spinning exceeded" );
+    } // for
         if ( len == EOF ) {
                 if ( ferror( (FILE *)(os.file$) ) ) {
@@ -158 +176 @@
         return len;
 } // fmt
-
-void acquire( ofstream & os ) with( os ) {
-        lock( os );                                                                                     // may increase recursive lock
-        if ( ! acquired$ ) acquired$ = true;                            // not locked ?
-        else unlock( os );                                                                      // unwind recursive lock at start
-} // acquire
-
-void ?{}( osacquire & acq, ofstream & os ) { &acq.os = &os; lock( os ); }
-void ^?{}( osacquire & acq ) { unlock( acq.os ); }
 
 static ofstream soutFile = { (FILE *)stdout };
@@ -195 +204 @@
         file$ = file;
         nlOnOff$ = false;
-        acquired$ = false;
 } // ?{}
 
@@ -215 +223 @@
 
 void ends( ifstream & is ) {
-        if ( is.acquired$ ) { is.acquired$ = false; unlock( is ); }
 } // ends
 
@@ -221 +228 @@
 
 void open( ifstream & is, const char name[], const char mode[] ) {
-        FILE * file = fopen( name, mode );
+        FILE * file;
+    for ( cnt; 10 ) {
+                errno = 0;
+                file = fopen( name, mode );
+          if ( file != 0p || errno != EINTR ) break;            // timer interrupt ?
+          if ( cnt == 9 ) abort( "ifstream open EINTR spinning exceeded" );
+    } // for
         if ( file == 0p ) {
                 throw (Open_Failure){ is };
@@ -235 +248 @@
   if ( (FILE *)(file$) == (FILE *)stdin ) return;
 
-        if ( fclose( (FILE *)(file$) ) == EOF ) {
+        int ret;
+    for ( cnt; 10 ) {
+                errno = 0;
+                ret = fclose( (FILE *)(file$) );
+          if ( ret != EOF || errno != EINTR ) break;            // timer interrupt ?
+          if ( cnt == 9 ) abort( "ifstream close EINTR spinning exceeded" );
+    } // for
+        if ( ret == EOF ) {
                 throw (Close_Failure){ is };
                 // abort | IO_MSG "close input" | nl | strerror( errno );
         } // if
-        file$ = 0p;
+        file$ = 0p;                                                                                     // safety after close
 } // close
 
@@ -268 +288 @@
 int fmt( ifstream & is, const char format[], ... ) {
         va_list args;
-
         va_start( args, format );
-        int len = vfscanf( (FILE *)(is.file$), format, args );
+
+        int len;
+    for () {                                                                                    // no check for EINTR limit waiting for keyboard input
+                errno = 0;
+                len = vfscanf( (FILE *)(is.file$), format, args );
+          if ( len != EOF || errno != EINTR ) break;            // timer interrupt ?
+    } // for
         if ( len == EOF ) {
                 if ( ferror( (FILE *)(is.file$) ) ) {
@@ -279 +304 @@
         return len;
 } // fmt
-
-void acquire( ifstream & is ) with( is ) {
-        lock( is );                                                                                     // may increase recursive lock
-        if ( ! acquired$ ) acquired$ = true;                            // not locked ?
-        else unlock( is );                                                                      // unwind recursive lock at start
-} // acquire
-
-void ?{}( isacquire & acq, ifstream & is ) { &acq.is = &is; lock( is ); }
-void ^?{}( isacquire & acq ) { unlock( acq.is ); }
 
 static ifstream sinFile = { (FILE *)stdin };