Changeset 4cc9b13 for src

Timestamp:

Sep 25, 2017, 11:34:18 AM (7 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:

596bc0a

Parents:

e2f7bc3

Message:

Added waitfor test for else clauses and fixed corresponding errors

Location:

src

Files:

• libcfa/concurrency/invoke.h (modified) (1 diff)
• libcfa/concurrency/monitor.c (modified) (3 diffs)
• tests/.expect/sched-ext-else.txt (added)
• tests/sched-ext-else.c (added)

src/libcfa/concurrency/invoke.h

@@ -125 +125 @@
 
             static inline bool ?==?( const __monitor_group_t & lhs, const __monitor_group_t & rhs ) {
+                  if( (lhs.list != 0) != (rhs.list != 0) ) return false;
                   if( lhs.size != rhs.size ) return false;
                   if( lhs.func != rhs.func ) return false;

src/libcfa/concurrency/monitor.c

@@ -431 +431 @@
         short actual_count = aggregate( mon_storage, mask );
 
+        if(actual_count == 0) return;
+
         // Create storage for monitor context
         monitor_ctx( mon_storage, actual_count );
@@ -455 +457 @@
 
 
-        if( duration == 0 ) return -1;
+        if( duration == 0 ) {
+                unlock_all( locks, count );
+                return;
+        }
 
 
@@ -642 +647 @@
         for(    thread_desc ** thrd_it = &entry_queue->head;
                 *thrd_it;
-                thrd_it = &(*thrd_it)->next)
-        {
+                thrd_it = &(*thrd_it)->next
+        ) {
                 // For each acceptable check if it matches
-                int i;
+                int i = 0;
                 __acceptable_t * end = mask.clauses + mask.size;
                 for( __acceptable_t * it = mask.clauses; it != end; it++, i++ ) {