Changeset b8116cd for src

Timestamp:

Oct 2, 2017, 11:55:26 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:

72ae87c

Parents:

549c006

Message:

Tested and fixed out-of-order waitfor of dtors

Location:

src

Files:

• libcfa/concurrency/monitor.c (modified) (3 diffs)
• tests/.expect/concurrent/sched-ext-dtor.txt (added)
• tests/sched-ext-dtor.c (added)

src/libcfa/concurrency/monitor.c

@@ -158 +158 @@
                         LIB_DEBUG_PRINT_SAFE("Kernel :  mon accepts dtor, block and signal it \n");
 
+                        // Wake the thread that is waiting for this
+                        __condition_criterion_t * urgent = pop( &this->signal_stack );
+                        verify( urgent );
+
                         // Reset mask
                         reset_mask( this );
@@ -165 +169 @@
 
                         // Some one else has the monitor, wait for him to finish and then run
-                        BlockInternal( &this->lock );
+                        BlockInternal( &this->lock, urgent->owner->waiting_thread );
 
                         // Some one was waiting for us, enter
@@ -551 +555 @@
                         *mask.accepted = index;
                         if( mask.clauses[index].is_dtor ) {
+                                LIB_DEBUG_PRINT_SAFE("Kernel : dtor already there\n");
                                 verifyf( mask.clauses[index].size == 1        , "ERROR: Accepted dtor has more than 1 mutex parameter." );