Changeset c366ec6 for src/libcfa

Timestamp:

Oct 10, 2017, 4:29:47 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

d2e2865

Parents:

08da53d (diff), c386bc1 (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:/u/cforall/software/cfa/cfa-cc

Location:

src/libcfa/concurrency

Files:

• monitor (modified) (3 diffs)
• monitor.c (modified) (2 diffs)

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;