Changeset 0aaac0e for src/libcfa

Timestamp:

Oct 12, 2017, 3:15:32 PM (8 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, resolv-new, with_gc

Children:

b6b3c42, fb31cb8

Parents:

3364962 (diff), b10c621c (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:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• concurrency/monitor (modified) (3 diffs)
• concurrency/monitor.c (modified) (2 diffs)
• iostream (modified) (2 diffs)
• iostream.c (modified) (3 diffs)

src/libcfa/Makefile.am

@@ -31 +31 @@
 
 libcfa_a-libcfa-prelude.o : libcfa-prelude.c
-         ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -O2 -c -o $@ $<
+         ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -Wall -O2 -c -o $@ $<
 
 libcfa_d_a-libcfa-prelude.o : libcfa-prelude.c
-         ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -D__CFA_DEBUG__ -O0 -c -o $@ $<
+         ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -D__CFA_DEBUG__ -Wall -O0 -c -o $@ $<
 
 EXTRA_FLAGS = -g -Wall -Wno-unused-function -imacros libcfa-prelude.c @CFA_FLAGS@

src/libcfa/Makefile.in

@@ -1498 +1498 @@
 
 libcfa_a-libcfa-prelude.o : libcfa-prelude.c
-         ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -O2 -c -o $@ $<
+         ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -Wall -O2 -c -o $@ $<
 
 libcfa_d_a-libcfa-prelude.o : libcfa-prelude.c
-         ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -D__CFA_DEBUG__ -O0 -c -o $@ $<
+         ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -D__CFA_DEBUG__ -Wall -O0 -c -o $@ $<
 
 # extensionless header files are overridden by -o flag in default makerule => explicitly override default rule to silently do nothing

src/libcfa/concurrency/monitor

@@ -10 +10 @@
 // Created On       : Thd Feb 23 12:27:26 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 22 09:59:01 2017
-// Update Count     : 3
+// Last Modified On : Sat Oct  7 18:06:45 2017
+// Update Count     : 10
 //
 
@@ -54 +54 @@
 void ^?{}( monitor_guard_t & this );
 
-
 struct monitor_dtor_guard_t {
         monitor_desc * m;
@@ -64 +63 @@
 void ?{}( monitor_dtor_guard_t & this, monitor_desc ** m, void (*func)() );
 void ^?{}( monitor_dtor_guard_t & this );
+
+static inline forall( dtype T | sized(T) | { void ^?{}( T & mutex ); } )
+void delete( T * th ) {
+        ^(*th){};
+        free( th );
+}
 
 //-----------------------------------------------------------------------------

src/libcfa/concurrency/monitor.c

@@ -409 +409 @@
         short thread_count = 0;
         thread_desc * threads[ count ];
-        for(int i = 0; i < count; i++) {
-                threads[i] = 0;
-        }
+        __builtin_memset( threads, 0, sizeof( threads ) );
 
         // Save monitor states
@@ -535 +533 @@
         short max = count_max( mask );
         monitor_desc * mon_storage[max];
+        __builtin_memset( mon_storage, 0, sizeof( mon_storage ) );
         short actual_count = aggregate( mon_storage, mask );
+
+        LIB_DEBUG_PRINT_SAFE("Kernel : waitfor %d (s: %d, m: %d)\n", actual_count, mask.size, (short)max);
 
         if(actual_count == 0) return;

src/libcfa/iostream

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Sep 13 12:53:46 2017
-// Update Count     : 138
+// Last Modified On : Tue Oct 10 14:51:10 2017
+// Update Count     : 140
 //
 
@@ -79 +79 @@
 forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, const char * );
 forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, const char16_t * );
+#if ! ( __ARM_ARCH_ISA_ARM == 1 && __ARM_32BIT_STATE == 1 ) // char32_t == wchar_t => ambiguous
 forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, const char32_t * );
+#endif // ! ( __ARM_ARCH_ISA_ARM == 1 && __ARM_32BIT_STATE == 1 )
 forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, const wchar_t * );
 forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, const void * );

src/libcfa/iostream.c

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Sep 17 23:24:25 2017
-// Update Count     : 422
+// Last Modified On : Tue Oct 10 14:51:09 2017
+// Update Count     : 424
 //
 
@@ -191 +191 @@
 } // ?|?
 
+#if ! ( __ARM_ARCH_ISA_ARM == 1 && __ARM_32BIT_STATE == 1 ) // char32_t == wchar_t => ambiguous
 forall( dtype ostype | ostream( ostype ) )
 ostype * ?|?( ostype * os, const char32_t * str ) {
@@ -197 +198 @@
         return os;
 } // ?|?
+#endif // ! ( __ARM_ARCH_ISA_ARM == 1 && __ARM_32BIT_STATE == 1 )
 
 forall( dtype ostype | ostream( ostype ) )