Changeset 9bb6c5f for libcfa/src

Timestamp:

Sep 5, 2024, 3:57:05 PM (13 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

29c8675

Parents:

ad47ec4 (diff), 508cff0 (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

Location:

libcfa/src

Files:

• concurrency/future.hfa (modified) (4 diffs)
• iostream.cfa (modified) (7 diffs)

libcfa/src/concurrency/future.hfa

@@ -88 +88 @@
                 if ( s.clause_status == 0p ) // poke in result so that woken threads do not need to reacquire any locks
                     copy_T( result, *(((future_node(T) &)s).my_result) );
-                
+
                 wake_one( waiters, s );
             }
@@ -146 +146 @@
             }
             unlock( lock );
-            
+
             return [ret_val, false];
         }
@@ -154 +154 @@
 
             // check if we can complete operation. If so race to establish winner in special OR case
-            if ( !s.park_counter && state != FUTURE_EMPTY ) { 
+            if ( !s.park_counter && state != FUTURE_EMPTY ) {
                 if ( !__make_select_node_available( s ) ) { // we didn't win the race so give up on registering
                     unlock( lock );
@@ -180 +180 @@
             return false;
         }
-                
+
         bool on_selected( future(T) & this, select_node & node ) { return true; }
         }

libcfa/src/iostream.cfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Aug 17 12:31:47 2024
-// Update Count     : 2038
+// Last Modified On : Wed Sep  4 11:30:12 2024
+// Update Count     : 2040
 //
 
@@ -512 +512 @@
                 if ( cnt == 1 && f.flags.left ) { wd = f.wd; f.wd = maxdig; } // copy f.wd and reset for printing middle chunk
                 // printf( "R val:%#lx(%lu) wd:%u pc:%u base:%c neg:%d pc:%d left:%d nobsdp:%d sign:%d pad0:%d\n",
-                //              f.val, f.val, f.wd, f.pc, f.base, f.flags.neg, f.flags.pc, f.flags.left, f.flags.nobsdp, f.flags.sign, f.flags.pad0 ); 
+                //              f.val, f.val, f.wd, f.pc, f.base, f.flags.neg, f.flags.pc, f.flags.left, f.flags.nobsdp, f.flags.sign, f.flags.pad0 );
                 (ostype &)(os | f);
                 if ( cnt == 1 ) {
@@ -554 +554 @@
                 if ( f.flags.neg ) f.val = -f.val;
                 // printf( "L val:%#lx(%lu) wd:%u pc:%u base:%c neg:%d pc:%d left:%d nobsdp:%d sign:%d pad0:%d\n",
-                //              f.val, f.val, f.wd, f.pc, f.base, f.flags.neg, f.flags.pc, f.flags.left, f.flags.nobsdp, f.flags.sign, f.flags.pad0 ); 
+                //              f.val, f.val, f.wd, f.pc, f.base, f.flags.neg, f.flags.pc, f.flags.left, f.flags.nobsdp, f.flags.sign, f.flags.pad0 );
                 (ostype &)(os | f);
 
@@ -597 +597 @@
         "y", "z", "a", "f", "p", "n", "u", "m", "",
         "K", "M", "G", "T", "P", "E", "Z", "Y"
-}; 
+};
 #define SUFFIXES_START (-24) /* Smallest power for which there is a suffix defined. */
 #define SUFFIXES_END (SUFFIXES_START + (int)((sizeof(suffixes) / sizeof(char *) - 1) * 3))
@@ -1064 +1064 @@
                         else args = fmt( is, fmtstr, s, &len );
                         // fprintf( stderr, "cstr %s %d %d %d\n", fmtstr, args, len, f.cstr.wd );
+
+                        // No data read and eof is on => true eof so raise exception.
+                        if ( len == 0 && eof( is ) ) throwResume ExceptionInst( end_of_file );
+
                         if ( check && len >= rwd && ! eof( is ) ) {     // might not fit
                                 char peek;
@@ -1087 +1091 @@
                                 else args = fmt( is, fmtstr, s, &len );
 
+                                // No data read and eof is on => true eof so raise exception.
+                                if ( len == 0 && eof( is ) ) throwResume ExceptionInst( end_of_file );
+
                                 if ( check && len == rwd && ! eof( is ) ) {     // might not fit
                                         char peek;
@@ -1106 +1113 @@
                                 else args = fmt( is, fmtstr, s, &len );
                                 // fprintf( stderr, "incl/excl %s \"%s\" %d %d %d %d %d %c\n", fmtstr, s, args, wd, len, eof( is ), check, s[wd] );
+
+                                // No data read and eof is on => true eof so raise exception.
+                                if ( len == 0 && eof( is ) ) throwResume ExceptionInst( end_of_file );
+
                                 if ( check && len == rwd && ! eof( is ) ) {     // might not fit
                                         // fprintf( stderr, "overflow\n" );