Changes in src/libcfa/concurrency/monitor.c [b8116cd:d67cdb7]

File:

• src/libcfa/concurrency/monitor.c (modified) (6 diffs)

src/libcfa/concurrency/monitor.c

@@ -94 +94 @@
                 }
                 else if( this->owner == thrd) {
-                        // We already have the monitor, just note how many times we took it
+                        // We already have the monitor, just not how many times we took it
                         verify( this->recursion > 0 );
                         this->recursion += 1;
@@ -127 +127 @@
                 unlock( &this->lock );
                 return;
-        }
-
-        static void __enter_monitor_dtor( monitor_desc * this, fptr_t func ) {
-                // Lock the monitor spinlock, lock_yield to reduce contention
-                lock_yield( &this->lock DEBUG_CTX2 );
-                thread_desc * thrd = this_thread;
-
-                LIB_DEBUG_PRINT_SAFE("Kernel : %10p Entering dtor for mon %p (%p)\n", thrd, this, this->owner);
-
-
-                if( !this->owner ) {
-                        LIB_DEBUG_PRINT_SAFE("Kernel : Destroying free mon %p\n", this);
-
-                        // No one has the monitor, just take it
-                        set_owner( this, thrd );
-
-                        unlock( &this->lock );
-                        return;
-                }
-                else if( this->owner == thrd) {
-                        // We already have the monitor... but where about to destroy it so the nesting will fail
-                        // Abort!
-                        abortf("Attempt to destroy monitor %p by thread \"%.256s\" (%p) in nested mutex.");
-                }
-
-                int count = 1;
-                monitor_desc ** monitors = &this;
-                __monitor_group_t group = { &this, 1, func };
-                if( is_accepted( this, group) ) {
-                        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 );
-
-                        // Create the node specific to this wait operation
-                        wait_ctx_primed( this_thread, 0 )
-
-                        // Some one else has the monitor, wait for him to finish and then run
-                        BlockInternal( &this->lock, urgent->owner->waiting_thread );
-
-                        // Some one was waiting for us, enter
-                        set_owner( this, thrd );
-                }
-                else {
-                        LIB_DEBUG_PRINT_SAFE("Kernel :  blocking \n");
-
-                        wait_ctx( this_thread, 0 )
-                        this->dtor_node = &waiter;
-
-                        // Some one else has the monitor, wait in line for it
-                        append( &this->entry_queue, thrd );
-                        BlockInternal( &this->lock );
-
-                        // BlockInternal will unlock spinlock, no need to unlock ourselves
-                        return;
-                }
-
-                LIB_DEBUG_PRINT_SAFE("Kernel : Destroying %p\n", this);
-
         }
 
@@ -221 +158 @@
         }
 
-        // Leave single monitor for the last time
-        void __leave_dtor_monitor_desc( monitor_desc * this ) {
-                LIB_DEBUG_DO(
-                        if( this_thread != this->owner ) {
-                                abortf("Destroyed monitor %p has inconsistent owner, expected %p got %p.\n", this, this_thread, this->owner);
-                        }
-                        if( this->recursion != 1 ) {
-                                abortf("Destroyed monitor %p has %d outstanding nested calls.\n", this, this->recursion - 1);
-                        }
-                )
-        }
-
         // Leave the thread monitor
         // last routine called by a thread.
@@ -285 +210 @@
 // Ctor for monitor guard
 // Sorts monitors before entering
-void ?{}( monitor_guard_t & this, monitor_desc ** m, int count, fptr_t func ) {
+void ?{}( monitor_guard_t & this, monitor_desc ** m, int count, void (*func)() ) {
         // Store current array
         this.m = m;
@@ -321 +246 @@
 
         // LIB_DEBUG_PRINT_SAFE("MGUARD : left\n");
-
-        // Restore thread context
-        this_thread->monitors.list = this.prev_mntrs;
-        this_thread->monitors.size = this.prev_count;
-        this_thread->monitors.func = this.prev_func;
-}
-
-
-// Ctor for monitor guard
-// Sorts monitors before entering
-void ?{}( monitor_dtor_guard_t & this, monitor_desc ** m, fptr_t func ) {
-        // Store current array
-        this.m = *m;
-
-        // Save previous thread context
-        this.prev_mntrs = this_thread->monitors.list;
-        this.prev_count = this_thread->monitors.size;
-        this.prev_func  = this_thread->monitors.func;
-
-        // Update thread context (needed for conditions)
-        this_thread->monitors.list = m;
-        this_thread->monitors.size = 1;
-        this_thread->monitors.func = func;
-
-        __enter_monitor_dtor( this.m, func );
-}
-
-
-// Dtor for monitor guard
-void ^?{}( monitor_dtor_guard_t & this ) {
-        // Leave the monitors in order
-        __leave_dtor_monitor_desc( this.m );
 
         // Restore thread context
@@ -555 +448 @@
                         *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." );
-
-                                monitor_desc * mon2dtor = mask.clauses[index].list[0];
-                                verifyf( mon2dtor->dtor_node, "ERROR: Accepted monitor has no dtor_node." );
-
-                                __condition_criterion_t * dtor_crit = mon2dtor->dtor_node->criteria;
-                                push( &mon2dtor->signal_stack, dtor_crit );
-
-                                unlock_all( locks, count );
+                                #warning case not implemented
                         }
                         else {