Changeset ae3bb3d for src/libcfa

Timestamp:

Jun 7, 2018, 11:14:12 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

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, with_gc

Children:

a43c561

Parents:

ea8b2f7 (diff), 09ccaf5 (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:

src/libcfa

Files:

• concurrency/preemption.c (modified) (2 diffs)
• fstream (modified) (3 diffs)
• fstream.c (modified) (3 diffs)

src/libcfa/concurrency/preemption.c

@@ -10 +10 @@
 // Created On       : Mon Jun 5 14:20:42 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Apr  9 13:52:39 2018
-// Update Count     : 36
+// Last Modified On : Tue Jun  5 17:35:49 2018
+// Update Count     : 37
 //
 
@@ -116 +116 @@
         // If there are still alarms pending, reset the timer
         if( alarms->head ) {
-                __cfaabi_dbg_print_buffer_decl( " KERNEL: @%lu(%lu) resetting alarm to %lu.\n", currtime.tv, __kernel_get_time().tv, (alarms->head->alarm - currtime).tv);
+                __cfaabi_dbg_print_buffer_decl( " KERNEL: @%ju(%ju) resetting alarm to %ju.\n", currtime.tv, __kernel_get_time().tv, (alarms->head->alarm - currtime).tv);
                 Duration delta = alarms->head->alarm - currtime;
                 Duration caped = max(delta, 50`us);

src/libcfa/fstream

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Dec  7 15:17:26 2017
-// Update Count     : 130
+// Last Modified On : Tue Jun  5 10:20:25 2018
+// Update Count     : 131
 //
 
@@ -54 +54 @@
 void open( ofstream &, const char * name );
 void close( ofstream & );
-ofstream & write( ofstream &, const char * data, unsigned long int size );
+ofstream & write( ofstream &, const char * data, size_t size );
 int fmt( ofstream &, const char fmt[], ... );
 
@@ -74 +74 @@
 void open( ifstream & is, const char * name );
 void close( ifstream & is );
-ifstream & read( ifstream & is, char * data, unsigned long int size );
+ifstream & read( ifstream & is, char * data, size_t size );
 ifstream & ungetc( ifstream & is, char c );
 int fmt( ifstream &, const char fmt[], ... );

src/libcfa/fstream.c

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Dec  9 09:31:23 2017
-// Update Count     : 275
+// Last Modified On : Tue Jun  5 17:02:56 2018
+// Update Count     : 281
 //
 
@@ -116 +116 @@
 } // close
 
-ofstream & write( ofstream & os, const char * data, unsigned long int size ) {
+ofstream & write( ofstream & os, const char * data, size_t size ) {
         if ( fail( os ) ) {
                 fprintf( stderr, "attempt write I/O on failed stream\n" );
@@ -198 +198 @@
 } // close
 
-ifstream & read( ifstream & is, char * data, unsigned long int size ) {
+ifstream & read( ifstream & is, char * data, size_t size ) {
         if ( fail( is ) ) {
                 fprintf( stderr, "attempt read I/O on failed stream\n" );