Changeset aaa4f93 for src/libcfa

Timestamp:

Sep 21, 2017, 11:33:23 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:

7453a68

Parents:

a2dbad10

Message:

Updated accepted index to live in the waitfor caller stack.
Waitfor no longer blocks if all when clauses are false.
Waitfor now properly zeroes out acceptables before use.

Location:

src/libcfa/concurrency

Files:

• monitor (modified) (1 diff)
• monitor.c (modified) (5 diffs)

src/libcfa/concurrency/monitor

@@ -105 +105 @@
 
 struct __acceptable_t {
-        __monitor_group_t monitors;
+        __monitor_group_t;
         bool is_dtor;
 };

src/libcfa/concurrency/monitor.c

@@ -280 +280 @@
         lock_all( monitors, locks, count );
 
-        // DON'T unlock, ask the kernel to do it
-
-        // Save monitor state
-        save_recursion( monitors, recursions, count );
-
         // Find the next thread(s) to run
         unsigned short thread_count = 0;
@@ -297 +292 @@
                 thread_count = insert_unique( threads, thread_count, new_owner );
         }
+
+        // Save monitor state
+        save_recursion( monitors, recursions, count );
 
         // Everything is ready to go to sleep
@@ -634 +632 @@
         // For all acceptable functions check if this is the current function.
         for( short i = 0; i < count; i++, it++ ) {
-                if( it->monitors == group ) {
+                if( *it == group ) {
                         *this->mask.accepted = i;
                         return true;
@@ -658 +656 @@
                 for( __acceptable_t * it = mask.clauses; it != end; it++, i++ ) {
                         // Check if we have a match
-                        if( it->monitors == (*thrd_it)->monitors ) {
+                        if( *it == (*thrd_it)->monitors ) {
 
                                 // If we have a match return it
@@ -673 +671 @@
         short max = 0;
         for( int i = 0; i < mask.size; i++ ) {
-                max += mask.clauses[i].monitors.size;
+                max += mask.clauses[i].size;
         }
         return max;